summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-06-26Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-06-26Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-06-26Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-06-26Fix for bug #2382: releasing claim on failed queue item works again with ↵Brion Vibber
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-26Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-06-26Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26Merge branch 'master' into testingBrion Vibber
2010-06-24Have API methods for search subclass ApiPrivateAuthActionZach Copley
2010-06-24Regression fix for Recaptcha on SSL registration page; their API is served ↵Brion Vibber
on a different hostname for SSL.
2010-06-23Fix for ticket http://status.net/open-source/issues/2380 "AutofocusZach Copley
shouldn't override scroll" -- Thanks @michaeltwofish!
2010-06-22Throw an error if queueing is disable when using an IM pluginCraig Andrews
2010-06-22- Add profile_info tag to Atom authorZach Copley
- Normalize xmlns:statusnet links in the API
2010-06-21Update pot file.Siebrand Mazeland
2010-06-21Improve error message per discussion on ↵Siebrand Mazeland
http://translatewiki.net/wiki/Thread:Support/Unclear_message. Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-21Localisation updates from http://translatewiki.netSiebrand Mazeland
2010-06-21quick-fix for localization typo per #2366 (also fixed upstream in translatewiki)Brion Vibber
2010-06-20RecaptchaPlugin: fix for missing captcha on iPhone/Android.Brion Vibber
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-18Catch a couple of missing XML namespace declarations on API XML output. ↵Brion Vibber
Missing NS declarations were breaking XML parsing for some clients since beaecb18d5b92b913473dfffd545dc436f50cf66
2010-06-17Include source client's related URL (if any) in source attribution forZach Copley
Atom notice feeds
2010-06-17adding a Status_network::updateKeys() method, since DB_DataObject update ↵James Walker
doesn't do keys.
2010-06-16Fix problem with AvatarLink in which it was sometimes leaving the width ↵Zach Copley
attribute empty
2010-06-16Merge branch 'master' of gitorious.org:statusnet/mainlineZach Copley
* '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-17Localisation updates from http://translatewiki.netSiebrand Mazeland
2010-06-16- More useful group info from api/statusnet/group/showZach Copley
- Add statusnet:group_info tag to group Atom feeds
2010-06-16Use presence of IM plugins to decide if "IM" options should be availableCraig Andrews
2010-06-16Merge branch 'master' into testingBrion Vibber
2010-06-16Switch OpenID server's redirects from 307 to 303 to avoid prompt for form ↵Brion Vibber
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-15Use presence of IM plugins to decide if "IM" menu option should be shown in ↵Craig Andrews
Connect
2010-06-14fix URL regex for tags to use UTF-8Evan Prodromou
2010-06-14Merge branch 'master' into testingBrion Vibber
2010-06-13admin panel for setting site-claim metadataEvan Prodromou
2010-06-13show site claim keys on top pageEvan Prodromou
2010-06-11Fix for DB error reporting in installer (MySQL path)Brion Vibber
2010-06-11Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-06-11Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-06-11Merge branch 'testing' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-06-11Fix a couple bad format entries in router setup (format param had 'xmljson' ↵Brion Vibber
instead of 'xml|json'). Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at!
2010-06-11Localisation updates from http://translatewiki.netSiebrand Mazeland
2010-06-10Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: lib/default.php lib/util.php plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10Fix for compile error (misnamed function) in ↵Brion Vibber
4211b7f01188b4ab64407e32b380366a048102f4
2010-06-10Ticket #2350: fix for incorrect FOAF sioc:follows entries for users who are ↵Brion Vibber
followed by, but don't themselves follow the user whose FOAF we're displaying.
2010-06-10Ticket #2349: fix for Geonames semantic reference URLs in FOAF output ↵Brion Vibber
(corrects a typo in the patch added in 4463768b)
2010-06-09Revert "added notice.location to group by"Brenda Wallace
This reverts commit 48dc899acb9a0ac87140353092dab1f5e67753d8.
2010-06-08added missing authorBrenda Wallace
2010-06-08added missing authorsBrenda Wallace
2010-06-08added missing authorsBrenda Wallace
2010-06-08added 2 missing authors, foudn automatically in git logsBrenda Wallace
2010-06-07Merge branch 'integration' into testingBrion Vibber
2010-06-07Basic custom CSS and theme uploading features. 'local' subdir can now be ↵Brion Vibber
customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base. Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory. Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced. Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default. Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled']. Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over) Can set $config['local']['dir'] etc; not currently exposed in the admin panels. Per-site directories on a separate themes server could be set up such as: $config['local']['dir'] = '/path/to/themes/local/' . $_nickname; $config['local']['server'] = 'themes.example.com'; $config['local']['path'] = '/local/' . $_nickname; $config['local']['ssl'] = 'never';
2010-06-07break up the giant form function in design admin panel into individual ↵Brion Vibber
sections to make it a little more manageable