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

8535 Commits

Author SHA1 Message Date
Craig Andrews c187bf5597 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php
 2010-02-24 20:52:45 -05:00
Brion Vibber 8914b69d50 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-24 16:35:57 -08:00
Brion Vibber 3b7084c6dd Fix update_po_templates.php to support the plural and context variants of _m() in plugins 2010-02-24 16:34:45 -08:00
Siebrand Mazeland 3dc86f2bd3 Localisation updates for !StatusNet from !translatewiki.net !sntrans 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-02-25 00:53:50 +01:00
Brion Vibber 3194a86caa Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-24 15:48:27 -08:00
Brion Vibber 59be4b8cae Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-24 15:47:51 -08:00
Brion Vibber e04f556304 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-24 23:40:28 +00:00
Brion Vibber e18e659ca3 Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight. 2010-02-24 23:39:40 +00:00
Brion Vibber 93507a1927 OStatus: handle update-profile Salmon pings 2010-02-24 23:28:01 +00:00
Sarven Capadisli b782225ade Revert "Updated jQuery Form Plugin from v2.17 to v2.36" 
This reverts commit 72037d6143.

Until some of the XHR notice related bugs are sorted out in Opera and
Chromium, reverting back to the previous version. It throws slightly
less errors. XHR file attachments is still a bit problematic in
Opera 10.10/Ubuntu, Opera 10.10/Windows, and Chrome 4/Ubuntu. But this
revert will at least allow regular XHR notices to work okay in Opera
and Chromium.

Standards suck!
 2010-02-25 00:10:36 +01:00
Brion Vibber ec4899e617 OStatus: disable HTMLPurify cache unless we've configured a writable path for it. 
Updated plugin README with available config options.
Cleanup for a bad element fallback lookup in Activity
 2010-02-24 22:16:17 +00:00
Evan Prodromou 01cfe86cd2 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-24 15:54:29 -05:00
Evan Prodromou c0d13097dd use Notice::bestUrl() to determine notice url in NoticeListItem::showNoticeLink() 2010-02-24 15:54:13 -05:00
Brion Vibber 0c7844734e Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-24 20:38:38 +00:00
Brion Vibber c36bdc1ba5 - break OMB profile update pings to a background queue 
- add event hooks to profile update pings
- send Salmon pings with custom update-profile event to OStatus subscribees and groups (subscribers will see it on your next post)
- fix OStatus queues with overlong transport names, should work on DB queues now
- Ostatus_profile::notifyActivity() and ::notifyDeferred() now can take XML, Notice, or Activity for convenience
 2010-02-24 20:36:36 +00:00
Evan Prodromou 269d567d94 use Subscription::start() for remote subscribes 2010-02-24 15:20:06 -05:00
Evan Prodromou daea988786 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-24 15:00:52 -05:00
Brion Vibber 07214f1370 OStatus: save updated profile bits when they come in over the wire; fix up nicknames 2010-02-24 19:06:10 +00:00
Brion Vibber 5cabb63e4e Include <author> with actor ID and name in Activity::asString(); fixes Salmon signature on OStatus unsub pings 2010-02-24 17:36:31 +00:00
Sarven Capadisli 959171acac Added a cookie for the nickname cookie for the login page and prefill 
the input field.
 2010-02-24 16:39:16 +01:00
Sarven Capadisli 1f45273d53 Moved StatusNetInstance into SN in util.js 2010-02-24 16:35:20 +01:00
Sarven Capadisli 8e7606cc8d Added processing indicator for .form_remote_authorize on ostatussub page 2010-02-24 15:20:44 +01:00
Sarven Capadisli 2466dbfc97 Break long strings in tagcloud 2010-02-24 14:55:35 +01:00
Zach Copley 618ce6a855 - Move ActivityParseTests to core 
- Add test for Portable Contacts stuff
 2010-02-23 23:58:21 -08:00
Zach Copley 2f88e78a49 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: fix group delivery, send reply/group Salmon pings from background.
 2010-02-23 22:36:41 -08:00
