GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
8,535 Commits 8 Branches 4 Tags 310 MiB
c187bf5597
Commit Graph

1040 Commits

Author SHA1 Message Date
Evan Prodromou
068d8f9220 correct call to time() in Ostatus_profile::notify() 2010-02-21 13:31:58 -05:00
Evan Prodromou
f83941a67b correct name check in ActivityObject::fromProfile() 2010-02-21 13:31:31 -05:00
Evan Prodromou
5aeed9e041 add activity:subject to atom feeds 2010-02-21 13:11:00 -05:00
Evan Prodromou
1a86bf9c65 try different ways to get a profile from a feed 2010-02-21 12:56:46 -05:00
Evan Prodromou
d372a352ec make avatar attribute explicit for ActivityObject 2010-02-21 12:55:40 -05:00
Evan Prodromou
09e2d181be remove unused profile code from salmonaction 2010-02-21 12:54:52 -05:00
Evan Prodromou
727773cdfa redirect ostatussub if not logged in 2010-02-21 11:24:04 -05:00
Evan Prodromou
df7c6b37c8 use notifyActivity() for notifications in OStatusPlugin 2010-02-21 10:53:32 -05:00
Evan Prodromou
4e90bd34e9 activity notification in Ostatus_profile 2010-02-21 10:53:11 -05:00
Evan Prodromou
ff2efd314f let activities generate their own XML 2010-02-21 10:50:51 -05:00
Evan Prodromou
9898bbdeb2 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 
Conflicts:
	plugins/OStatus/lib/activity.php
 2010-02-21 09:19:27 -05:00
Evan Prodromou
7f471bde23 more tests for Activity parsing 2010-02-21 09:17:52 -05:00
Evan Prodromou
4a4c34de32 Save posted notices in usersalmon 2010-02-21 09:17:35 -05:00
Evan Prodromou
6169d8a877 saving notices in salmon actions 2010-02-21 09:16:27 -05:00
Evan Prodromou
229f9bd069 more complete content retrieval in ActivityObject::__construct() 2010-02-21 09:15:57 -05:00
Brion Vibber
5df61141d2 OStatus: fix regressions from merge 2010-02-20 18:25:40 -08:00
Evan Prodromou
6f1ccfc577 Subscription::start() should be enough, right? 2010-02-20 20:36:54 -05:00
Evan Prodromou
0c62c68675 do some double-checks on favor and disfavor handlers in OStatusPlugin 2010-02-20 20:34:29 -05:00
Evan Prodromou
5565216b42 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 
Conflicts:
	plugins/OStatus/OStatusPlugin.php
 2010-02-20 20:27:04 -05:00
Evan Prodromou
96c6019638 Add support for favor and disfavor notification 
Added support for favoring and disfavoring in OStatusPlugin.

Needed to represent the Notice as an activity:object, so added
some code for that in lib/activity.php.

Also, made some small changes to OStatusPlugin so it handled
having a non-default argument $object correctly.
 2010-02-20 19:58:20 -05:00
Brion Vibber
145a19954f OStatus: Salmon favorite & unfavorite events now handled 2010-02-20 16:45:30 -08:00
Brion Vibber
9c2fe8492f OStatus: send favorite/unfavorite notifications to remote authors 2010-02-20 15:56:36 -08:00
Eric Helgeson
86f2f530ef Fixed incorrect link on registration successful page 2010-02-20 21:57:05 +00:00
Brion Vibber
ea9d6f21ec OStatus subscription page fixups; works but needs lots of UI loving! 
- ostatussub via subscribe button now works again (changed to take profile instead of feed, patched up to the new discovery)
- added a quickie hack to allow putting your remote profile URI in place of webfinger acct through the remote-sub button (needs to be patched up to do proper discovery via XRDS or a link or something)
 2010-02-20 12:57:47 -08:00
Brion Vibber
f891b135fb OStatus: fix regressions in plugin & usersalmon action. Sub/unsub notifications are working again. 2010-02-20 10:26:32 -08:00
Brion Vibber
97b01432e7 drop no-longer-used XML_Feed_Parser extlib package from OStatus plugin 2010-02-20 10:06:28 -08:00
Evan Prodromou
866b647062 add hooks for OStatus notification on subscribe/unsubscribe 2010-02-20 11:48:42 -05:00
Evan Prodromou
ab4ec095e8 adjust URI, URL, and location in Ostatus_profile::processPost 2010-02-20 11:38:05 -05:00
Evan Prodromou
ed45df045f Cool bug! Technically good PHP syntax 2010-02-20 11:17:54 -05:00
Evan Prodromou
2df3bbc80b Move some salmon processing to a superclass 
Moved some salmon processing to a superclass so we could handle group
salmon posts, too.
 2010-02-20 11:12:43 -05:00
