Commit Graph

14528 Commits

Author SHA1 Message Date
Evan Prodromou
c97048d01b merge 0.9.x into 1.0.x 2011-05-04 14:59:39 -07:00
Evan Prodromou
753bc7302a Merge branch 'master' into 0.9.x 2011-05-04 14:46:36 -07:00
Evan Prodromou
d8151311ee Revert "add rss.me to notice source list"
This reverts commit f1a14ba801.
2011-05-04 14:46:26 -07:00
Evan Prodromou
900b9ab498 Merge branch '1.0.x' into testing 2011-05-04 13:05:06 -07:00
Evan Prodromou
7e1ae44fad source for registration email confirmation 2011-05-04 12:25:34 -07:00
Evan Prodromou
aef62ccbcc Option for custom template for confirmation email 2011-05-04 11:37:32 -07:00
Evan Prodromou
1b5bd8991b use a template for confirmation email 2011-05-04 11:37:03 -07:00
Evan Prodromou
332b9400c6 Document new docfile events 2011-05-04 11:30:56 -07:00
Evan Prodromou
c46406b209 low-level hook for loading templates 2011-05-04 11:28:49 -07:00
Evan Prodromou
b432cc72c9 optionally send welcome email in installforemail.php 2011-05-04 11:10:21 -07:00
Evan Prodromou
914de296a1 send a confirmation email when registering by script 2011-05-04 11:05:38 -07:00
Evan Prodromou
be57e253fb 'Home' to 'Home timeline' 2011-05-04 10:49:46 -07:00
Evan Prodromou
f67607d2f1 change 'You and friends' to 'Home' 2011-05-04 10:48:12 -07:00
Evan Prodromou
6b1732d9a2 remove object nav for search 2011-05-04 10:43:47 -07:00
Evan Prodromou
784da5d231 Make EmailRegistration respect registration flags
The email registration code wasn't respecting site-closed or
site-inviteonly flags. This is fixed.
2011-05-02 19:12:29 -07:00
Evan Prodromou
fde6e672cf Fix error in domainstatusnetworkinstaller that cleared tags table
An error in the domainstatusnetworkinstaller cleared the tags table,
losing any information about sites on the service. (We discovered this
in production on StatusNet OnDemand). Conjunction of these factors: 1)
the installer code was using an insert()'ed object with an
auto-incrementing key, which because the statusnet.ini was incorrect,
wasn't getting updated. 2) It then called setTag() on that object,
which deletes all tags matching the id, then adds in the new ones. 3)
Because the ID was null, DB_DataObject deleted all rows in the table.

I've made a work-around that re-fetches the status_network object
based on its (unique) nickname, which gets the correct ID, which
should work for tags. Confirmed that it works. Still need to fix the
underlying problems, however.
2011-05-02 18:51:09 -07:00
Evan Prodromou
f5aba994b2 Merge branch '1.0.x' into testing 2011-05-02 15:25:46 -07:00
Evan Prodromou
90eb09624c let users login with email address 2011-05-02 15:17:08 -07:00
Evan Prodromou
48f6af3a8a Merge branch '1.0.x' into testing 2011-05-02 11:59:47 -07:00
Zach Copley
c05b3b5bd2 Revert "Kill off all document._importNode() calls except the ones used with the JQuery Form plugin (fixes an IE7 issue)"
This reverts commit 997d160002.

Conflicts:

	js/util.min.js
