Evan Prodromou
0dbdcf2936
Merge branch 'master' into 1.0.x
2011-05-30 11:18:34 -04:00
Evan Prodromou
19b965d991
Merge branch 'master' into testing
2011-05-30 11:18:22 -04:00
Evan Prodromou
cb4f271002
test to check that Bookmark related links are appearing correctly
2011-05-30 10:04:25 -04:00
Evan Prodromou
9167ba8d2d
ActivityImporter catches thrown exceptions by plugins and marks entry done
2011-05-30 09:57:49 -04:00
Evan Prodromou
97debbab68
use integer iterator for childNodes in ActivityUtils::getLinks()
2011-05-30 09:57:11 -04:00
Samantha Doherty
1264db7f78
A little more style fixing for MobileProfile.
2011-05-27 12:07:24 -04:00
Samantha Doherty
70f01b2b34
Remove privacy checkbox replacement from Mobile Profile.
2011-05-27 11:50:49 -04:00
Evan Prodromou
aca6338d50
Merge branch '1.0.x' into testing
2011-05-27 11:25:55 -04:00
Evan Prodromou
d7a16929b9
Set the current user on API calls
2011-05-25 14:01:22 -04:00
Evan Prodromou
a838891c0e
set the current user in api actions
2011-05-25 13:04:35 -04:00
Evan Prodromou
32f47004df
get correct profile for friends timeline
2011-05-25 12:51:21 -04:00
Samantha Doherty
ba55d4d010
First batch of IE fixes.
2011-05-24 12:56:49 -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
