Commit Graph

13691 Commits

Author SHA1 Message Date
Zach Copley
368b25fb34 When showing the email invite dropdowns, pre-select the user's own domain as the first option 2011-05-10 14:47:05 -07:00
Zach Copley
8597856b56 Fancier invitation form for whitelisted domains
Squashed commit of the following:

commit 1c0766e8f9d9e962ec553e2fb35bd2f944ffb4b0
Author: Zach Copley <zach@status.net>
Date:   Mon May 9 17:00:51 2011 -0700

    Make the invites from the fancier invite form save

commit 9ea45b7cf38eda8dad1d82e87b3400413a532079
Author: Zach Copley <zach@status.net>
Date:   Fri May 6 16:14:40 2011 -0700

    .js to let the user add (and remove) additional invitees from their domain

commit b2a02339bd11d02c7cba24629dde359e22de32b6
Author: Zach Copley <zach@status.net>
Date:   Thu May 5 15:44:49 2011 -0700

    Load special whitelist invite .js when loading the invite page

commit 132fed7550b40cd1d46ee506fd83974a116bce32
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:35:49 2011 -0700

    Remove settings class from whitelist inviter form

commit a38437351b505594aead5da86af9a5ed089666b6
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:21:18 2011 -0700

    Make a fancier form for whitelist domain invites

commit 710d4f41edf412871a9c1fbf33af317226485325
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:34:09 2011 -0700

    Add some more events to the invitation page

commit 2449e4e0c1bf11568968cfc3ea2d8e69db2d875e
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:12:36 2011 -0700

    Refactor invite action a bit
2011-05-09 17:07:36 -07:00
Siebrand Mazeland
bd7f74f0a5 Fix i18n issues.
Update translator documentation.
Whitespace updates.
2011-05-08 10:12:05 +02:00
Evan Prodromou
7b0ab409c9 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-05-06 17:19:05 -07:00
Evan Prodromou
55068030d2 hook for defining new read-write tables 2011-05-06 17:18:38 -07:00
Zach Copley
fc62a8f980 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-05 15:00:16 -07:00
Zach Copley
94c858d1e1 * Show group descriptions in group directory
* Truncate descriptions and bios in directory list when > 140c
2011-05-05 14:57:38 -07:00
Evan Prodromou
e863903263 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-05 14:45:50 -07:00
Evan Prodromou
78a9d4966e set the permissions properly for installer 2011-05-05 14:38:19 -07:00
Siebrand Mazeland
d4aef7a007 Localisation updates from http://translatewiki.net. 2011-05-05 23:24:49 +02:00
Samantha Doherty
68d960cceb Merge remote branch 'origin/1.0.x' into 1.0.x 2011-05-05 16:00:37 -04:00
Samantha Doherty
07d9832ce9 More stylin for user and group directories. 2011-05-05 15:59:15 -04:00
Evan Prodromou
763229aede Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-05-05 12:09:10 -07:00
Siebrand Mazeland
d906ee1bcb Update translator documentation and L10n. 2011-05-05 12:47:26 +02:00
Siebrand Mazeland
30bb740642 Hardcode newline outside of message to avoid issues with translations as fixed by Evan in Commit:6868bf461a5186be3eac619b73cc6550c6048f93. 2011-05-05 12:41:10 +02:00
Siebrand Mazeland
3b3bf74176 Harcode three newlines that lead to issues with translations (as fixed in Commit:5e7e5dd93cd3d73e2f2c93225cf8688844138380 by Evan). 2011-05-05 12:36:56 +02:00
Evan Prodromou
f8c3458216 Option to pre-load a plugin with checkschema script
One of the problems we've had with running large-scale hosting systems
for StatusNet is enabling new plugins. If the plugin is not enabled,
its database tables are not checked at script time. Conversely, if it
is enabled, it may take several hours to run checkschema for tens of
thousands of sites -- during which time users might see DB errors.

A new argument to checkschema lets it pre-load one or more plugins
before checking the schema. This lets us prepare the plugins' database
tables before they're used in production. In a multihome environment,
this can be combined with tags to gradually roll out a new plugin.

In the config file, a stanza like:

   $site = Status_network::getFromHostname(...);

   if ($site->hasTag('fooenabled')) {
      addPlugin('Foo');
   }

...will only enable the plugin on certain sites. Meanwhile, a bash
script like this should gradually enable the plugin:

   # For all sites...
   for site in `php allsites.php`; do
       # Update the schema for the Foo plugin
       php checkschema.php -s$site.wildcard -xFoo;
       # Enable the Foo plugin
       php settag.php -s$site.wildcard fooenabled;
   done
2011-05-04 21:05:25 -07:00
Evan Prodromou
c7511094db Merge branch '1.0.x' into testing 2011-05-04 18:45:23 -07:00
Zach Copley
c4aef15a15 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-04 16:13:42 -07:00
Zach Copley
f4a06719b1 Fix WSOD with EmailRegistration plugin's confirmation form 2011-05-04 16:12:49 -07:00
Evan Prodromou
67690b44c5 Merge branch '1.0.x' into testing 2011-05-04 15:00:50 -07:00
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