Brion Vibber
50db2d5d69 OStatus: Salmon notifications now being generated moderately correctly. :) Needs to be an <entry> not a <feed>. 2010-02-19 17:01:38 -08:00
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
48edade751 add ActivityContext class and test it 2010-02-18 22:18:14 -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
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
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
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
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
Brion Vibber
e51e96d724 OStatus: override source link with the source domain and link to original message 2010-02-17 02:16:03 +00:00
Brion Vibber
454d0b5738 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-17 01:49:49 +00:00
Brion Vibber
4a139d1cc8 OStatus: migrated notice parsing to use Activity helper classes; on the way to killing FeedMunger 2010-02-16 23:31:11 +00:00
Brion Vibber
014a32e6b8 OStatus: check only direct children in ActivityUtil::child; fixes pulling actor's info when we wanted post info 2010-02-16 23:04:39 +00:00
Brion Vibber
440ab90391 OStatus: fix up some recent regressions in subscription setup; fix state checks and verification token, and avatar save on setup. Needs updates for new atom code next... 2010-02-16 22:03:24 +00:00
Brion Vibber
a116cde1a4 OStatus: fix for low-level remote subscribe 2010-02-16 20:11:48 +00:00
Craig Andrews
20d6a7caed Merge branch '0.9.x' into 1.0.x 
Conflicts:
	lib/queuemanager.php
	lib/xmppmanager.php
	plugins/Xmpp/Fake_XMPP.php
	scripts/imdaemon.php
 2010-02-16 13:15:09 -05:00
Evan Prodromou
201110ffaa restructure Activity classes to push more DOM stuff to ActivityUtils 2010-02-16 12:49:54 -05:00
Brion Vibber
d5cbfe8071 Merge branch 'testing' into 0.9.x 
Conflicts:
	lib/iomaster.php
 2010-02-16 09:25:09 -08:00
Brion Vibber
81b6b58e33 Merge branch 'master' into testing 
Conflicts:
	lib/stompqueuemanager.php
 2010-02-16 09:22:02 -08:00
Brion Vibber
c74aea589d Stomp queue restructuring for mass scalability: 
- Multiplexing queues into groups and for multiple sites.
- Sharing vs breakout configurable per site and per queue via $config['queue']['breakout']
- Detect how many times a message is redelivered, discard if it's killed too many daemons
 - count configurable with $config['queue']['max_retries']
 - can dump the items to files in $config['queue']['dead_letter_dir']

