]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
13 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Wed, 2 Mar 2011 21:52:22 +0000 (13:52 -0800)]
Merge branch 'master' into 0.9.x

13 years agoAdd unsubscribe option to resub-feed.php
Brion Vibber [Wed, 2 Mar 2011 20:49:37 +0000 (12:49 -0800)]
Add unsubscribe option to resub-feed.php

13 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Wed, 2 Mar 2011 01:17:19 +0000 (17:17 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

13 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Wed, 2 Mar 2011 01:11:29 +0000 (17:11 -0800)]
Merge branch 'master' into 0.9.x

13 years agoMore fixes for 'fav' IM command: don't die with a fatal error if the notice has alrea...
Brion Vibber [Wed, 2 Mar 2011 01:09:41 +0000 (17:09 -0800)]
More fixes for 'fav' IM command: don't die with a fatal error if the notice has already been favored, and don't spew a warning when checking for user ID match.

13 years agoWorkaround for bug causing fatal error during favoriting; Profile::getCurrentNotice...
Brion Vibber [Wed, 2 Mar 2011 01:01:35 +0000 (17:01 -0800)]
Workaround for bug causing fatal error during favoriting; Profile::getCurrentNotice() was returning an ArrayList instead of a Notice directly due to pulling through Profile::getNotices(). This caused failure in Fave::addNew() which specifies it wants a Notice. Caused failure of the 'fav' IM command.

13 years agoMerge commit 'refs/merge-requests/153' of git://gitorious.org/statusnet/mainline...
Zach Copley [Tue, 1 Mar 2011 00:36:59 +0000 (16:36 -0800)]
Merge commit 'refs/merge-requests/153' of git://gitorious.org/statusnet/mainline into merge-requests/153

13 years agoMerge branch 'extprofile' into 0.9.x
Brion Vibber [Mon, 28 Feb 2011 18:45:53 +0000 (10:45 -0800)]
Merge branch 'extprofile' into 0.9.x

13 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Mon, 28 Feb 2011 18:18:18 +0000 (10:18 -0800)]
Merge branch 'master' into 0.9.x

13 years agoAPI group actions join/leave now handle same events of web UI action
macno [Mon, 28 Feb 2011 10:56:02 +0000 (11:56 +0100)]
API group actions join/leave now handle same events of web UI action

13 years agoIf there's a DB error, script returns after catching the exception
macno [Mon, 28 Feb 2011 10:53:11 +0000 (11:53 +0100)]
If there's a DB error, script returns after catching the exception

13 years agoFix for ticket #2248: flickr etc URLs that contain @ in the paths etc no longer accid...
Brion Vibber [Fri, 25 Feb 2011 23:46:35 +0000 (15:46 -0800)]
Fix for ticket #2248: flickr etc URLs that contain @ in the paths etc no longer accidentally trip the mailto: thingy

13 years agoTest case for ticket #2248: flickr URLs with @ in the path get misinterpreted as...
Brion Vibber [Fri, 25 Feb 2011 23:38:24 +0000 (15:38 -0800)]
Test case for ticket #2248: flickr URLs with @ in the path get misinterpreted as mailto

