Zach Copley
a1b436a8c6
First cut at some JSON Activity Streams output
2011-02-15 20:25:39 -08:00
Evan Prodromou
10bb94807b
fix indentation in siteemailsummaryhandler
2011-02-15 16:28:20 -05:00
Evan Prodromou
f31db669b0
fix indentation in sendemailsummary.php
2011-02-15 16:27:51 -05:00
Evan Prodromou
845b1cff72
fix indentation in Email_summary_status.php
2011-02-15 16:26:44 -05:00
Evan Prodromou
59afc4aa56
fix indentation in EmailSummaryPlugin.php
2011-02-15 16:26:15 -05:00
Evan Prodromou
128bfd7011
fix indentation in usermailsummaryhandler.php
2011-02-15 16:25:37 -05:00
Evan Prodromou
ff502bb148
Get correct size for default avatar in email summary
2011-02-15 12:53:02 -05:00
Evan Prodromou
96d0141848
New version, dev cycle
2011-02-15 12:26:40 -05:00
Evan Prodromou
ffeb4af911
Merge remote branch 'origin/master' into 0.9.x
2011-02-14 15:42:56 -05:00
Siebrand Mazeland
a86d293c93
Localisation updates from http://translatewiki.net .
2011-02-14 19:43:16 +01:00
Evan Prodromou
2b869fa23f
Merge remote branch 'origin/master'
2011-02-14 12:41:52 -05:00
Evan Prodromou
40533ee851
backup action is read-only
2011-02-14 12:41:20 -05:00
Zach Copley
7de1aaf86d
Atom - output nickname for atom:name in atom:author
2011-02-13 00:40:28 +00:00
Brion Vibber
30eddaf168
Update translator comment for the url shortener "free service" marker: free as in open
2011-02-11 14:11:37 -08:00
Brion Vibber
454a980bd4
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.
2011-02-11 13:21:53 -08:00
Evan Prodromou
ffe2da4c80
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-11 16:01:57 -05:00
Evan Prodromou
f6e614b894
add plugins/sslpath setting, default to site path/plugins
2011-02-11 15:58:47 -05:00
Brion Vibber
c92358fa7b
add --all and --suspicious options for update-profile-data.php
2011-02-11 12:23:03 -08:00
Brion Vibber
f30744c7c5
refactor for multi....
2011-02-11 12:13:33 -08:00
Brion Vibber
f7b431d60b
woops
2011-02-11 12:08:35 -08:00
Brion Vibber
91535365b3
Work in progress: update-profile-data.php to update ostatus profile info from the current feed
2011-02-11 11:55:23 -08:00
Evan Prodromou
dc424ab63a
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-10 22:23:06 -05:00
Evan Prodromou
d876418acd
Merge remote branch 'dev/master'
2011-02-10 22:21:56 -05:00
Evan Prodromou
ff2553b9c7
get the subject first if you go to the feed
2011-02-11 03:01:24 +00:00
Evan Prodromou
fc317f8b72
check legacy <actor> and <subject> first from feed
2011-02-11 02:59:18 +00:00
Brion Vibber
b09276635c
Merge branch 'master' into 0.9.x
2011-02-10 12:04:13 -08:00
Brion Vibber
2bf8a68908
Fix for ticket #3039 : TwitterBridge was incorrectly sending repeats of Twitter-bound messages if the repeater has sending of things to Twitter disabled.
...
A repeat/retweet is roughly equivalent to an active direct post, so should follow the posting rules, rather than always sending over as we do for fave notifications.
2011-02-10 10:53:24 -08:00
Zach Copley
857e35c175
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
Show aside primary on settings pages for all themes.
correct error in README on default for deletion
2011-02-10 10:26:36 -08:00
Zach Copley
d9ace57625
FacebookBridge - remove unnecessary warning and noisy debugging statement
2011-02-10 10:24:38 -08:00
Samantha Doherty
8a87e9869f
Show aside primary on settings pages for all themes.
2011-02-10 13:23:20 -05:00
Evan Prodromou
523e8c86e9
correct error in README on default for deletion
2011-02-10 10:11:30 -05:00
Evan Prodromou
8fa44e58f9
Try not to wipe out good data with empty values in Ostatus_profile::updateProfile()
...
Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.
This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.
Bug: 3028
2011-02-10 09:39:40 -05:00
Zach Copley
df19e88323
Atom output - Reinstate activity:actor and activity:subject
...
w/deprecation warnings. Also add statusnet:profile_info back into
author/actor.
2011-02-09 23:18:14 -08:00
Brion Vibber
a0c669808e
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-09 13:50:31 -08:00
Brion Vibber
a76f067631
Partial revert of 073f3e99: restores the original non-hashbang URLs for twitter users as the remote profile.
...
Should fix issue #3027 : twitter user avatars not getting imported.
Due to the change in URI, all twitter users that had been previously seen were getting new profile entries, which tried to save the same avatar. This would fail as Avatar.url has a unique index.
Note: now anything new seen in the last couple days in production will still potentially conflict.
2011-02-09 13:46:48 -08:00
Evan Prodromou
bfa053ef17
Remove executable bits from Auth_SASL files
2011-02-09 11:04:52 -05:00
Evan Prodromou
9c4294fb50
include Auth_SASL from PEAR in extlib
2011-02-09 11:03:44 -05:00
Brion Vibber
956b3ef4d1
Merge branch 'ssltweak'
2011-02-09 00:11:28 -08:00
Brion Vibber
dc5daa237e
Further tweak for ssl paths in plugin check (sslserver may be set but empty)
2011-02-09 00:09:25 -08:00
Evan Prodromou
c273876298
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-09 03:09:24 -05:00
Evan Prodromou
10500e7f85
ensure*() functions throw exceptions for errors
2011-02-09 03:08:52 -05:00
Brion Vibber
9efedfc217
Tweak to use site/server fallback when no plugins/sslserver or site/sslserver and generating plugin CSS
2011-02-09 00:04:01 -08:00
Brion Vibber
75bf756111
LOG_WARN -> LOG_WARNING
2011-02-08 23:34:37 -08:00
Brion Vibber
a277a003b9
0.9.7beta2 (for js update)
2011-02-08 22:55:15 -08:00
Brion Vibber
ae492c7132
Revert jQuery Form to r2.17 -- the latest fails with our Meteor stuff the way it tweaks document.domain (which also causes other AJAX-related problems and needs to be destroyed one of these days...)
2011-02-08 22:28:23 -08:00
Zach Copley
98af8d2a19
FacebookBridge plugin - allow Facebook app ID and secret to be
...
initialized via config.php
2011-02-09 04:49:39 +00:00
Evan Prodromou
91485718c4
Merge branch 'testing'
2011-02-08 13:39:41 -05:00
Evan Prodromou
399977aebf
Merge remote branch 'origin/pluginstatic' into testing
2011-02-08 13:39:17 -05:00
Evan Prodromou
495dcb5847
Merge branch 'testing'
2011-02-08 11:53:37 -05:00
Evan Prodromou
ecf0dec0c1
change alpha1 to beta1
2011-02-08 11:53:30 -05:00