2011-05-02 11:57:25 -07:00
Zach Copley
dab27ac9fd Revert "Fix syntax error"
This reverts commit d1d530370d.
2011-05-02 11:55:28 -07:00
Zach Copley
6af7f8cd64 Revert "Revert back to using document._importNode() for ajax posting"
This reverts commit b6ed694995.
2011-05-02 11:55:16 -07:00
Zach Copley
3187d6184f Revert "Arg. Gotta remember to take out console.log() debug statements before committing :D"
This reverts commit bd3eb331a8.
2011-05-02 11:55:04 -07:00
Evan Prodromou
1e2d317b9c remove action-specific from RequireValidatedEmail 2011-05-02 11:21:37 -07:00
Evan Prodromou
b906fe75b6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-01 17:25:59 -07:00
Samantha Doherty
daf1a4046b Style for Onboard plugin and a few new graphics. 2011-05-01 14:09:44 -04:00
Evan Prodromou
6464c77505 fix warning for logs 2011-04-29 12:48:41 -07:00
Evan Prodromou
6868bf461a whitespace problems in directory translations 2011-04-29 11:11:04 -07:00
Evan Prodromou
480fdea5ca error in uk translation file 2011-04-29 11:08:31 -07:00
Evan Prodromou
5df38bba17 fix fatal error in eo translation file 2011-04-29 11:07:30 -07:00
Evan Prodromou
5702b646fb fixup bug in sv translation 2011-04-29 11:02:03 -07:00
Evan Prodromou
142b2ca5f4 fixup bug in tl translation 2011-04-29 11:01:02 -07:00
Evan Prodromou
e1b7db655c fixup bug in sv translation 2011-04-29 11:00:24 -07:00
Evan Prodromou
3399be00e9 fixup bug in nl translation 2011-04-29 10:58:55 -07:00
Evan Prodromou
7a713a3b06 fixup bug in mk translation 2011-04-29 10:58:14 -07:00
Evan Prodromou
bc9a092df6 fixup bug in ko translation 2011-04-29 10:57:18 -07:00
Evan Prodromou
5ed8151a47 fixup bug in ia translation 2011-04-29 10:56:20 -07:00
Evan Prodromou
5e7e5dd93c fixup bug in de status 2011-04-29 10:55:02 -07:00
Siebrand Mazeland
e573d4b3a4 Simplify message. 2011-04-29 19:23:13 +02:00
Siebrand Mazeland
558a512ac7 Update translator documentation.
Update L10n.
Update whitespace.
2011-04-29 19:22:44 +02:00
Siebrand Mazeland
4651c9d94a Fix L10n/i18n.
Some remaining people tag -> list.
Favor -> like
Update translator documentation.
Whitespace updates.
2011-04-29 18:59:47 +02:00
Siebrand Mazeland
c13fbfb2d2 Update i18n,
Add onPluginVersion().
Add translator documentation.
Update whitespace.
2011-04-29 17:11:22 +02:00
Siebrand Mazeland
1ec1f9378a Whitespace updates.
Translator documentation.
2011-04-29 12:30:30 +02:00
Zach Copley
cb6b5b2cc6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  more verbose, better checks for installforemail
  Check for unavailable site nicknames in DomainStatusNetwork
  Status_network::setupDB() sets up related tables too
  Class to store unavailable status network names
  First version of installer for domain-based status networks
  Ignore empty email whitelist string
  Don't redefine 'STATUSNET' in installer
  move registeremailuser.php back to email registration
  Move common domain-to-network mapping to the plugin module
  move external libs for domains here
  move domain status network scripts
  Revert "Add DomainStatusNetwork plugin"
  add DomainStatusNetwork plugin
  Add DomainStatusNetwork plugin
  utility functions for setting config options in memory
  get a free site nickname by email or domain
  TLD utilities
  script to determine site nickname by domain
  lookup a statusnetwork by tag
2011-04-28 15:54:13 -07:00
Zach Copley
cd0d7be251 Add registration events to EmailregisterAction 2011-04-28 15:53:17 -07:00
Evan Prodromou
83819737d7 more verbose, better checks for installforemail 2011-04-28 15:30:59 -07:00
Evan Prodromou
ddead1e611 Check for unavailable site nicknames in DomainStatusNetwork 2011-04-28 15:30:23 -07:00
Evan Prodromou
7ed3b9cf3f Status_network::setupDB() sets up related tables too 2011-04-28 15:29:36 -07:00
Evan Prodromou
1b6ff2f22a Class to store unavailable status network names 2011-04-28 15:29:13 -07:00
Evan Prodromou
02c5d68bed Merge branch 'emailsitesetup' into 1.0.x 2011-04-28 12:44:21 -07:00