Commit Graph

10130 Commits

Author SHA1 Message Date
Brion Vibber
ef7e85c0ab Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-06-26 15:09:08 -04:00
Brion Vibber
f0c5e7eca3 Fix for bug #2382: releasing claim on failed queue item works again with DB-based queues.
Warning: DB-based queue doesn't currently implement discarding of items after a retry limit. Failed items will be retried until they succeed.
2010-06-26 15:07:32 -04:00
Luke Fitzgerald
46f435a742 Merge remote branch 'statusnet/1.0.x' into msn-plugin 2010-06-26 09:12:59 -07:00
Brion Vibber
00e129b013 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-26 10:18:03 -04:00
Brion Vibber
696e4ba393 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26 10:17:36 -04:00
Brion Vibber
d9e56e15cc Merge branch 'master' into testing 2010-06-26 10:16:27 -04:00
Zach Copley
9eb5a976b0 Have API methods for search subclass ApiPrivateAuthAction 2010-06-24 18:11:50 -07:00
Brion Vibber
a6408be566 Regression fix for Recaptcha on SSL registration page; their API is served on a different hostname for SSL. 2010-06-24 15:21:04 +00:00
Zach Copley
72e486a322 Fix for ticket http://status.net/open-source/issues/2380 "Autofocus
shouldn't override scroll" -- Thanks @michaeltwofish!
2010-06-23 11:29:13 -07:00
Luke Fitzgerald
aa3fec73da Merge remote branch 'statusnet/1.0.x' into msn-plugin 2010-06-22 20:27:18 -07:00
Luke Fitzgerald
c5ad04c865 Lots of fixes for library. Almost have confirmation emails working 2010-06-22 20:26:23 -07:00
Craig Andrews
dad0b06a38 Throw an error if queueing is disable when using an IM plugin 2010-06-22 22:01:13 -04:00
Zach Copley
1eec7f779f - Add profile_info tag to Atom author
- Normalize xmlns:statusnet links in the API
2010-06-22 16:28:06 -07:00
Siebrand Mazeland
b59aba9543 Update pot file. 2010-06-21 20:17:32 +02:00
Siebrand Mazeland
87125a1395 Improve error message per discussion on http://translatewiki.net/wiki/Thread:Support/Unclear_message.
Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-21 20:15:26 +02:00
Siebrand Mazeland
f31a6de311 Localisation updates from http://translatewiki.net 2010-06-21 20:10:37 +02:00
Brion Vibber
1852eae36f quick-fix for localization typo per #2366 (also fixed upstream in translatewiki) 2010-06-21 08:07:12 -07:00
Brion Vibber
2e98a48f2b RecaptchaPlugin: fix for missing captcha on iPhone/Android.
MobileProfile serves pages out to iPhone and Android as application/xhtml+xml, which doesn't work with the default we we were loading recaptcha (as it used document.write). Switched to filling out a <div> from the AJAX API, which doesn't use document.write in the XHTML context.

