Commit Graph

11630 Commits

Author SHA1 Message Date
Zach Copley
f283a283b7 Fix syntax error 2010-10-21 01:17:59 +00:00
Siebrand Mazeland
fb12094f61 i18n/L10n updates, translator docs updated, superfluous whitespace removed. 2010-10-21 03:10:46 +02:00
Zach Copley
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
Zach Copley
e56385a7bb Use a new table (oauth_token_association) to associate authorized
request tokins with OAuth client applications and profiles.
2010-10-20 17:21:04 -07:00
Siebrand Mazeland
31f52ec37c Update translator documentation and remove superfluous whitespace. 2010-10-21 02:02:37 +02:00
Siebrand Mazeland
1603b7afc9 i18n/L10n updates, translator comments added/fixed, superfluous whitespace removed. 2010-10-21 01:53:42 +02:00
Brion Vibber
8fd44a13bf Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-20 16:19:24 -07:00
Brion Vibber
bd7c8825ce Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-20 16:18:48 -07:00
Samantha Doherty
16aec72984 Wee fixin for overflowing notice content in sidebar. 2010-10-20 19:18:21 -04:00
Brion Vibber
152e4f8e89 Merge branch '0.9.x' into openid-oauth 2010-10-20 16:16:28 -07:00
Brion Vibber
e611ec5dee Fix option settings on oauth_post_notice.php 2010-10-20 16:16:00 -07:00
Brion Vibber
c24f4ddfdb Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating. 2010-10-20 16:14:32 -07:00
Siebrand Mazeland
28ec9d6463 * translator documentation added.
* moved some translator comments that were not directly above the line with the message to the correct location.
* i18n for UI text.
* superfluous whitespace removed.
2010-10-21 01:12:56 +02:00
Brion Vibber
bcc06d05e8 Initial OpenID+OAuth thingy. 2010-10-20 15:59:27 -07:00
Brion Vibber
9d401e2b15 Fix --oauth-token-secret on oauth_verify_creds.php 2010-10-20 15:17:56 -07:00
Brion Vibber
8004e2809d Fix for ticket #2845: singleuser nickname configuration was being overridden by site owner in router setup.
I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset.
This is now called consistently from the places that needed to use the primary user's nickname in routing setup.

Setting $config['singleuser']['nickname'] should now work again as expected.
2010-10-20 14:34:25 -07:00
Siebrand Mazeland
75ebf3c348 Localisation updates from http://translatewiki.net. 2010-10-20 22:16:13 +02:00
Zach Copley
3d6a0f730d Revert DB change for OAuth. Change compound key for oauth_application_user
back to (profile_id, application_id). I think we can get away without
a DB change by only issuing one anonymous access token per user.
2010-10-20 11:41:04 -07:00
Siebrand Mazeland
ac4afb31e8 Consistent punctuation. 2010-10-20 20:29:59 +02:00
Siebrand Mazeland
59d0be4761 * i18n for many missing messages (???)
* add translator documentation.
2010-10-20 20:28:04 +02:00
Siebrand Mazeland
e980da3d20 Add FIXME 2010-10-20 20:01:12 +02:00
Siebrand Mazeland
fb32108707 Localisation updates from http://translatewiki.net. 2010-10-20 19:51:49 +02:00
Siebrand Mazeland
dc62cf1c0b * i18n/L10n fixes.
* translator documentation updated/added.
* superfluous whitespace removed.
2010-10-20 19:34:27 +02:00
Siebrand Mazeland
17f5cc4f29 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2010-10-20 18:26:51 +02:00
Siebrand Mazeland
1459110124 Fix nasty bug in parameter for e-mail notification for favourite. 2010-10-20 11:16:21 +02:00
Zach Copley
2760ef07f5 Stick OAuth developer help info in a section 2010-10-19 21:24:19 -07:00
Zach Copley
5ca29ab0de Merge branch 'anon-consumer' into 0.9.x 2010-10-19 21:01:53 -07:00
Zach Copley
e8b6d7c946 Add support for an anonymous OAuth consumer. Note: this requires a
small DB tweak.  Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).

http://status.net/open-source/issues/2761

This should also make it possible to have multiple access tokens
per application.

http://status.net/open-source/issues/2788
2010-10-19 20:54:53 -07:00
Samantha Doherty
d464ebfc12 Quick fix for wee regression in entity_action button hover states. 2010-10-19 21:33:56 -04:00
Siebrand Mazeland
bee51e1cec Localisation updates from http://translatewiki.net. 2010-10-20 02:43:14 +02:00
Siebrand Mazeland
5ee4e52488 Localisation updates from http://translatewiki.net. 2010-10-20 01:24:09 +02:00
Siebrand Mazeland
25b9552ec3 More complete sentence and translator documentation added. 2010-10-20 00:53:42 +02:00
Siebrand Mazeland
0157df7396 Add missing "address" 2010-10-20 00:49:12 +02:00
Siebrand Mazeland
4b4894b121 Many i18n/L10n updates and lots of descriptions for translators added. 2010-10-20 00:35:39 +02:00
Brion Vibber
d358c88f94 Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-19 15:10:47 -07:00
Brion Vibber
e13eb797c7 Fix PHP notice when submitting 'design' admin panel on a browser that doesn't support file uploads such as Mobile Safari 2010-10-19 15:09:45 -07:00
Brion Vibber
c31aac1113 Quick fix for bad message in en_GB (#2790) -- fixed upstream at http://translatewiki.net/w/i.php?title=StatusNet:A3894b1256ab040ed20a35eedeece8829c62d5ab-Direct_message_to_s_sent./en-gb&diff=2403802&oldid=1930996 2010-10-19 14:50:10 -07:00
Zach Copley
d48f4a81d6 Relax restrictions on URL validation for oauth_callback. We need to
allow custom schemes like mustard:// etc.
2010-10-19 19:29:21 +00:00
Zach Copley
5ac694c74f Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-19 12:08:48 -07:00
Zach Copley
5866493cae OAuth - better log messages 2010-10-19 12:07:59 -07:00
Samantha Doherty
fd55eef795 Just a little more mobile stylin. 2010-10-19 14:08:01 -04:00
Samantha Doherty
f6bf804f1a Quick mobile stylesheet for shiny theme. 2010-10-19 12:27:50 -04:00
Samantha Doherty
e5ae754020 Big updates for themes rebase, clean, and shiny. A few more adjustments to come for 0.9.6, time (probably not) permitting. 2010-10-19 11:07:53 -04:00
Siebrand Mazeland
6baba4a2e4 Fix casing of "translatewiki.net" 2010-10-19 02:26:39 +02:00
Brion Vibber
53d45d7ffb Merge branch '0.9.x' 2010-10-18 15:21:02 -07:00
Brion Vibber
39cfdf0d8b Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-18 14:50:31 -07:00
Brion Vibber
e8da3618c2 Bump version/string: 0.9.6 "Man on the Moon" 2010-10-18 14:49:02 -07:00
Brion Vibber
d26b7a12ca Bump README to 0.9.6 2010-10-18 14:48:11 -07:00
Evan Prodromou
13571b32ea Merge remote branch 'gitorious/0.9.x' into 0.9.x 2010-10-18 17:38:51 -04:00
Siebrand Mazeland
7ed485ea49 Localisation updates from http://translatewiki.net 2010-10-18 23:09:13 +02:00