Queue daemon memory & resource leak fixes:
- avoid unnecessary reconnections to memcached server (switch persistent connections back in on second initialization, assuming it's child process)
- monkey-patch for leaky .ini loads in DB_DataObject::databaseStructure() - was leaking 200k per active switch
- applied leak fixes to Status_network as well, using intermediate base Safe_DataObject for both it and Memcache_DataObject

Misc queue fixes:
- correct handling of child processes exiting due to signal termination instead of regular exit
- shutdown instead of infinite respawn loop if we're already past the soft memory limit at startup
- Added --all option for xmppdaemon... still opens one xmpp connection per site that has xmpp active

Cache updates:
- add Cache::increment() method with native support for memcached atomic increment
 2010-02-16 09:16:51 -08:00
Evan Prodromou
a8c2a8261e move some nickname-guessing code to lib/util.php from OpenID 2010-02-16 11:06:10 -05:00
Craig Andrews
32084e33a2 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	lib/queuemanager.php
 2010-02-16 10:25:57 -05:00
Evan Prodromou
813451c9f9 add a couple of FIXME comments 2010-02-16 10:18:23 -05:00
Evan Prodromou
5a357d5399 change find() to staticGet() to use cache 2010-02-16 09:58:33 -05:00
Zach Copley
d4f6235d7b 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-16 06:19:20 +00:00
Zach Copley
f414544d0d 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-16 06:12:08 +00:00
Zach Copley
2e1e614abe Use static class method for looking up Twitter user 2010-02-15 22:15:22 +00:00
Zach Copley
0ba3759171 Use static class method for looking up Twitter user 2010-02-15 22:14:54 +00:00
Zach Copley
9f8e25bfe7 Use static class method for looking up Twitter user 2010-02-15 22:13:10 +00:00
Zach Copley
1996b709c6 Twitter-bridge: lookup old foreign_user by primary key not url 2010-02-15 22:06:18 +00:00
Zach Copley
01c428796f Twitter-bridge: lookup old foreign_user by primary key not url 2010-02-15 22:05:23 +00:00
Zach Copley
66f427c373 Twitter-bridge: lookup old foreign_user by primary key not url 2010-02-15 21:53:49 +00:00
Zach Copley
a69863eae6 Better log msgs. Removed debugging statement. 2010-02-15 21:24:31 +00:00
Zach Copley
ead595eee8 Better log msgs. Removed debugging statement. 2010-02-15 21:24:12 +00:00
Zach Copley
fdf6ed7b1a Better log msgs. Removed debugging statement. 2010-02-15 21:23:26 +00:00
Zach Copley
5db40c440d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-15 21:14:32 +00:00
Zach Copley
82033b3773 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-15 21:14:01 +00:00
Zach Copley
fe2ebec732 Fix for regression introduced with my last update to the 
TwitterStatusFetcher: the Twitter bridge was not saving a foreign user
record when making a foreign link.
 2010-02-15 21:13:53 +00:00
Zach Copley
5cc1f8b001 Fix for regression introduced with my last update to the 
TwitterStatusFetcher: the Twitter bridge was not saving a foreign user
record when making a foreign link.
 2010-02-15 21:13:42 +00:00
Zach Copley
2b6a39f70f Fix for regression introduced with my last update to the 
TwitterStatusFetcher: the Twitter bridge was not saving a foreign user
record when making a foreign link.
 2010-02-15 21:10:45 +00:00
Sarven Capadisli
03edbfe24e Added single whitespace to separate inline text words. 2010-02-15 20:41:46 +01:00
Evan Prodromou
73e2264c6a test parsing a default atom feed for activities 2010-02-14 13:19:32 -05:00
Evan Prodromou
f78cf31303 update activity and salmon for previous commit 2010-02-14 12:12:47 -05:00
Evan Prodromou
cea7d8018a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-14 12:09:07 -05:00
Evan Prodromou
62f5c04ad2 More complete activity parsing 
Began the process of actually digging up activity information
from an Atom entry. Added a test script to make sure parsing
is working right.
 2010-02-14 12:08:09 -05:00
Sarven Capadisli
171bf3093a Dialogbox for OStatus remote subscription 2010-02-13 20:28:05 +01:00
Sarven Capadisli
1cb94e0be6 Added dialogbox styles for OStatus subscribe form 2010-02-13 19:07:21 +01:00
Sarven Capadisli
4d050f96f3 Added XHR channel for OStatus Subscribe button 2010-02-13 18:49:14 +01:00
Sarven Capadisli
f30af7047b Updated feed subscription form markup 2010-02-13 18:46:10 +01:00
Sarven Capadisli
24394269fa Updated OStatus form markup 2010-02-13 18:44:41 +01:00
Sarven Capadisli
f6e766d5ac Using the new remote subscription event and updated subscribe label 2010-02-13 18:42:00 +01:00
Zach Copley
f3a82e787c Add OStatus PuSH hub and Salmon links back into user and group feeds 2010-02-12 19:02:27 -08:00
Brion Vibber
122c8677b7 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-12 11:18:35 -08:00
Brion Vibber
b39047d95b OStatus: prep work for sending notifications on sub/unsub/join/leave/favorite/unfavorite via Salmon; needs to be completed and hooked up once feed gen is fixed. 2010-02-12 18:54:48 +00:00
Evan Prodromou
320532560f flesh out salmon endpoint 2010-02-12 00:43:16 -05:00
Evan Prodromou
5f94efc454 stub for activities 2010-02-12 00:42:42 -05:00
Brion Vibber
bc46621af2 OStatus sub setup code cleanup and partial group fixes (needs more work after the Atom updates are done) 2010-02-12 01:11:46 +00:00
Brion Vibber
8e6b52e899 OStatus: renamed feedinfo table to ostatus_profile -- will cover remote ostatus people and groups whether a subscription's active or not (maintains identity over unsub/resub, and between subscribers and subscribees) 2010-02-12 00:22:16 +00:00
Brion Vibber
e08657d56c OStatus: correct parsing of georss:point for max interop (commas allowed, whitespace not strictly defined) 2010-02-11 22:42:36 +00:00
Brion Vibber
1773d12a24 OStatus: save Salmon postback URI in feed subscription info, if provided. Will need it for sub/unsub postbacks and other notifications. 2010-02-11 20:12:48 +00:00
Brion Vibber
21bfbc43ad OStatus: fix salmon link on Atom feeds; add a url spec for group feeds as well (endpoint needs impl) 2010-02-11 20:02:17 +00:00
Brion Vibber
20714d1f35 OStatus fix: include feed profile at notice text processing time, fixes replies 2010-02-11 19:44:03 +00:00
Brion Vibber
71151b2583 OStatus: garbage collect unused PuSH subscriptions when the last local subscriber unsubs 2010-02-11 00:09:20 +00:00
Brion Vibber
4ae760cb62 OStatus PuSH fixes: 
* HMAC now calculated correctly - confirmed interop with Google's public hub
* Can optionally use an external PuSH hub, set URL in $config['ostatus']['hub']
  (may have issues in replication environment, and will ping the hub for every
  update rather than just those with subscribers) Internal hub will still function
  when this is set, but won't be advertised. Warning: setting this, then turning
  it off later will break subscriptions as that hub will no longer receive pings.
 2010-02-10 22:58:39 +00:00
Brion Vibber
162868afdb OStatus update: now using standard save/delivery for incoming ostatus messages -- they get reflected to realtime and everything! woooo 
Group delivery may still need some munging
 2010-02-10 21:18:53 +00:00
Brion Vibber
7752612ef6 fix hubdistrib 2010-02-10 20:47:42 +00:00
Brion Vibber
045797331c fix up hub queueing to work w/ stomp queues 2010-02-10 12:27:41 -08:00
Brion Vibber
f37063cd63 Filename case fix 2010-02-10 10:18:47 -08:00
Sarven Capadisli
3d0bc1a3dd Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-10 11:09:03 +00:00
Sarven Capadisli
f3c2dfacf4 Fix to Realtime's repeat notice form legend and notice id 2010-02-10 10:48:55 +00:00
Sarven Capadisli
6b10c269b5 Fix to Realtime's repeat notice form legend and notice id 2010-02-10 10:47:46 +00:00
James Walker
f4ebac5036 removing the webfinger hack for Notice::asAtomEntry since salmon can use a profile URL 2010-02-09 21:50:51 -05:00
James Walker
46f90f7b08 moving salmon endpoint under 'main/' 2010-02-09 21:43:37 -05:00
Brion Vibber
8449256817 OStatus partial support for group subscriptions: 
* detection of group feeds is currently a nasty hack based on presence of '/groups/' in URL -- should use some property on the feed?
* listing for the remote group is kinda cruddy; needs to be named more cleanly
* still need to establish per-author profiles (easier once we have the updated Atom code in)
* group delivery probably not right yet
* saving of group messages still triggering some weird behavior

Added support for since_id and max_id on group timeline feeds as a free extra. Enjoy!
 2010-02-09 18:32:52 -08:00
James Walker
c2475f8853 in progress Salmon responses 2010-02-09 15:37:37 -05:00
James Walker
841981a381 discovery piece - hand merged :P 2010-02-09 01:37:45 -05:00
Brion Vibber
b2e8d8407c Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-08 15:48:52 -08:00
Brion Vibber
b9b0f0410a Pull GeoRSS locations over OStatus feeds 2010-02-08 15:46:38 -08:00
Brion Vibber
384387c9b0 OStatus cleanup... 
* Treat linkless feed posts as status updates; drop the "New post:" prefix and quotes on them.
* Use stable user IDs for atom/rss2 feed links instead of unstable nicknames
* Pull Atom feed preferentially when subscribing -- can now put the remote user's profile page straight into the feed subscription form and get to the right place.
* Clean up naming for push endpoints
 2010-02-08 14:58:12 -08:00
Zach Copley
c83d0b5e98 Delete old Twitter user record when user changes screen name instead of updating. Simpler. 2010-02-08 12:16:55 -08:00
Zach Copley
21c0e75a2e Store Twitter screen_name, not name, for foreign_user.nickname when saving Twitter user. 2010-02-08 12:16:43 -08:00
Brion Vibber
dc09453a77 First steps on converting FeedSub into the pub/sub basis for OStatus communications: 
* renamed FeedSub plugin to OStatus
* now setting avatar on subscriptions
* general fixes for subscription
* integrated PuSH hub to handle only user timelines on canonical ID url; sends updates directly
* set $config['feedsub']['nohub'] = true to test w/ foreign feeds that don't have hubs (won't actually receive updates though)
* a few bits of code documentation
* HMAC support for verified distributions (safest if sub setup is on HTTPS)