Tested that view & submission works ok in following browsers:
Mobile: iPhone 3.1, Android 2.1, iPad 3.2 (this last doesn't trigger mobile theme tweaks)
Ubuntu 10.04: Firefox 3.6.3, Chrome 6
Mac 10.6: Safari 5/OS X 10.6.4
Windows 7: IE 8, Opera 10.56
2010-06-20 19:30:12 +00:00
Brion Vibber
7b7f09195a Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-20 11:38:27 -07:00
Luke Fitzgerald
f37228f413 Use built in email verifier 2010-06-20 15:53:36 +01:00
Brion Vibber
9d890e2be0 Catch a couple of missing XML namespace declarations on API XML output. Missing NS declarations were breaking XML parsing for some clients since beaecb18d5 2010-06-18 09:59:11 -07:00
Zach Copley
105c1a22d6 Include source client's related URL (if any) in source attribution for
Atom notice feeds
2010-06-17 23:08:40 +00:00
Luke Fitzgerald
7a6eb53b79 Merge remote branch 'statusnet/1.0.x' into msn-plugin 2010-06-17 18:50:45 +01:00
James Walker
b667092153 adding a Status_network::updateKeys() method, since DB_DataObject update doesn't do keys. 2010-06-17 13:44:17 -04:00
Zach Copley
a6ce4eef0d Fix problem with AvatarLink in which it was sometimes leaving the width attribute empty 2010-06-16 18:27:51 -07:00
Zach Copley
ba2bffa76e Merge branch 'master' of gitorious.org:statusnet/mainline
* 'master' of gitorious.org:statusnet/mainline:
  Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal.
2010-06-16 16:37:15 -07:00
Siebrand Mazeland
6d237abe44 Localisation updates from http://translatewiki.net 2010-06-17 00:28:05 +02:00
Zach Copley
d3d499879c - More useful group info from api/statusnet/group/show
- Add statusnet:group_info tag to group Atom feeds
2010-06-16 14:29:24 -07:00
Craig Andrews
1a62d1b493 Use presence of IM plugins to decide if "IM" options should be available 2010-06-16 16:00:54 -04:00
Luke Fitzgerald
6dd221957e Add comma to end of list and small cosmetic change 2010-06-16 20:58:27 +01:00
Brion Vibber
9684cbe3c6 Merge branch 'testing' into 0.9.x
Conflicts:
	plugins/OpenID/openidserver.php
2010-06-16 12:38:35 -07:00
Brion Vibber
d65d982681 Merge branch 'master' into testing 2010-06-16 12:37:14 -07:00
Luke Fitzgerald
d69aa725f7 Remove callback method as we're not using status changes 2010-06-16 20:35:46 +01:00
Brion Vibber
ce7176d987 Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal. 2010-06-16 12:30:37 -07:00
Luke Fitzgerald
6dbf0ab1fe Add callback for status changes 2010-06-16 18:05:29 +01:00
Luke Fitzgerald
b313bc3cde Remove any existing switchboard sessions when we (re)signon 2010-06-16 17:12:20 +01:00
Luke Fitzgerald
50610c2611 Added some more error handling and commenting 2010-06-16 14:15:08 +01:00
Luke Fitzgerald
a665739283 Added error reporting to SB socket writes and call endSBSession if socket is dead when we try to send a message 2010-06-16 02:31:51 +01:00
Luke Fitzgerald
6f388a8b50 Use correct array index access for switchBoardSessions in sendMessageToSBSession 2010-06-16 02:28:13 +01:00
Luke Fitzgerald
7b998f4b2a Reduced if statements used in sendOtherNetworkMessage 2010-06-16 02:25:09 +01:00
Luke Fitzgerald
47bc0ae4c4 Implemented error checking in sendOtherNetworkMessage 2010-06-16 02:23:19 +01:00
Luke Fitzgerald
242e8905cd Fix indentation 2010-06-16 02:16:29 +01:00
Luke Fitzgerald
3d36f24b49 Return true if OIM is sent successfully 2010-06-16 02:11:39 +01:00
Luke Fitzgerald
392ea6fd32 Correctly access length constants 2010-06-16 02:03:31 +01:00
Luke Fitzgerald
62a7f10275 $killsession parameter not needed - we'll kill the session later anyway 2010-06-16 01:43:55 +01:00
Luke Fitzgerald
956b24f05d Access constants and static methods properly ;) 2010-06-16 01:30:44 +01:00
Luke Fitzgerald
d52f6d5aea Removed unnecessary else statement 2010-06-16 01:24:28 +01:00
Luke Fitzgerald
2d883eed89 Reordered methods and changed properties to constants as needed 2010-06-16 01:22:52 +01:00
Luke Fitzgerald
d41298950b Added validate regexp and a few more comments 2010-06-16 00:04:59 +01:00
Craig Andrews
4ee2c12507 Use presence of IM plugins to decide if "IM" menu option should be shown in Connect 2010-06-15 17:04:15 -04:00