Brion Vibber
557df3d3f7
OStatus: sub/unsub notifications working again. Fixed up autodetection of feed info at profile setup time
2010-02-19 16:21:17 -08:00
Evan Prodromou
d69f6dff6a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
...
Conflicts:
plugins/OStatus/actions/salmon.php
2010-02-19 16:55:24 -05:00
Evan Prodromou
b0327506a4
some more salmon stuff
2010-02-19 16:37:07 -05:00
Brion Vibber
a1a3ab1c58
OStatus: hooked up follow/unfollow events on Salmon endpoint to create/destroy remote subscriber relationships
2010-02-19 12:08:07 -08:00
Brion Vibber
114eb310ca
OStatus: fix up Salmon endpoint detection/saving, timestamp fixes.
2010-02-19 10:29:06 -08:00
Evan Prodromou
512e8b69f1
remove unused subs_(un)subscribe_user functions
2010-02-19 08:31:46 -05:00
Evan Prodromou
b0a75a2ab2
replace calls to subs_(un)subscribe_user with Subscription methods
2010-02-19 08:31:20 -05:00
Sarven Capadisli
2c09702b2d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-19 14:22:25 +01:00
Evan Prodromou
52e8aa798a
Refactor subs_* functions for remote use
...
The subs_* functions in subs.php have made a lot of assumptions
about users versus profiles. I've refactored the functions to
be methods of the Subscription class instead, and to use Profile
objects throughout.
Some of the checks for blocks or existing subscriptions depended
on users or profiles, so I've moved those methods around a bit.
I've left stubs for the subs_* functions until we get time to replace
them.
2010-02-19 08:16:45 -05:00
Sarven Capadisli
8d59f7cc9d
Using inlineScript instead for clickjacking check
2010-02-19 13:13:05 +01:00
Sarven Capadisli
b03c7a383f
Only load json2.js if native JSON is not supported
2010-02-19 13:03:26 +01:00
Evan Prodromou
48edade751
add ActivityContext class and test it
2010-02-18 22:18:14 -05:00
Evan Prodromou
3d665f82d1
add type='text/html' to alternate link in Notice Atom
2010-02-18 22:13:47 -05:00
Brion Vibber
0dac13d197
OStatus refactoring to clean up profile vs feed and fix up subscription issues.
...
PuSH subscription maintenance broken back out to FeedSub, letting Ostatus_profile deal with the profile level (user or group, with unique id URI)
2010-02-18 16:50:53 -08:00
Siebrand Mazeland
0b5308dea9
Localisation updates for !StatusNet from !translatewiki.net !sntrans
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-02-19 00:00:05 +01:00
Christopher Vollick
e717cba19c
Add Script To Update Group Avatar URLs
...
Similar to scripts/updateavatarurl.php.
Works for groups.
Again, I had to do some weird thing because using clone screwed up the find() iteration.
2010-02-18 13:44:16 -05:00
Brion Vibber
2a97901f70
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-18 18:22:02 +00:00
Brion Vibber
22ff358ba8
OStatus sub/unsub updates:
...
- fix for PuSH unsub verification
- send Salmon notification on unsub
2010-02-18 18:20:48 +00:00
Christopher Vollick
ddef800ec9
Update Avatar URL Did Weird Stuff.
...
It was only finding the first two avatars and then thinking it was done.
I'm not entirely sure why it was doing that.
I think maybe all the cloning made it forget where it was or something.
Either way, it seems to work now, and really uses less memory.
2010-02-18 12:14:34 -05:00
Sarven Capadisli
310ac31995
Minor adjustment to edit icon position
2010-02-18 18:12:47 +01:00
Sarven Capadisli
c36155e238
Fixes long strings from not breaking
2010-02-18 18:12:08 +01:00
Evan Prodromou
c2ba764535
always distribute to inbox of author immediately
2010-02-18 07:11:20 -05:00
Evan Prodromou
b6e5d4ecc3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-18 06:36:47 -05:00
Evan Prodromou
80ef3946d0
more work on salmon
2010-02-18 06:36:32 -05:00
Zach Copley
5e60bf2ca6
Fix for cross site OMB posting problem
2010-02-18 03:49:19 +00:00
Zach Copley
5253a99d7a
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-02-18 01:48:41 +00:00
Zach Copley
1aeca3947d
Fix for cross site OMB posting problem
2010-02-18 01:48:24 +00:00
Zach Copley
f55ef878f6
Fix for cross site OMB posting problem
2010-02-18 01:47:44 +00:00
Brion Vibber
453ad6a996
Merge branch 'testing' into 0.9.x
2010-02-17 16:52:46 -08:00
Brion Vibber
07f145049e
Merge branch 'master' into testing
2010-02-17 16:52:13 -08:00
Brion Vibber
ce6be4f836
Queues: redid the breakout control model so we can start up and subscribe to queues without running through the complete site list, which is ok at 1k sites but too slow at 10k.
...
All breakout queues that we're going to need to listen to now need to be explicitly listed in $config['queue']['breakout'].
Until XMPP is moved to component model, this setting will let the individual processes work with their own queues:
$config['queue']['breakout'][] = 'xmpp/xmppout/' . $config['site']['nickname'];
2010-02-17 16:49:00 -08:00
Zach Copley
73ba26efe3
Twitter bridge - fix for Ticket #2192
2010-02-17 20:58:32 +00:00
Zach Copley
05c50499c3
Better logging for Twitter bridge account linking process
2010-02-17 20:58:24 +00:00
Zach Copley
c201baffbf
Upgrade Twitter bridge to use OAuth 1.0a. It's more secure, and allows
...
us to automatically send in a callback url instead of having to manually
configure one for each StatusNet instance.
2010-02-17 20:58:15 +00:00
Zach Copley
a80fdf3142
Twitter bridge - fix for Ticket #2192
2010-02-17 20:56:18 +00:00
Zach Copley
c498f6e1ba
Twitter bridge - fix for Ticket #2192
2010-02-17 20:53:16 +00:00
Zach Copley
4d97f83740
Better logging for Twitter bridge account linking process
2010-02-17 19:25:37 +00:00
Zach Copley
6b887728b2
Better logging for Twitter bridge account linking process
2010-02-17 19:24:38 +00:00
Brion Vibber
5a6cbb248f
Merge branch 'testing' into 0.9.x
2010-02-17 10:14:08 -08:00
Brion Vibber
3cb6b1670b
Merge branch 'master' into testing
2010-02-17 10:13:35 -08:00
Brion Vibber
e8275aa60a
Fix exception on bad plugin load
2010-02-17 10:12:37 -08:00
Craig Andrews
8e07926a9c
parse_url returns an associative array - not an object
2010-02-17 10:10:07 -08:00
Brion Vibber
9f3246124d
PostDebug plugin - saves POST data to debug log or directory to help debug form submission and server-to-server communications.
...
Some sensitive items are sanitized but not all - don't just shove out the log results publicly!
2010-02-17 09:58:34 -08:00
Craig Andrews
46e9aa13aa
htmloutputter->script() special cases src's that begin with plugin/ or local/ so that plugins don't need to include common_path() in every call to $action->script()
...
Adjust plugins to not call common_path() when it's not necessary
Fix minify plugin
2010-02-17 12:03:14 -05:00
Craig Andrews
c19300272f
parse_url returns an associative array - not an object
2010-02-17 12:02:59 -05:00
Craig Andrews
389e6d54bf
Fix script references in infinite scroll plugin and autocomplete plugin
...
Add indicator.gif used by autocomplete plugin
2010-02-17 10:29:08 -05:00
Zach Copley
198c046c89
- Set the root of a new local conversation to a new conversation.id
...
- Output conversation URIs from conversation.uri
2010-02-17 01:12:13 -08:00
Zach Copley
ed46a38ecf
- conversation.uri needs to be nullable
...
- factory method for creating new local conversations
2010-02-17 01:11:14 -08:00
Zach Copley
a2f8c5da17
New Conversation DO to handle remote notices as conversation roots
2010-02-16 23:30:08 -08:00
Zach Copley
5886e96217
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: override source link with the source domain and link to original message
OStatus: moving parts of profile processing to Activity from feedmunger. Pausing before refactoring DB schema a bit to clean up feed vs person vs group info
2010-02-16 20:14:33 -08:00