summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-06Merge branch '0.9.x' into cacheactivityEvan Prodromou
2010-12-06Merge branch 'master' into 0.9.xEvan Prodromou
2010-12-06Merge branch 'master' of gitorious.org:statusnet/mainlineEvan Prodromou
2010-12-06Config flag to disable router caching if neededEvan Prodromou
2010-12-06use Cache::codeKey() in Router classEvan Prodromou
2010-12-06Make code-dependent cache entries more volatileEvan Prodromou
If a cache entry is dependent on the code that's running, upgrading (or enabling/disabling plugins) can generate hard-to-track inconsistencies. This change adds a close-to-unique fingerprint of the running code to some cache keys, so that if the fingerprint changes, the old values are ignored and new values are used. If the automated uniqueness fails, an administrator can add an extra config value, $config['site']['build'], that's thrown into the key also.
2010-12-06Config flag to disable router caching if neededEvan Prodromou
2010-12-06use Cache::codeKey() in Router classEvan Prodromou
2010-12-06Make code-dependent cache entries more volatileEvan Prodromou
If a cache entry is dependent on the code that's running, upgrading (or enabling/disabling plugins) can generate hard-to-track inconsistencies. This change adds a close-to-unique fingerprint of the running code to some cache keys, so that if the fingerprint changes, the old values are ignored and new values are used. If the automated uniqueness fails, an administrator can add an extra config value, $config['site']['build'], that's thrown into the key also.
2010-12-06cache generated activity infoEvan Prodromou
2010-12-06Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
2010-12-06correctly generate enclosure in Activity::asString()Evan Prodromou
2010-12-06Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: classes/User.php
2010-12-06Added User::singleUserNickname() as (temporary?) fallback for single-user ↵Brion Vibber
lookup as a workaround for site setup of 1user sites. We found that an external tool attempting to spin up StatusNet and then register the user would fail because StatusNet's router setup dies on being unable to find its single-user account, since the nickname is needed in setting up routing entries. This tweak will let it survive, using the configured setting as a fallback if it can't actually find the user account.
2010-12-06remove common_debug() from Activity::asString()Evan Prodromou
2010-12-05updated NoticeTitle plugin to use new activity eventsEvan Prodromou
2010-12-05Change documentation for notice-to-activity eventsEvan Prodromou
Because I changed Notice::asAtomEntry() to use Notice::asActivity(), all the events that happened in that function have been removed. I removed the documentation for those events, and added documentation for the new events.
2010-12-05Convert Notice::asAtomEntry() to use Notice::asActivity() and ↵Evan Prodromou
Activity::asString() We had two ways to generate an activity entry from a notice; one through Notice::asAtomEntry() and one through Notice::asActivity() and Activity::asString(). The code paths had already diverged somewhat. I took the conditions that were in Notice::asAtomEntry() and made sure they were replicated in the other two functions. Then, I rewrote Notice::asAtomEntry() to use the other two functions instead. This change passes the ActivityGenerationTests unit tests, but there may be some other stuff that's not getting covered.
2010-12-02URL shortening fix for direct messages: if we're going to shorten the text, ↵Brion Vibber
shorten the rendered text too.
2010-12-02Fix for tickets #2917, #2262: user URL shortening options not being applied ↵Brion Vibber
in non-web channels common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc. Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that. Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little. Note also ticket #2919: there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.
2010-12-02* fix typo in parameter notationSiebrand Mazeland
* add FIXME for unused message * remove superfluous whitespace
2010-12-02* Fix an incorrectly formatted message parameter in line 334.Siebrand Mazeland
* i18n/L10n updates * translator documentation updated
2010-12-01Ticket #2912 further cleanup: use JS on emailsettings form to help connect ↵Brion Vibber
the 'I want to post by email' checkbox with the controls for adding or removing a post-by-email alias. Now, when you first come up the checkbox will most likely be off and the button to create an address is grayed out. Checking the box enables use of the 'new' button to generate an email address -- it's left disabled until you check the box, so you can't accidentally trip it. Actually adding the address now enables the post-by-mail option, as well, thus ensuring that it's saved. WARNING: OTHER CHANGES ON THE FORM WILL STILL BE LOST. Removing the address now disables the post-by-mail option, so it's not sitting around confusingly enabled but useless. You can still disable the checkbox manually without removing the address, in case you want to keep it for later. It's also still possible to actually save it in the state where the option is enabled, but there's no configured address, but that shouldn't happen too often. Possibly that should be prevented outright though.
2010-12-01Ticket #2912 tweaks: clean up wording on the incoming email generator box a bit.Brion Vibber
2010-12-01Ticket #2912: move 'I want to post notices by email" checkbox up from the ↵Brion Vibber
email *output* prefs up into the box for the address to post to, so they're next to each other.
2010-12-01Fix for ticket #2911: Hitting enter on the "associate with current account" ↵Brion Vibber
in OpenID flow failed due to forms being mixed together Separating the two forms (one to create a local account, the other to attach the OpenID to an existing account) gets them working -- enter activates the appropriate default button.
2010-12-01Fix dumb mistake -- changed function names partway through writing Nickname ↵Brion Vibber
and forgot to update a couple places. :)
2010-12-01add OpenID data to the Webfinger XRD file so you can login with it elsewhereEvan Prodromou
2010-12-01Merge remote branch 'gitorious/0.9.x' into 0.9.xEvan Prodromou
2010-12-01Ticket #2913: Realtime background update marker no longer triggers false ↵Brion Vibber
positives when clearing the marker on switching away from the tab in Firefox 4 We were clearing the counter on the window title in the blur event, which gets fired *after* we switch away, thus triggering Firefox to mark the tab as updated again. Clearing the counter on *focus* instead avoids this, and keeps the counter out of the way as well.
2010-11-30Fix ticket #2914: Realtime no longer tells you it's got a message queued up ↵Brion Vibber
when it's really the one you just sent out and is already visible.
2010-11-30Went through realtimeupdate.js and added documentation comments -- does not ↵Brion Vibber
alter the minified version. :) Identified several bugs and fixmes, and added more thorough labeling of the issues with replicating the entire HTML structure of notices (no i18n, missing new features, maintenance problems, possible other issues)
2010-11-30Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: lib/router.php
2010-11-30Flush router cache when saving Twitter admin settings: adding/removing keys ↵Brion Vibber
can enable/disable some actions. This avoids having users' Twitter settings unreachable after adding your keys to an installation with TwitterBridge on but not pre-configured.
2010-11-30BitlyPlugin: fix for shortening URLs containing ampersand (&)Brion Vibber
2010-11-30Localisation updates from http://translatewiki.net.Siebrand Mazeland
2010-11-30Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.xEvan Prodromou
2010-11-30Merge branch 'master' into 0.9.xEvan Prodromou
Conflicts: lib/router.php
2010-11-30was using Cache::get() and ::set() wrongEvan Prodromou
2010-11-30Localisation updates from http://translatewiki.net.Siebrand Mazeland
2010-11-30a quick script to flush the router from cache if neededEvan Prodromou
2010-11-30a quick script to flush the router from cache if neededEvan Prodromou
2010-11-30use a CRC32 of the plugin names rather than actual namesEvan Prodromou
2010-11-30use a CRC32 of the plugin names rather than actual namesEvan Prodromou
2010-11-30Squashed commit of the following:Evan Prodromou
commit 39fdd181d95d2c39a3ea1ca330b10a99a92b961f Author: Evan Prodromou <evan@status.net> Date: Mon Nov 29 10:37:49 2010 -0500 use cache key prefix for router cache key commit 4cb9e56941922489b83d6425c059cf770991e68f Author: Evan Prodromou <evan@status.net> Date: Mon Nov 29 10:31:21 2010 -0500 use a unique hashkey based on the software version and loaded plugins commit 44458b48aef719543e11f83b41fded65cbcb8be9 Author: Evan Prodromou <evan@status.net> Date: Sat Nov 27 17:04:15 2010 -0500 cache the NUM object commit 809c188307a9b4ada15f3d7fa573a6034341efef Author: Evan Prodromou <evan@status.net> Date: Sat Nov 27 15:44:12 2010 -0500 accelerate routing by pivoting paths on actions
2010-11-30Squashed commit of the following:Evan Prodromou
commit 39fdd181d95d2c39a3ea1ca330b10a99a92b961f Author: Evan Prodromou <evan@status.net> Date: Mon Nov 29 10:37:49 2010 -0500 use cache key prefix for router cache key commit 4cb9e56941922489b83d6425c059cf770991e68f Author: Evan Prodromou <evan@status.net> Date: Mon Nov 29 10:31:21 2010 -0500 use a unique hashkey based on the software version and loaded plugins commit 44458b48aef719543e11f83b41fded65cbcb8be9 Author: Evan Prodromou <evan@status.net> Date: Sat Nov 27 17:04:15 2010 -0500 cache the NUM object commit 809c188307a9b4ada15f3d7fa573a6034341efef Author: Evan Prodromou <evan@status.net> Date: Sat Nov 27 15:44:12 2010 -0500 accelerate routing by pivoting paths on actions
2010-11-29Merge branch 'namecase' into 0.9.xBrion Vibber
2010-11-29Normalize username strings in command parsingBrion Vibber
2010-11-29General code safety: validate input and escape SQL strings in ↵Brion Vibber
common_relative_profile()
2010-11-29Use Nickname::DISPLAY_FMT instead of manual regex fragments in router setup ↵Brion Vibber
for nickname parameters.