summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-11Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xZach Copley
2010-01-11Fix format specifier on page titleZach Copley
2010-01-11Regression fix: don't spew notices to log every time we get a non-cached ↵Brion Vibber
user object
2010-01-11fix long options on deleteuser.phpBrion Vibber
2010-01-11Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xSarven Capadisli
2010-01-11Removed periodSarven Capadisli
2010-01-11Explicitly reseting notice_in-reply-to valueSarven Capadisli
2010-01-11Apparently, I can't spell my family name.Sarven Capadisli
2010-01-11Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
2010-01-11Merge branch 'sessionidparam' into 0.9.xEvan Prodromou
Conflicts: lib/command.php
2010-01-11inject session before redirect for openid finish loginEvan Prodromou
2010-01-11inject session before redirect for loginEvan Prodromou
2010-01-11accept session fromEvan Prodromou
2010-01-11Merge branch 'sessionidparam' of ↵root
http://git.gitorious.org/~evan/statusnet/evans-mainline into sessionidparam
2010-01-10add session ID to local URL when server parts differEvan Prodromou
2010-01-10Sever -> server in error messageEvan Prodromou
2010-01-10Sever -> server in error messageEvan Prodromou
2010-01-10remove redirect to OTP on login from login, registerEvan Prodromou
2010-01-11Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
2010-01-10Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
2010-01-10Merge branch 'master' into 0.9.xEvan Prodromou
Conflicts: classes/Memcached_DataObject.php
2010-01-10defaultDesign was undefined; fixed thatEvan Prodromou
2010-01-10catch exceptions from snapshotEvan Prodromou
2010-01-10Fix routes for social graph API methods -- this takes care of Ticket #2151Zach Copley
2010-01-10catch exceptions from snapshotEvan Prodromou
2010-01-10check before saving a thumbnailEvan Prodromou
2010-01-10check before inserting File_oembed and File_thumbnailEvan Prodromou
2010-01-10don't put Users with object IDs in the cache, and don't fetch themEvan Prodromou
2010-01-10debugging code to find passed-in objects in munge_passwordEvan Prodromou
2010-01-10Merge branch 'master' of git@gitorious.org:statusnet/mainlineEvan Prodromou
2010-01-10Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
2010-01-10Lots of tiny message changes.Siebrand Mazeland
* Mostly punctuation updates so that the same message is used consistently in all of StatusNet. * Some cases of "Title Case" removed, because that does not appear to be used consistently.
2010-01-10Merge branch 'redironlogin' of ↵root
http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
2010-01-10fix check for ssl diff in loginEvan Prodromou
2010-01-10Merge branch 'redironlogin' of ↵root
http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
2010-01-10always set site/server to hostname if it existsEvan Prodromou
2010-01-10correctly check for ssl enabledEvan Prodromou
2010-01-10correctly check for ssl enabledEvan Prodromou
2010-01-10Merge branch 'redironlogin' of ↵root
http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
2010-01-09allow hostname with SSLEvan Prodromou
2010-01-09use nickname, not sitename, in domain for SSLEvan Prodromou
2010-01-10Merge commit 'mainline/0.9.x' into 0.9.xBrenda Wallace
2010-01-10fixed stray commaBrenda Wallace
2010-01-10Revert "fixed stay comma"Brenda Wallace
This reverts commit 2b273be400a0f4a3fc3df560e625ef0dfbd97f77.
2010-01-10fixed stay commaBrenda Wallace
2010-01-10Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
2010-01-10Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.xSiebrand Mazeland
2010-01-10* L10n updates: consistent puctuationSiebrand Mazeland
* i18n updates: number parameters if more than one are being used
2010-01-10Merge branch 'redironlogin' of ↵root
http://git.gitorious.org/~evan/statusnet/evans-mainline into redironlogin
2010-01-09correct superglobal variable nameEvan Prodromou