Zach Copley 3a3af6782a Add PoCo parsing and some other fixes. 2010-02-23 22:35:48 -08:00
Brion Vibber 2e58802cc9 OStatus: fix group delivery, send reply/group Salmon pings from background. 2010-02-24 02:20:31 +00:00
Brion Vibber 868ae8e62b Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-24 01:10:58 +00:00
Brion Vibber 584b87cfe5 OStatus: consolidate the low-level notice save code between Salmon and PuSH input paths. Validation etc remains at higher levels. 2010-02-24 01:09:52 +00:00
Brion Vibber 2aaf8d4e30 Add class and (if present) id to DB_DataObject error exceptions; often they're VERRRRRY vague, and it helps to know what type of item is failing! 2010-02-24 01:09:12 +00:00
Sarven Capadisli 25864aea9d Using the default abbr class pattern for geo microformats instead of 
the shorthand that I've proposed at
http://microformats.org/wiki/geo-brainstorming#latitude_longitude_shorthand_and_geo_link

If anyone wants to pick up on where the discussion was left off or
get more implementation support by other sites and software, and be
recognized by parsers, I'd be happy to go back to the shorthand.
Because you know, it actually makes a lot of sense.
 2010-02-24 00:59:00 +01:00
James Walker 391b45949f adding xfn, foaf and hcard rel's to our webfinger output 2010-02-23 18:25:31 -05:00
Zach Copley fa178a8aa7 Add poco:displayName to Atom output for person object 2010-02-23 14:26:34 -08:00
Brion Vibber d6ad733247 OStatus: fixes for link/id and text extraction gets import of Buzz feeds working. 2010-02-23 21:47:14 +00:00
Evan Prodromou f5ec7c2707 some logging for OStatusPlugin::onStartFindMentions() 2010-02-23 16:13:24 -05:00
Brion Vibber 5f9a8ca64b OStatus: accept webfinger addresses as well as profile URLs in the explicit remote subscribe form. 2010-02-23 21:11:44 +00:00
Evan Prodromou b09304a6c4 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 
Conflicts:
	plugins/OStatus/OStatusPlugin.php
 2010-02-23 16:02:27 -05:00
Evan Prodromou a0c255e231 move mention detection before default in OStatusPlugin 2010-02-23 15:59:10 -05:00
Brion Vibber 90d34b26c6 OStatus: do PuSH subscription setup from subscribe/join event hooks, so resubscribing directly from a profile/group list works correctly if there aren't active subscriptions at the moment. 2010-02-23 20:44:27 +00:00
Brion Vibber c79c70ea2c OStatus subscription UI tweak: if we're already subscribed/joined, say so and don't offer a 'subscribe'/'join' button on the profile preview page. 2010-02-23 11:56:17 -08:00
Brion Vibber e070fcaaae OStatus: fix for avatars, submit button in updated remote profile preview 2010-02-23 11:37:49 -08:00
Evan Prodromou 1bffe42413 Drop user-only requirement for subscribe action 
I removed the check for local users in the subscribe button. I replaced
it with a more specific check for OMB 0.1 remote profiles, which you
can't use with this action.

I also took the opportunity to split the handle() method into
prepare() and handle(), and added PHPCS clean documentation.
 2010-02-23 08:38:23 -05:00
James Walker 1fe031844c er typo 2010-02-22 23:44:33 -05:00
James Walker 9494b0e5d7 magicsig shuffling 2010-02-22 23:30:32 -05:00
James Walker 17b8020d25 clean up error logging 2010-02-22 23:30:31 -05:00
James Walker cd561657c2 missing return value check 2010-02-22 23:30:31 -05:00
James Walker f4b34d67c5 generate keypairs for users, and put them in the XRD for discovery 2010-02-22 23:30:31 -05:00
James Walker 74f5c1e169 db_objectified magic sig - for persistence of local keypairs 2010-02-22 23:30:31 -05:00
James Walker cb32b676fa moving magicsig.php to classes - to add storage 2010-02-22 23:30:31 -05:00
Craig Andrews f0d1d07b94 Add lose <nickname> command to the command interpreter 2010-02-22 23:09:14 -05:00