13 years ago* add support for Friulian
Siebrand Mazeland [Thu, 24 Feb 2011 12:02:11 +0000 (13:02 +0100)]
* add support for Friulian
* move a line around for sorting reasons

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 24 Feb 2011 11:52:28 +0000 (12:52 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoWorkaround for reply timeline since_id issue: save the notice.created value into...
Brion Vibber [Fri, 25 Feb 2011 21:22:13 +0000 (13:22 -0800)]
Workaround for reply timeline since_id issue: save the notice.created value into reply.modified, so we can key off it as expected.

As a hack this removes the mysql_timestamp bit from the field settings on reply.modified so that our value actually gets saved. This *should* work ok as long as system timezone is set correctly, which we now set to UTC to match when connecting.

13 years agofix layout of form with magic hoohaw
Evan Prodromou [Fri, 25 Feb 2011 21:18:28 +0000 (13:18 -0800)]
fix layout of form with magic hoohaw

13 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Fri, 25 Feb 2011 20:56:40 +0000 (12:56 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

13 years agoallow access to confirm first for not-logged-in users
Evan Prodromou [Fri, 25 Feb 2011 20:56:21 +0000 (12:56 -0800)]
allow access to confirm first for not-logged-in users

13 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Fri, 25 Feb 2011 20:24:18 +0000 (12:24 -0800)]
Merge branch 'master' into 0.9.x

13 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Fri, 25 Feb 2011 20:24:18 +0000 (12:24 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

13 years agoScalability work on user backup stream generation.
Brion Vibber [Fri, 25 Feb 2011 19:04:57 +0000 (11:04 -0800)]
Scalability work on user backup stream generation.

UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits.
This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory.

Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion.
Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior.

There should be a better way to do this, swapping out the stringer output for raw output more consitently.

13 years agoQuick fix for popular notices in cleaner theme.
Samantha Doherty [Fri, 25 Feb 2011 18:43:21 +0000 (13:43 -0500)]
Quick fix for popular notices in cleaner theme.

13 years agoTest cases for Unicode hashtags
Brion Vibber [Fri, 25 Feb 2011 18:25:13 +0000 (10:25 -0800)]
Test cases for Unicode hashtags

13 years agoMerge branch 'unicode-tag' into 0.9.x
Brion Vibber [Fri, 25 Feb 2011 18:17:03 +0000 (10:17 -0800)]
Merge branch 'unicode-tag' into 0.9.x

13 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Fri, 25 Feb 2011 18:16:00 +0000 (10:16 -0800)]
Merge branch 'master' into 0.9.x

13 years agoFirst revision of new theme, cleaner.
Samantha Doherty [Fri, 25 Feb 2011 17:00:55 +0000 (12:00 -0500)]
First revision of new theme, cleaner.

13 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Fri, 25 Feb 2011 16:02:26 +0000 (08:02 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

13 years agoLet users who aren't allowed to login confirm their email separately
Evan Prodromou [Fri, 25 Feb 2011 16:01:41 +0000 (08:01 -0800)]
Let users who aren't allowed to login confirm their email separately

13 years agoallow passing an url to email confirmation function
Evan Prodromou [Fri, 25 Feb 2011 16:00:55 +0000 (08:00 -0800)]
allow passing an url to email confirmation function

13 years agoMerge branch 'json-activities' into 0.9.x
Zach Copley [Fri, 25 Feb 2011 08:15:26 +0000 (00:15 -0800)]
Merge branch 'json-activities' into 0.9.x

13 years agoRevert "FacebookBridge - Add lots of debug output (revert me)"
Zach Copley [Thu, 24 Feb 2011 22:21:50 +0000 (14:21 -0800)]
Revert "FacebookBridge - Add lots of debug output (revert me)"

This reverts commit c44a622449757fe13dc30ce120af07aa03ac5dc4.

13 years agoFacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set
Zach Copley [Thu, 24 Feb 2011 21:57:21 +0000 (13:57 -0800)]
FacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set

13 years agoFacebookBridge - dequeue messages that aren't bound for Facebook
Zach Copley [Thu, 24 Feb 2011 21:29:56 +0000 (13:29 -0800)]
FacebookBridge - dequeue messages that aren't bound for Facebook

13 years agoFacebookBridge - Add lots of debug output (revert me)
Zach Copley [Thu, 24 Feb 2011 20:59:37 +0000 (12:59 -0800)]
FacebookBridge - Add lots of debug output (revert me)

13 years agoFacebookBridge - make a huge fuss if we can't create a valid Facebookclient
Zach Copley [Thu, 24 Feb 2011 20:52:31 +0000 (12:52 -0800)]
FacebookBridge - make a huge fuss if we can't create a valid Facebookclient

13 years agoUnicodize a couple regexes for tags: fixes linking & detection of non-ASCII tags...
Brion Vibber [Thu, 24 Feb 2011 00:37:55 +0000 (16:37 -0800)]
Unicodize a couple regexes for tags: fixes linking & detection of non-ASCII tags that match the current regexes.
(Checks for 'letter' and 'number' characters, underscore, dash, and period.)

13 years agoreplace router regexes with tags with a fixed chunk that takes any non-/ char. This...
Brion Vibber [Thu, 24 Feb 2011 00:32:56 +0000 (16:32 -0800)]
replace router regexes with tags with a fixed chunk that takes any non-/ char. This'll let other code decide what's a valid tag.

13 years agoFix ticket #3057: apply HTML escaping on special characters in Twitter import
Brion Vibber [Tue, 22 Feb 2011 00:18:45 +0000 (16:18 -0800)]
Fix ticket #3057: apply HTML escaping on special characters in Twitter import

Changes the replacement of Twitter "entities" from in-place reverse ordering ('to preserve indices') to a forward-facing append-in-chunks that pulls in both the text and link portions, and escapes them all.
This unfortunately means first *de*-escaping the < and > that Twitter helpfully adds for us.... and any literal &blah;s that get written. This seems to match Twitter's web UI, however horrid it is.

13 years agoPartial implementation for ticket #2442: MobileProfile plugin should allow manual...
Brion Vibber [Tue, 22 Feb 2011 00:10:07 +0000 (16:10 -0800)]
Partial implementation for ticket #2442: MobileProfile plugin should allow manual switching between regular and mobile rendering modes

http://status.net/open-source/issues/2442

Notes:
* Mapstraction causes JavaScript errors in XHTML mode, breaking our code if we're run later so the link doesn't work to get back to Desktop.
* not 100% sure how safe feature detection is here?
* Currently will be useless but visible links if no JS available; need to fall back to server-side for limited browsers

13 years agoTicket #3011: Add attachments/uploads and attachments/file_quota to api/statusnet...
Brion Vibber [Mon, 21 Feb 2011 23:52:12 +0000 (15:52 -0800)]
Ticket #3011: Add attachments/uploads and attachments/file_quota to api/statusnet/config.(xml|json)

file_quota is adjusted from the defined value to take into account the maximum upload size limits in PHP, or cropped to 0 if uploads are disabled.
This can be used by client apps to determine maximum size for an attachment.

13 years agoFix ticket #3001: Twitter bridge was replacing original form of @-mentions with canon...
Brion Vibber [Mon, 21 Feb 2011 23:01:57 +0000 (15:01 -0800)]
Fix ticket #3001: Twitter bridge was replacing original form of @-mentions with canonical form unexpectedly

Now using the original text form of @-mentions and #-tags, as in Twitter's own HTMLification.
Canonical forms are still used in generating links, where it's polite to match the canonical form.

13 years agoFix issue #3035: search highlighting broke URLs in some imported messages (Twitter)
Brion Vibber [Mon, 21 Feb 2011 22:14:32 +0000 (14:14 -0800)]
Fix issue #3035: search highlighting broke URLs in some imported messages (Twitter)

Search highlighting was being done with a regex on raw HTML text, followed by a second regex undoing replacements within double-quoted attribute values.
This broke on imported Twitter messages, as the way we generate the markup uses single quotes on the attributes, which didn't get matched by the second regex.
I've replaced this do-then-undo cycle by dividing up the import HTML into freetext spans and tags; the freetext gets replaced, while the tags are left untouched.

13 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Mon, 21 Feb 2011 21:36:12 +0000 (16:36 -0500)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

13 years agodisallow login for users without validated email
Evan Prodromou [Mon, 21 Feb 2011 21:20:10 +0000 (16:20 -0500)]
disallow login for users without validated email

13 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Mon, 21 Feb 2011 20:33:47 +0000 (12:33 -0800)]
Merge branch 'master' into 0.9.x

13 years agoFixes for ticket #3052: some commands started triggering when extra text is supposed...
Brion Vibber [Mon, 21 Feb 2011 19:42:32 +0000 (11:42 -0800)]
Fixes for ticket #3052: some commands started triggering when extra text is supposed to suppress them

Regressions caused by bad refactoring in commit 21feac3bea72b0ecd88a3.
Test cases in tests/CommandInterpreterTest.php were made against the pre-refactoring code, and now check out with the fixed code.
Failures were caused by not changing logic structure when moving from multiple exit points (each if point would return directly with a null or an object) to setting a result variable and then falling through to a common exit point. Without the if statements being restructured, the result variable would just get overridden by the next case.

13 years agoCommandInterpreter test cases to guard against regressions
Brion Vibber [Mon, 21 Feb 2011 20:09:54 +0000 (12:09 -0800)]
CommandInterpreter test cases to guard against regressions

13 years agoIssue #3049 - resync doc/im with the help command text (various additions since doc...
Brion Vibber [Mon, 21 Feb 2011 19:23:07 +0000 (11:23 -0800)]
Issue #3049 - resync doc/im with the help command text (various additions since doc was last edited)

13 years agoMerge branch '0.9.x' into reqemailprivate
Evan Prodromou [Mon, 21 Feb 2011 18:17:51 +0000 (13:17 -0500)]
Merge branch '0.9.x' into reqemailprivate

13 years agoExtend authorization framework to cover login and API use
Evan Prodromou [Mon, 21 Feb 2011 15:20:42 +0000 (10:20 -0500)]
Extend authorization framework to cover login and API use

I've extended the rights framework (centering on the Right class and Profile::hasRight()) to cover
Web login and API use. This will make it possible to prevent login and API use by users.

I added two new Right constants to the Right class: WEBLOGIN and API. I check these rights using
Profile::hasRight() when initializing users. If the rights check fails, I throw an exception.

I created a new AuthorizationException class for this particular
exception, in order to allow a different UI for these kinds of exceptions (or whatever).

13 years agoActivity Streams JSON: inReplyTo objects weren't being output. Fixed.
Zach Copley [Sat, 19 Feb 2011 02:52:49 +0000 (18:52 -0800)]
Activity Streams JSON: inReplyTo objects weren't being output. Fixed.

13 years agoAdd provider to Activity Streams JSON
Zach Copley [Sat, 19 Feb 2011 02:10:21 +0000 (18:10 -0800)]
Add provider to Activity Streams JSON

13 years agoMerge branch '0.9.x' into json-activities
Zach Copley [Fri, 18 Feb 2011 23:45:11 +0000 (15:45 -0800)]
Merge branch '0.9.x' into json-activities

* 0.9.x:
  HTML and style cleanup for EmailSummary plugin.

13 years agoMake other timeline API endpoints output Activity Streams JSON
Zach Copley [Fri, 18 Feb 2011 23:43:40 +0000 (15:43 -0800)]
Make other timeline API endpoints output Activity Streams JSON

13 years agoHTML and style cleanup for EmailSummary plugin.
Samantha Doherty [Fri, 18 Feb 2011 18:49:29 +0000 (13:49 -0500)]
HTML and style cleanup for EmailSummary plugin.

13 years agoActivity Streams JSON - express to and in-reply-to stuff as person objects
Zach Copley [Fri, 18 Feb 2011 18:02:41 +0000 (10:02 -0800)]
Activity Streams JSON - express to and in-reply-to stuff as person objects

13 years agoAdd tags to Activity Streams JSON
Zach Copley [Fri, 18 Feb 2011 17:29:49 +0000 (09:29 -0800)]
Add tags to Activity Streams JSON

13 years agoAdd context to Activity Streams JSON
Zach Copley [Fri, 18 Feb 2011 08:51:08 +0000 (00:51 -0800)]
Add context to Activity Streams JSON

13 years agoAdd PoCo to Activity Streams JSON
Zach Copley [Fri, 18 Feb 2011 06:36:14 +0000 (22:36 -0800)]
Add PoCo to Activity Streams JSON

13 years agoAdd geopoint (GeoJSON) extension to AS JSON output
Zach Copley [Fri, 18 Feb 2011 04:12:28 +0000 (20:12 -0800)]
Add geopoint (GeoJSON) extension to AS JSON output

13 years agoavatars -> avatarLinks
Zach Copley [Fri, 18 Feb 2011 03:34:39 +0000 (19:34 -0800)]
avatars -> avatarLinks

13 years agoMerge branch '0.9.x' into json-activities
Zach Copley [Fri, 18 Feb 2011 03:11:29 +0000 (19:11 -0800)]
Merge branch '0.9.x' into json-activities

* 0.9.x:
  * update translator documentation. * remove superfluous whitespace. * tab to spaces. * add FIXME for undocumented class.
  * update translator documentation. * remove superfluous whitespace. * L10n updates. * small refactoring in publicrss.php. * remove PHP4-isms
  Localisation updates from http://translatewiki.net.
  Double quotes to single quotes.
  * improve L10n consistency for English. For example proper punctuation for all button and label titles. * fix some i18n bugs (in-message variables). * update/add translator documentation. * remove superfluous whitespace.
  add path separators for Plugin::path()
  argument to send email summary to all users on all sites
  fix indentation in siteemailsummaryhandler
  fix indentation in sendemailsummary.php
  fix indentation in Email_summary_status.php
  fix indentation in EmailSummaryPlugin.php
  fix indentation in usermailsummaryhandler.php

13 years agoReinstate profile_info in author/actor
Zach Copley [Fri, 18 Feb 2011 03:02:57 +0000 (19:02 -0800)]
Reinstate profile_info in author/actor

13 years agoBlow user:site_owner cache when granting/revoking 'owner' role
Brion Vibber [Fri, 18 Feb 2011 00:46:08 +0000 (16:46 -0800)]
Blow user:site_owner cache when granting/revoking 'owner' role

13 years ago* update translator documentation.
Siebrand Mazeland [Thu, 17 Feb 2011 20:10:48 +0000 (21:10 +0100)]
* update translator documentation.
* remove superfluous whitespace.
* tab to spaces.
* add FIXME for undocumented class.

13 years ago* update translator documentation.
Siebrand Mazeland [Thu, 17 Feb 2011 19:58:22 +0000 (20:58 +0100)]
* update translator documentation.
* remove superfluous whitespace.
* L10n updates.
* small refactoring in publicrss.php.
* remove PHP4-isms

13 years agouse fallback URIs for groups when filling in attention in Notice::asActivity()
Evan Prodromou [Thu, 17 Feb 2011 15:51:00 +0000 (10:51 -0500)]
use fallback URIs for groups when filling in attention in Notice::asActivity()

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 17 Feb 2011 11:27:14 +0000 (12:27 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoDouble quotes to single quotes.
Siebrand Mazeland [Thu, 17 Feb 2011 08:58:07 +0000 (09:58 +0100)]
Double quotes to single quotes.

13 years agoAdd avatars and notice info
Zach Copley [Thu, 17 Feb 2011 02:55:13 +0000 (18:55 -0800)]
Add avatars and notice info

13 years agoRudimentary support for enclosures and some fiddling
Zach Copley [Thu, 17 Feb 2011 02:14:58 +0000 (18:14 -0800)]
Rudimentary support for enclosures and some fiddling

13 years agoUse simple relative object and verb references
Zach Copley [Thu, 17 Feb 2011 00:44:02 +0000 (16:44 -0800)]
Use simple relative object and verb references

13 years agoAdd image to JSON ActivityObject and title + links to the JSON document
Zach Copley [Thu, 17 Feb 2011 00:21:46 +0000 (16:21 -0800)]
Add image to JSON ActivityObject and title + links to the JSON document

13 years agoRemove debugging statements I accidentally left in
Zach Copley [Thu, 17 Feb 2011 00:21:31 +0000 (16:21 -0800)]
Remove debugging statements I accidentally left in

13 years ago* improve L10n consistency for English. For example proper punctuation for all button...
Siebrand Mazeland [Wed, 16 Feb 2011 23:39:53 +0000 (00:39 +0100)]
* improve L10n consistency for English. For example proper punctuation for all button and label titles.
* fix some i18n bugs (in-message variables).
* update/add translator documentation.
* remove superfluous whitespace.

13 years agoMerge branch 'master' into 0.9.x
Evan Prodromou [Wed, 16 Feb 2011 18:56:55 +0000 (13:56 -0500)]
Merge branch 'master' into 0.9.x

13 years agoadd path separators for Plugin::path()
Evan Prodromou [Wed, 16 Feb 2011 18:56:30 +0000 (13:56 -0500)]
add path separators for Plugin::path()

13 years agoargument to send email summary to all users on all sites
Evan Prodromou [Wed, 16 Feb 2011 16:58:35 +0000 (11:58 -0500)]
argument to send email summary to all users on all sites

13 years agoFirst cut at some JSON Activity Streams output
Zach Copley [Wed, 16 Feb 2011 04:25:39 +0000 (20:25 -0800)]
First cut at some JSON Activity Streams output

13 years agofix indentation in siteemailsummaryhandler
Evan Prodromou [Tue, 15 Feb 2011 21:28:20 +0000 (16:28 -0500)]
fix indentation in siteemailsummaryhandler

13 years agofix indentation in sendemailsummary.php
Evan Prodromou [Tue, 15 Feb 2011 21:27:51 +0000 (16:27 -0500)]
fix indentation in sendemailsummary.php

13 years agofix indentation in Email_summary_status.php
Evan Prodromou [Tue, 15 Feb 2011 21:26:44 +0000 (16:26 -0500)]
fix indentation in Email_summary_status.php

13 years agofix indentation in EmailSummaryPlugin.php
Evan Prodromou [Tue, 15 Feb 2011 21:26:15 +0000 (16:26 -0500)]
fix indentation in EmailSummaryPlugin.php

13 years agofix indentation in usermailsummaryhandler.php
Evan Prodromou [Tue, 15 Feb 2011 21:25:37 +0000 (16:25 -0500)]
fix indentation in usermailsummaryhandler.php

13 years agoGet correct size for default avatar in email summary
Evan Prodromou [Tue, 15 Feb 2011 17:53:02 +0000 (12:53 -0500)]
Get correct size for default avatar in email summary

13 years agoNew version, dev cycle
Evan Prodromou [Tue, 15 Feb 2011 17:26:40 +0000 (12:26 -0500)]
New version, dev cycle

13 years agoMerge remote branch 'origin/master' into 0.9.x
Evan Prodromou [Mon, 14 Feb 2011 20:42:56 +0000 (15:42 -0500)]
Merge remote branch 'origin/master' into 0.9.x

13 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 14 Feb 2011 18:43:16 +0000 (19:43 +0100)]
Localisation updates from http://translatewiki.net.

13 years agoMerge remote branch 'origin/master'
Evan Prodromou [Mon, 14 Feb 2011 17:41:52 +0000 (12:41 -0500)]
Merge remote branch 'origin/master'

13 years agobackup action is read-only
Evan Prodromou [Mon, 14 Feb 2011 17:41:20 +0000 (12:41 -0500)]
backup action is read-only

13 years agoAtom - output nickname for atom:name in atom:author
Zach Copley [Sun, 13 Feb 2011 00:40:28 +0000 (00:40 +0000)]
Atom - output nickname for atom:name in atom:author

13 years agoUpdate translator comment for the url shortener "free service" marker: free as in...
Brion Vibber [Fri, 11 Feb 2011 22:11:37 +0000 (14:11 -0800)]
Update translator comment for the url shortener "free service" marker: free as in open

13 years agoFix for failure/exception on subscription/subscriber lists when deleted profiles...
Brion Vibber [Fri, 11 Feb 2011 21:21:53 +0000 (13:21 -0800)]
Fix for failure/exception on subscription/subscriber lists when deleted profiles are stuck in cached list.

Workaround for deleted profiles still appearing in cached subscriptions/subscribers lists: if we couldn't fetch them, don't include them in the ArrayWrapper.
ArrayWrapper doesn't deal well with null entries, which aren't meant to happen in how it works. This code has recently changed from dying directly with a PHP fatal error in that case to throwing an exception, which allows tracking down the caller.

It looks like there might be some cases where profiles and their matching subscriptions get deleted, but the subscription entries don't get properly cleared from cache... that still bears further investigation. The regular code path looks ok; calls Subscription::cancel() from code called in Profile::delete(); but if they're batch-deleted instead of one row at a time, that could fail to trigger.

13 years agoMerge branch 'master' of gitorious.org:statusnet/mainline
Evan Prodromou [Fri, 11 Feb 2011 21:01:57 +0000 (16:01 -0500)]
Merge branch 'master' of gitorious.org:statusnet/mainline

13 years agoadd plugins/sslpath setting, default to site path/plugins
Evan Prodromou [Fri, 11 Feb 2011 20:58:47 +0000 (15:58 -0500)]
add plugins/sslpath setting, default to site path/plugins

13 years agoadd --all and --suspicious options for update-profile-data.php
Brion Vibber [Fri, 11 Feb 2011 20:23:03 +0000 (12:23 -0800)]
add --all and --suspicious options for update-profile-data.php

13 years agorefactor for multi....
Brion Vibber [Fri, 11 Feb 2011 20:13:33 +0000 (12:13 -0800)]
refactor for multi....

13 years agowoops
Brion Vibber [Fri, 11 Feb 2011 20:08:35 +0000 (12:08 -0800)]
woops

13 years agoWork in progress: update-profile-data.php to update ostatus profile info from the...
Brion Vibber [Fri, 11 Feb 2011 19:55:23 +0000 (11:55 -0800)]
Work in progress: update-profile-data.php to update ostatus profile info from the current feed