Evan Prodromou
32f47004df
get correct profile for friends timeline
2011-05-25 12:51:21 -04:00
Evan Prodromou
b34e267e53
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
Evan Prodromou
fd847c29c5
Make emailregistration more invitation-friendly
2011-05-23 17:45:41 -04:00
Evan Prodromou
c85eeb868e
note converted user id on registration
2011-05-23 17:25:00 -04:00
Evan Prodromou
b0b8d36439
registered_user_id can be null
2011-05-23 17:23:54 -04:00
Evan Prodromou
cb283be071
Add registered_user_id column to invitation
...
It's valuable for us to know which, if any, invitations have been converted.
2011-05-23 16:40:48 -04:00
Evan Prodromou
cb090ab48d
increment alpha version revision
2011-05-23 12:37:29 -04:00
Evan Prodromou
86a7889012
render question description in QnA plugin
2011-05-23 12:33:16 -04:00
Evan Prodromou
f1772b75d5
render question description in QnA plugin
2011-05-23 12:30:34 -04:00
Evan Prodromou
3f3babbcf2
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
2011-05-23 12:29:08 -04:00
Siebrand Mazeland
def0483c5e
Small change to kick syntax highlighter into shape.
2011-05-20 16:58:02 +02:00
Siebrand Mazeland
4aaba2d5f4
Superfluous whitespace removed.
2011-05-20 16:57:21 +02:00
Siebrand Mazeland
e48c26e156
Update translator documentation, i18n and L10n.
2011-05-20 16:57:05 +02:00
Siebrand Mazeland
3501ad6c77
Add FIXME for missing i18n.
2011-05-20 16:56:12 +02:00
Siebrand Mazeland
1d1a929718
Update translator documentation and L10n.
2011-05-20 16:03:53 +02:00
Evan Prodromou
5a86900a34
minor alpha version for i18n build errors
2011-05-20 06:09:37 -07:00
Evan Prodromou
9c4c2c710f
remove stray newlines that were causing problems with the build
2011-05-20 06:08:42 -07:00
Evan Prodromou
c2f735a84e
rev to alpha3
2011-05-20 06:03:36 -07:00
Evan Prodromou
b9f8e6e8cc
fail quickly if we can't find a for DomainStatusNetwork
2011-05-19 15:30:38 -04:00
Samantha Doherty
1a165a5636
Interim style update for mobile profile.
2011-05-18 14:36:05 -04:00
Samantha Doherty
fbc5de3268
Add missing li tags in settings and admin menus.
2011-05-18 12:13:34 -04:00
Samantha Doherty
2a0dc2291d
Toggle to show and hide local nav.
2011-05-18 11:08:31 -04:00
Samantha Doherty
e3acf5b72b
Remove primary nav and notice form overrides, and extra notice forms, from MobileProfile.
2011-05-18 10:13:06 -04:00
Samantha Doherty
4549d36862
Change addressees arrow from hardcoded to CSS.
2011-05-18 09:49:01 -04:00
Samantha Doherty
0f5aab8cd5
Small syntax fix for inline reply placeholder.
2011-05-18 09:23:55 -04:00
Zach Copley
73251c7629
Script to cancel an email registration
2011-05-16 13:37:55 -07:00
Zach Copley
4718063a78
Script to cancel an email registration
2011-05-16 13:25:26 -07:00
Zach Copley
125141a0c6
Make the effects for adding/removing invites less jerky
2011-05-11 17:20:24 -07:00
Samantha Doherty
f44e0330df
Style for fancy invite form item controls.
2011-05-11 20:12:32 -04:00
Zach Copley
4a04291c16
Make add/remove item buttons work the same way they do on the extended profile form
2011-05-11 16:29:35 -07:00
Zach Copley
607fa56449
Don't add the user's domain to invitee domains unless it's on the whitelist
2011-05-11 16:19:51 -07:00
Zach Copley
84c8ffc28a
Show confirm dialog when deleting an invite (if the user has already entered an email address)
2011-05-11 16:00:35 -07:00
Zach Copley
04a593487a
Change whitelist invite form's add new item control to be consistent with similar controls elsewhere
2011-05-11 14:33:22 -07:00
Samantha Doherty
37cf7c0e8c
Style for invite forms and width fix for Onboard popup.
2011-05-11 17:07:08 -04:00
Samantha Doherty
d0c850f380
Quick fix for extended profile js buttons
2011-05-11 16:57:42 -04:00
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