And a couple core changes:
* minimizing HTML output for exceptions in API requests to aid in debugging
* fix for rel=self link in apitimelineuser when id given

This does not not yet include any of the individual subscription management (Salmon notifications for sub/unsub, etc) nor a nice UI for user subscriptions.
Needs some further cleanup to treat posts as status updates instead of link references.
 2010-02-08 11:15:29 -08:00
Zach Copley
fc226a6ad5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-06 06:48:41 +00:00
Zach Copley
70abea3ac4 Delete old Twitter user record when user changes screen name instead of updating. Simpler. 2010-02-06 06:48:19 +00:00
Zach Copley
558934d1dd Store Twitter screen_name, not name, for foreign_user.nickname when saving Twitter user. 2010-02-06 06:48:07 +00:00
Zach Copley
cfe4e460ca Delete old Twitter user record when user changes screen name instead of updating. Simpler. 2010-02-06 06:46:00 +00:00
Zach Copley
a5f03484da Store Twitter screen_name, not name, for foreign_user.nickname when saving Twitter user. 2010-02-05 21:39:29 -08:00
Brion Vibber
875e1a70ce Don't spew warnings on usage of MEMCACHE_COMPRESSED constant when memcache PHP extension is not present. 
Switched to a locally-defined Cache::COMPRESSED, translating that to MEMCACHE_COMPRESSED in the plugin.
 2010-02-05 09:47:56 -08:00
