summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-26Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.xEvan Prodromou
2010-04-26Give users more control over URL shorteningEvan Prodromou
Users and administrators can set how long an URL can be before it's shortened, and how long a notice can be before all its URLs are shortened. They can also turn off shortening altogether. Squashed commit of the following: commit d136b390115829c4391b3666bb1967f190a0de35 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:39:00 2010 -0400 use site and user settings to determine when to shorten URLs commit 1e1c851ff3cb2da5e0dc3a0b06239a9d9c618488 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:38:40 2010 -0400 add a method to force shortening URLs commit 4d29ca0b91201f6df42940297ed5b64b070efe49 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:37:41 2010 -0400 static method for getting best URL shortening service commit a9c6a3bace0af44bcf38d1c790425a7be9c72147 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:37:11 2010 -0400 allow 0 in numeric entries in othersettings commit 767ff2f7ecfd7e76e8418fc79d45e61898f09382 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:36:46 2010 -0400 allow 0 or blank string in inputs commit 1e21af42a685f600f4a53f49a194013e78b12f20 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:01:11 2010 -0400 add more URL-shortening options to othersettings commit 869a6be0f5779aff69018d02f9ac0273946040d9 Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 14:22:51 2010 -0400 move url shortener superclass to lib from plugin commit 9c0c9863d532942b99184f14e923fc3c050f8177 Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 14:20:28 2010 -0400 documentation and whitespace on UrlShortenerPlugin commit 7a1dd5798f0fcf2c03d1257a18ddcb9008879de0 Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 14:05:46 2010 -0400 add defaults for URL shortening commit d259c37ad231ca0010c60e5cfd397bb1732874a4 Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 13:40:10 2010 -0400 Add User_urlshortener_prefs Add a table for URL shortener prefs, a corresponding class, and the correct mumbo-jumbo in statusnet.ini to make everything work.
2010-04-18Don't attempt to retrieve the current user from the DB while processing a DB ↵Craig Andrews
error
2010-04-18Use PHP exceptions for PEAR error handling.Craig Andrews
Allows for the common try/catch construct, which makes error handling cleaner and easier.
2010-04-18Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: actions/confirmaddress.php actions/imsettings.php
2010-04-17don't attempt to read a user's ldap passwordCraig Andrews
2010-04-17json_encode strings put out as javascriptCraig Andrews
2010-04-15Merge branch 'testing' into 0.9.xBrion Vibber
2010-04-15Merge branch 'master' into testingBrion Vibber
2010-04-15Allow setconfig.php to Print Entire ConfigChristopher Vollick
Previously it only printed out the configuration in the DB. Now it can also print out the entire current configuration.
2010-04-15Allow cross-site ajax with CORS.Craig Andrews
Only allows un-credentialed (as in, no cookies or basic auth), no custom headers, and get (no post, put, delete, etc) requests.
2010-04-14Merge branch 'testing' into 0.9.xBrion Vibber
2010-04-14Merge branch 'master' into testingBrion Vibber
2010-04-14Ticket #2205: pass geo locations over Twitter bridge (will only be used if ↵Brion Vibber
enabled on the Twitter side)
2010-04-14Merge branch 'testing' into 0.9.xBrion Vibber
2010-04-14Merge branch 'master' into testingBrion Vibber
2010-04-14Fix for "#foo !foo" in same notice failing during save, causing failout ↵Brion Vibber
before distribution. Move saveGroups after saveTags when saving notices; groups may save additional tags, so need to be moved after so the check for duplicates actually works.
2010-04-14move comment to correct placeBrion Vibber
2010-04-12Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-12showplugins.php: dump list of activated plugins and their settings on this siteBrion Vibber
2010-04-12showplugins.php: dump list of activated plugins and their settings on this siteBrion Vibber
2010-04-12Adding Dutch translation for OpenID plugin.Siebrand Mazeland
2010-04-11Number parametersSiebrand Mazeland
2010-04-11Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-11Add translator documentation and number parameters if multiple are used in a ↵Siebrand Mazeland
message.
2010-04-11Add translator documentation.Siebrand Mazeland
Fixed a few inconsistencies in the process. Confused about the e-mail related messages in the code.
2010-04-11Fix a typo and small error in translator documentationSiebrand Mazeland
2010-04-11Add translator documentation.Siebrand Mazeland
Fixed a few inconsistencies in the process. Apparently this code has been copied to imsettings.php, and some cases of 'email' had not been changed to 'IM'. Added FIXME for using globals/macros (?) in messages like "%%site.name%%". For easier/more consistent translation, this should preferably be plain %s parameters.
2010-04-11Add translator documentation and FIXMEs that plural support should be added ↵Siebrand Mazeland
for some messages.
2010-04-11Add translator documentation for uses of 'Yes' and 'No' in the interface.Siebrand Mazeland
2010-04-11Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-10Fix syntax errors that snuck in while documenting translationsBrion Vibber
2010-04-10Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: actions/confirmaddress.php
2010-04-10Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-04-10Allow blocking someone who's not currently subscribed to you (prevents ↵Brion Vibber
seeing @-replies from them, or them subbing to you in future)
2010-04-11* DB -> Database in messageSiebrand Mazeland
* some translator documentation added
2010-04-11Lower case "Web"Siebrand Mazeland
2010-04-10Add translator documentation.Siebrand Mazeland
2010-04-10Add translator documentationSiebrand Mazeland
* approved message had not been i18n-ed * also had to i18n 'read-only' and 'read-write'
2010-04-10i18n for low level logging is not needed.Siebrand Mazeland
2010-04-10Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-10Add translator documentation for a few filesSiebrand Mazeland
* added a few XXX (that's StatusNet for FIXME, right?) ** proposing de-duplication of a message appearing ~50 times ** marking bad pagination implementation * moved the TRANS: comments in action.php down to exactly before the line in which the message appears. Otherwise gettext does not put them in the pot file * fixed a XXX in action.php removing double spaces
2010-04-10catch UserNoProfileException and continueEvan Prodromou
2010-04-10Document messages for which clarification was requested.Siebrand Mazeland
Because N/S/E/W were on the same lines, and the "// TRANS:" comment must be directly above the line in which the message is located to work, I added the messages to a variable first.
2010-04-10Document messages for which clarification was requested.Siebrand Mazeland
2010-04-10Fix double space in messageSiebrand Mazeland
2010-04-10Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-09Fix inconsistencies in clientError() messagesSiebrand Mazeland
* use correct punctuation * single quotes when replace was possible * wording updated when needed
2010-04-10Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-10Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.xSiebrand Mazeland