01f32e3998
Merge remote branch 'gitorious/1.0.x' into 1.0.x
...
Conflicts:
actions/urlsettings.php
2010-11-14 06:49:43 -05:00
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
51a756c211
Fix ticket #2860 : clarify API doc comments for 'source' parameter's interaction with OAuth on api/statuses/update
2010-11-03 14:58:33 -07:00
6e03456753
Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.
2010-11-03 13:10:42 -07:00
dc4fafbbd1
General cleanup & part of ticket #2864 : use User_group->getFancyName() instead of replicating the logic in various places. Encapsulates and allows for localization of parens.
2010-11-03 12:59:19 -07:00
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
a65362f7fa
Add context for different uses of "%1$s (%2$s)"
2010-11-02 23:08:59 +01:00
04ca706601
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
2010-11-02 15:02:10 -07:00
81e0653080
Merge branch 'pretty-title2' into 0.9.x
2010-11-02 14:21:23 -07:00
6a181bb128
Unrolled tagged vs untagged, page 1 vs page N message variants for showstream title. #2668
2010-11-02 14:20:06 -07:00
bc85f6914b
fix syntax error introduced in i18n tweaks: newgroup action
2010-11-02 14:03:50 -07:00
426cda5e1f
Alternate pretty-title tweaks for #2668
2010-11-02 13:42:44 -07:00
760a1c27bc
Update translator documentation.
2010-11-01 16:49:36 +01:00
6ab34fd8e8
* i18n/L10n updates.
...
* translator documentation added.
* superfluous whitespace removed.
2010-11-01 16:49:35 +01:00
5c6732c4bb
Update translator documentation.
2010-11-01 16:49:35 +01:00
1c0e84f066
Add forgotten translator documentation.
2010-10-31 01:26:39 +02:00
5406873007
* translator documentation updated.
...
* superfluous whitespace removed.
* added FIXMEs for missing documentation and un-i18n-able timestamps.
2010-10-31 01:16:59 +02:00
08edd1fedf
* i18n/L10n updates.
...
* translator documentation added/updated.
* superfluous whitespace removed.
2010-10-31 00:58:35 +02:00
234b03d945
* translator documentation updates.
...
* added FIXMEs in actions/showgroup.php.
* superfluous whitespace removed.
2010-10-30 14:36:54 +02:00
c4b8f68a1a
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-29 11:14:02 -04:00
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
8d0c014ced
Merge branch 'master' into 0.9.x
2010-10-28 13:01:10 -07:00
9ea7cafd27
Fix for regression: fatal error on group page display when not logged in.
...
Bug was introduced with group deletion feature.
2010-10-28 12:19:19 -07:00
796d7b4939
Update translator documentation.
2010-10-28 01:42:09 +02:00
04ae500749
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:21 +02:00
a12474a99d
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:09 +02:00
b3cd558fe7
Fix OAuth verifier display page title and msgs for i18n
2010-10-26 13:19:23 -07:00
93a8718f97
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-26 09:22:21 -04:00
1a1ca22aca
Supress header, footer, sidebar on OAuth verifier pin page when in "desktop" mode
2010-10-25 13:30:38 -07:00
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
82c280979d
Add special CSS classes to OAuth authorization and pin pages when
...
in desktop mode
2010-10-25 11:25:35 -07:00
479096c8d7
Less scary OAuth authorization messages when using anonymous consumer
2010-10-25 10:38:40 -07:00
0b6cc7c33d
* translator documentation added.
...
* superfluous whitespace removed.
2010-10-23 19:20:51 +02:00
3913b6a5d8
Updated styling for OAuth authorization page's desktop mode.
...
TODO: move these styles into the main CSS file.
2010-10-22 11:21:44 -07:00
568cb8a205
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-22 09:24:50 -04:00
131c339c5a
Pass OAuth authorize page's mode paramater to OpenID plugin so it can create a correct
...
returnto URL
2010-10-22 02:08:38 +00:00
ac45f661f6
Fix regression (whoops!)
2010-10-21 18:38:54 -07:00
c5a84ef76f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-21 18:16:35 -07:00
0b134d3e69
Re-camelcase ApiOauthAuthorizeAction so it will be accessible when
...
a site is in pivate mode
2010-10-21 18:15:11 -07:00
aa6ec40c51
Fix syntax errors
2010-10-22 00:48:26 +00:00
ce0d81c190
OAuth - inform consumer when user refused to authorize a request token
...
http://status.net/open-source/issues/2848
2010-10-21 17:11:59 -07:00
94f7bfa50a
Don't show 'anonymous' app in OAuth application list.
2010-10-21 16:42:59 -07:00
4ab110e071
Fix bad reference.
2010-10-21 14:52:41 -07:00
a548861dbf
OAuth - proper callback handling and better styling for authorization
...
page when in desktop mode
2010-10-21 14:45:42 -07:00
648f79be10
Change OAuth authorization page's action name to be inline with
...
other web page action names so the body id outputs correctly. Fix
some other bugs.
2010-10-21 13:00:59 -07:00
bab012bd67
New "desktop" mode for the OAuth authorization page. If mode=deskstop
...
is specified in the request the page is probably meant to be displayed
in a small webview of another application, so suppress header, aside
and footer.
2010-10-21 12:23:04 -07:00
cb74822e7a
i18n/L10n consistency updates.
2010-10-21 13:20:21 +02:00
fb12094f61
i18n/L10n updates, translator docs updated, superfluous whitespace removed.
2010-10-21 03:10:46 +02:00
bfdb8385ec
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
2010-10-20 17:28:28 -07:00
90c87553ee
Redirect to https when making an http request for a sensitive action
2010-10-20 20:26:35 -04:00
Evan Prodromou
Brion Vibber
Siebrand Mazeland
Zach Copley
Craig Andrews