Zach Copley
af9f23c2d9 - Fix cache handling in TwitterStatusFetcher 
- Other stability fixes
 2010-02-05 03:18:45 +00:00
Sarven Capadisli
5bdc6fa5d4 Moved hardcoded identica theme out of MobileProfile. In this case, it 
will use whichever theme is loaded as its base and then add its own
mobile styles. Of course, if a theme comes with its own mobile styles,
it will use that instead as an addition to its own base.
 2010-02-04 19:42:33 +00:00
Sarven Capadisli
e891075494 Moved hardcoded identica theme out of MobileProfile. In this case, it 
will use whichever theme is loaded as its base and then add its own
mobile styles. Of course, if a theme comes with its own mobile styles,
it will use that instead as an addition to its own base.
 2010-02-04 19:39:46 +00:00
Sarven Capadisli
7ebd13fa69 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-04 16:56:34 +00:00
Zach Copley
feaf938ffd Make Twitter bridge truncate and add a link back to the original notice when notice content is > 140c 2010-02-04 03:17:48 +00:00
Zach Copley
9ca4fd69b3 - Fix cache handling in TwitterStatusFetcher 
- Other stability fixes
 2010-02-04 01:59:28 +00:00
Zach Copley
72f72d17db - Fix cache handling in TwitterStatusFetcher 
- Other stability fixes
 2010-02-04 01:53:08 +00:00
Craig Andrews
057ec1fcea Merge branch '0.9.x' into 1.0.x 
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
 2010-02-02 17:00:10 -05:00
Brion Vibber
f4c81fa1e1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-02 09:57:50 -08:00
Sarven Capadisli
245610d2e1 Removed entity flag stylesheet and icons from plugin to core. 2010-02-02 16:27:58 +01:00
Sarven Capadisli
65c5d7813b Added icon to Clear label for UserFlag plugin 2010-02-02 16:06:22 +01:00
Brion Vibber
c14ac57b19 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-01 10:30:45 -08:00
Sarven Capadisli
0c838f82b0 Added missing concat of </li> in Realtime response 2010-01-31 23:57:35 +01:00
Sarven Capadisli
9f36c10001 Updated XHR binded events to work better in jQuery 1.4.1. Using 
.live() for event delegation instead of jQuery.data() and checking to
see if an element was previously binded.
 2010-01-31 22:37:22 +00:00
Evan Prodromou
779204b194 Merge branch 'testing' into 0.9.x 
Conflicts:
	actions/apioauthauthorize.php
 2010-01-31 15:27:58 -05:00
Evan Prodromou
ebf4e497f6 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-31 15:20:57 -05:00
Sarven Capadisli
339eb1adad Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-31 19:25:49 +00:00
Evan Prodromou
a1c9874a61 better handling of null responses from geonames.org 2010-01-30 12:40:11 -05:00
Craig Andrews
61d4709eb8 Pass username and nickname to autoregister so auth plugins can set the nickname correct when creating a new user. 
Continues fixing what Eric Helgeson pointed out in 01eb4e8f00
 2010-01-29 20:43:16 -05:00