summaryrefslogtreecommitdiff
path: root/classes
AgeCommit message (Collapse)Author
2010-05-14Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-05-12Need to always emit statusnet:notice_info so it's available in profile feedsZach Copley
2010-05-06Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-05-06Remove errant double HTML entity encoding in API source attributionZach Copley
2010-05-06Add source link attr to statusnet:notice_info element in Atom output for noticesZach Copley
2010-05-06Refactor and centralize notice source link calculationZach Copley
2010-05-06Add xmlns:statusnet and statusnet:notice_info element to Atom entries for ↵Zach Copley
notices
2010-05-05Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: locale/ca/LC_MESSAGES/statusnet.po locale/de/LC_MESSAGES/statusnet.po locale/statusnet.pot
2010-05-05Implement since_id and max_id param handling for /api/favoritesZach Copley
2010-04-30IM cleanup on 1.0.x branch:Brion Vibber
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them. * fix fatal error in IM settings while waiting for a Jabber confirmation. * Caching fix for user_im_prefs * fix for saving multiple transport settings * some fixes for AIM & using normalized addresses for lookups
2010-04-30Merge branch '0.9.x' into 1.0.xBrion Vibber
Conflicts: lib/util.php
2010-04-29Merge branch 'testing' into 0.9.xBrion Vibber
Conflicts: index.php
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-23Merge branch 'master' into testingBrion Vibber
2010-04-23Fix to make blowing of replies stream cache more consistent when receiving ↵Brion Vibber
replies. (Was being done at mail notify time instead of at save time for local replies; now moved to reply save time internally so it can't get forgotten)
2010-04-20Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-04-20Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-04-20Fix email notifications for @-replies that come via OStatus.Brion Vibber
* Moved notification sending from Notice::saveReplies to distrib queue handler, so it'll pull from the reply set we've saved regardless of how we got it. * Set up gettext infrastructure for command-line scripts; gets localization mail notifications etc working from background queues. * Adjusted locale switching: common_switch_locale() works at runtime for bg scripts, forces a message catalog update
2010-04-18Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: actions/confirmaddress.php actions/imsettings.php
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-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-09Fix for conversation check in @-reply notification email; i18n cleanup on ↵Brion Vibber
mail messages: fixed some bad gettext usage, added trans doc comments.
2010-04-09Fix for conversation check in @-reply notification email; i18n cleanup on ↵Brion Vibber
mail messages: fixed some bad gettext usage, added trans doc comments.
2010-04-09Merge branch 'master' of gitorious.org:statusnet/mainlineEvan Prodromou
2010-04-09Run block checks on remote OStatus repliesBrion Vibber
2010-04-09Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-04-09Run block checks on remote OStatus repliesBrion Vibber
2010-04-07Merge branch '0.9.x' into 1.0.xEvan Prodromou
2010-04-07Merge branch 'master' into 0.9.xEvan Prodromou
2010-04-07Merge branch 'master' into testingEvan Prodromou
2010-04-07show PEAR_Error message, not the objectEvan Prodromou
2010-04-02Merge branch '0.9.x' into 1.0.xBrion Vibber
Conflicts: actions/imsettings.php lib/jabber.php Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet. Should also move over the test cases.
2010-04-02Merge branch 'testing' into 0.9.xBrion Vibber
2010-04-02Don't save duplicate messages into a user's packed inbox. We've already got ↵Brion Vibber
the packed box loaded at insert time, so we can simply unpack it and check before doing the update query. Should help with dupes that come in when inbox distrib jobs die and get restarted, etc. Conflicts: classes/Inbox.php Looks like this was implemented on master recently and not copied up to testing. Merging to my version on testing as I've added some doc comments and extracted a couple functions for future ease of use.
2010-04-02Don't save duplicate messages into a user's packed inbox. We've already got ↵Brion Vibber
the packed box loaded at insert time, so we can simply unpack it and check before doing the update query. Should help with dupes that come in when inbox distrib jobs die and get restarted, etc.
2010-04-01Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-04-01Temporary hack until notice_profile_id_idx is updatedBrion Vibber
to (profile_id, id) instead of (profile_id, created, id). It's been falling back to PRIMARY instead, which is really very inefficient for a profile that hasn't posted in a few months. Even though forcing the index will cause a filesort, it's usually going to be better. Even for large profiles it seems much faster than the badly-indexed query.
2010-04-01Temporary hack until notice_profile_id_idx is updatedBrion Vibber
to (profile_id, id) instead of (profile_id, created, id). It's been falling back to PRIMARY instead, which is really very inefficient for a profile that hasn't posted in a few months. Even though forcing the index will cause a filesort, it's usually going to be better. Even for large profiles it seems much faster than the badly-indexed query.
2010-04-01Revert "Revert "don't insert the same notice twice into an inbox""Evan Prodromou
This reverts commit a09b27ff41df41a86fdb0abae14239907d5ee6ec.
2010-04-01Revert "don't insert the same notice twice into an inbox"Evan Prodromou
This reverts commit 650074c648d98f81674c6e2b0ebf052c473ada6e.
2010-03-31don't insert the same notice twice into an inboxEvan Prodromou
2010-03-31Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.xBrion Vibber