GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
9,155 Commits 8 Branches 4 Tags 310 MiB
05e3768e6a
Commit Graph

1253 Commits

Author SHA1 Message Date
Brion Vibber
9801c60bea Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 09:33:38 -08:00
Brion Vibber
1e63fda669 Clean up OStatus mentions finding; separate regexes keeps the code paths a bit clearer. Also switched to hitting HTTP profile first; as the common case it'll be faster. 2010-03-03 09:32:25 -08:00
Brion Vibber
ffa1931c9d Avoid warning/notice spew in XRD parser. Not all DOM nodes are elements. 2010-03-03 09:31:14 -08:00
Sarven Capadisli
11750e832f Added remote join action for group profile 2010-03-03 12:02:10 -05:00
Sarven Capadisli
ea10805e3f Moved the remote subscription button to subscription mini list 2010-03-03 11:22:21 -05:00
Sarven Capadisli
1a4652b1ad Changed label text for remote subscription to something similar. Given 
that this button will be used within context of subscriptions, 'New'
works along with the '+' icon.
 2010-03-03 10:32:54 -05:00
Craig Andrews
358556057a Bump to phpCAS 1.1.0RC6 2010-03-02 23:25:34 -05:00
Zach Copley
f7ba5566bc Make Facebook plugin look for API key and secret before doing anything 2010-03-02 18:27:37 -08:00
Zach Copley
32c08f53de Show global key and secret, if defined, in Twitter bridge admin panel 2010-03-03 01:49:14 +00:00
Zach Copley
08422dfa17 Remove double word from Twitter bridge README 2010-03-02 16:53:53 -08:00
Zach Copley
9520c0996d Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: save file records for enclosures
  Changed the geo location cookie Expire to Session.
 2010-03-02 16:51:21 -08:00
Zach Copley
ca21f1da86 - Have Twitter bridge check for a global key and secret if it can't 
find one in the local config
- Refuse to work at all if the consumer key and secret aren't set
 2010-03-02 16:49:29 -08:00
Brion Vibber
79ffebb51b OStatus: save file records for enclosures 
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.

Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
 2010-03-02 16:36:08 -08:00
Brion Vibber
ddf3614c84 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-02 13:38:10 -08:00
Sarven Capadisli
e9c127ddd8 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 15:26:27 -05:00
Sarven Capadisli
1550d1004d Don't need to float the anchor 2010-03-02 15:24:07 -05:00
Brion Vibber
72460091dd Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 12:21:48 -08:00
Craig Andrews
380439ba77 Redirect to main page when transparent SSO is in place for the CAS plugin (which is what the user expects) 2010-03-02 15:10:30 -05:00
Brion Vibber
b1ffbf17d3 Performance fix on Sphinx search results: use id instead of created timestamp for reverse date sorting; should give same result but doesn't trigger a filesort. 2010-03-02 12:06:40 -08:00
Sarven Capadisli
e3c2b8e0b5 Refactored remote subscribe action in OStatus 2010-03-02 12:41:18 -05:00
Sarven Capadisli
88c33bbb57 Showing remote subscription button on the personal timeline 2010-03-02 12:35:27 -05:00
Sarven Capadisli
5abff91041 Generalized style for entity remote subscription action 2010-03-02 12:34:35 -05:00
Sarven Capadisli
623faf9f2d Just a label change. Since the user already went ahead with 
subscribing, in this step we are just confirming the profile.
 2010-03-02 09:57:28 -05:00
Zach Copley
9816b35063 Update Facebook plugin README with info about new admin panel 2010-03-02 00:38:00 -08:00
Zach Copley
40e1b249cf Initial Facebook admin panel 2010-03-01 23:31:56 -08:00
Zach Copley
1df8c2a44d Some wording / spelling fixes 2010-03-01 22:58:27 -08:00
Zach Copley
27a49361eb - Make 'Sign in with Twitter' optional 
- Updates to the Twitter bridge plugin README
 2010-03-01 22:41:07 -08:00
Zach Copley
82c9714fca Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  High-priority OStatus fixes:
  OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
 2010-03-01 21:54:53 -08:00
Zach Copley
871b3aa6c0 Remove un-needed config variable for enabling/disabling Twitter integration 2010-03-01 21:52:31 -08:00
Zach Copley
6b2d67216e Initial Twitter bridge admin panel 2010-03-01 21:35:24 -08:00
Brion Vibber
c38ed1bb19 High-priority OStatus fixes: 
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
 2010-03-01 18:48:45 -08:00
Brion Vibber
680ace1966 High-priority OStatus fixes: 
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
 2010-03-01 18:46:34 -08:00
Brion Vibber
e30af99873 Merge branch 'work' into testing 2010-03-01 16:57:58 -08:00
Brion Vibber
493b5479c1 OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't) 
Plus misc warnings/notices cleanup in the submission path.
 2010-03-01 16:43:36 -08:00
Brion Vibber
45e8819c1b Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications 2010-03-01 16:35:36 -08:00
Evan Prodromou
0512151eab more output in updateostatus.php 2010-03-01 18:19:20 -05:00
Evan Prodromou
d77248343f fix path for updateostatus.php 2010-03-01 18:03:17 -05:00
Evan Prodromou
3ff3abb247 Script to convert OMB subscriptions to OStatus subscriptions 2010-03-01 18:03:17 -05:00
Brion Vibber
3c4ead4996 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	db/08to09.sql
	locale/statusnet.po
	scripts/update_po_templates.php
 2010-03-01 14:59:26 -08:00
Brion Vibber
00f724d0e6 Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints. 2010-03-01 14:10:13 -08:00
Craig Andrews
3bfe3345df Use common_nicknamize() in better places. 2010-03-01 11:56:07 -05:00
Evan Prodromou
f00e8bbf47 Merge branch 'testing' into 0.9.x 2010-02-27 17:07:57 -05:00
Evan Prodromou
55f27feb78 Plugin to restrict too many registrations from one IP 
We throttle registrations by IP. We record IP address of each
registration, and if too many registrations have been done by the same
IP address in the time interval, we reject the registration.
 2010-02-27 15:05:08 -05:00
James Walker
831eb0d2b6 renaming sha256 to prevent conflict 2010-02-26 18:27:13 -05:00
James Walker
ee7603b09f better return check in Magicsig::staticGet() 2010-02-26 17:53:27 -05:00
James Walker
1cf08c7ad7 MagicEnvelope::parse shouldn't be called statically 2010-02-26 17:09:50 -05:00
James Walker
6ee7660a58 should be sequenceKey (singular) 2010-02-26 16:51:50 -05:00
James Walker
0ecf435dc5 adding sequenceKeys() to magicsig 2010-02-26 16:50:00 -05:00
James Walker
c82cee1876 removing some extraneous debug logging 2010-02-26 16:26:04 -05:00
Craig Andrews
74bcc6929d Show messaging on the login and registration forms informing users that they may use their LDAP credentials 2010-02-26 15:51:25 -05:00
James Walker
e4c462570f move salmon posting to send application/magic-envelope+xml per http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#RPF 2010-02-26 15:39:58 -05:00
James Walker
f23a877cd8 Discovery::lookup now throws an exception 2010-02-26 15:39:58 -05:00
Brion Vibber
9b366547d7 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-26 12:33:50 -08:00
Brion Vibber
517fd54b65 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-26 12:33:36 -08:00
James Walker
223ebc765c move signing to take a local actor profile and use local keys 2010-02-26 14:22:49 -05:00
James Walker
3a7eef1074 only put public keys in XRD 2010-02-26 14:22:49 -05:00
James Walker
bbb0a7d5bc updating to use latest salmon NS definitions 2010-02-26 14:22:49 -05:00
Evan Prodromou
6781f95c73 Merge branch 'blacklistplus' into testing 
Conflicts:
	EVENTS.txt
 2010-02-26 12:40:30 -05:00
Brion Vibber
8dfc8f1635 Merge branch 'testing' into 0.9.x 2010-02-26 09:35:28 -08:00
Evan Prodromou
c188ae15d9 Blacklist user nickname and password on delete 2010-02-26 12:29:28 -05:00
James Walker
ab8bb4d79e more cleanup 2010-02-26 04:07:58 -05:00
James Walker
d1256b547f bad merge.. cleaning up missing webfinger bits 2010-02-26 03:43:35 -05:00
James Walker
22062b665e remove webfinger.php 2010-02-26 03:28:29 -05:00
James Walker
85b5b4b40a Merge remote branch 'statusnet/testing' into testing 2010-02-26 03:27:40 -05:00
James Walker
84d0c865c4 salmon actually fetching remote keypairs 2010-02-26 03:25:51 -05:00
Zach Copley
e650794300 Remove unnecessary requires 2010-02-25 22:06:31 -08:00
James Walker
7c8031dc4b Merge remote branch 'statusnet/testing' into testing 
Conflicts:
	plugins/OStatus/lib/webfinger.php
 2010-02-25 23:49:45 -05:00
James Walker
855692141d use a real keypair from discovery 2010-02-25 23:38:25 -05:00
James Walker
0afb09ad64 er. right. 2010-02-25 23:37:59 -05:00
Brion Vibber
02300ebfb0 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-02-25 19:52:19 -08:00
Brion Vibber
2528bb452b OStatus: clean up known-URL hinting during profile setup, saves some extra HTTP hits we were getting when mentioning Buzz feeds. 2010-02-25 19:50:59 -08:00
Zach Copley
cf61f36e6b Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
  info about discovery in Ostatus_profile::ensureWebfinger()
  cache Web responses in Webfinger library
 2010-02-25 18:57:12 -08:00
Zach Copley
d8d8d59a03 - Updates to use new activity object factories 
- Prune obsolete feed creation method
 2010-02-25 18:55:11 -08:00
Brion Vibber
2fa953da22 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-02-25 18:52:26 -08:00
Brion Vibber
2feb09f434 OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first) 2010-02-25 18:51:44 -08:00
Evan Prodromou
e197208a4a info about discovery in Ostatus_profile::ensureWebfinger() 2010-02-25 21:07:52 -05:00
Evan Prodromou
a43598c31e cache Web responses in Webfinger library 2010-02-25 21:07:24 -05:00
Evan Prodromou
c693365ae7 cache results of webfinger lookups 2010-02-25 20:29:52 -05:00
Evan Prodromou
1cae324555 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 19:59:01 -05:00
Evan Prodromou
894b221e8a Parse an hcard for hints, if available 2010-02-25 19:58:51 -05:00
Evan Prodromou
cc0670791e use new hcard method for webfinger 2010-02-25 19:58:18 -05:00
Evan Prodromou
36f02f459b add hkit for hCard parsing 2010-02-25 19:11:39 -05:00
Zach Copley
82cac2be59 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
  Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>")
  Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
 2010-02-25 16:07:32 -08:00
Zach Copley
7922edb5b6 Add lots of fun avatars to our Atom output 2010-02-25 16:06:49 -08:00
Brion Vibber
45435a7c03 OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts. 2010-02-26 00:01:22 +00:00
Evan Prodromou
4aa82f75ed Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 18:45:32 -05:00
Evan Prodromou
6578e0e1af use new dedicated hcard method for Webfinger profile 2010-02-25 18:45:08 -05:00
James Walker
08413428a7 typo 2010-02-25 17:52:56 -05:00
James Walker
93f4f07c12 moving webfinger action to xrdaction 2010-02-25 17:52:18 -05:00
James Walker
5ae64a7adb moving references to Webfinger to Discovery 2010-02-25 17:34:56 -05:00
James Walker
bd90ef9f66 replace webfinger usage in hostmeta.php 2010-02-25 17:26:10 -05:00
James Walker
b2dabe6a48 removing the webfinger lib 2010-02-25 17:12:46 -05:00
James Walker
3d0ba3efc8 adding a new, more generic "discovery" class that does LRDD disco 
(rather than webfinger specific)
 2010-02-25 17:09:54 -05:00
James Walker
5cb6e54bed call-time pass by reference 2010-02-25 17:09:54 -05:00
James Walker
e62e49ed3b adding some exception handling for magicenv parsing 2010-02-25 17:09:54 -05:00
Brion Vibber
b5b5184c88 OStatus: fix remote groups to work with new user_groups/local_groups split. 
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
  while the rest of the groups UI remains limited to local groups
  (plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
 2010-02-25 13:02:08 -08:00
Craig Andrews
eb724bfdc8 Add TabFocus (for die-hard Twitter users) plugin 2010-02-25 15:34:01 -05:00
Brion Vibber
79c0d52daa OStatus: save categories from the Atom entry as hashtags. 2010-02-25 11:26:33 -08:00
Brion Vibber
4a71753f20 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-25 09:28:19 -08:00
Brion Vibber
84fa3776e2 Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline into integration 2010-02-25 09:14:42 -08:00
Sarven Capadisli
ffdcdbc198 Removed dangling icons in Realtime plugin 2010-02-25 13:55:06 +00:00
Sarven Capadisli
9ef7eb036c Moved common icons from Realtime plugin to core icons file 2010-02-25 10:38:55 +00:00
Craig Andrews
489bd935eb Make LDAP connection error fatal - there really is no way to recover from that. 2010-02-24 23:20:34 -05:00
Craig Andrews
bdf0dfc30d Improve description of what the provide_name parameter means 2010-02-24 22:29:46 -05:00
Evan Prodromou
374c488cf1 return attachement from saveHTMLFile() 2010-02-24 22:26:40 -05:00
Evan Prodromou
b08a527139 content_* to common_* 2010-02-24 22:22:42 -05:00
Evan Prodromou
75cf4d4312 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-24 22:03:01 -05:00
Evan Prodromou
942521ef30 if OStatus post is too long, show the summary and save it as an HTML attachment 2010-02-24 22:02:43 -05:00
Brion Vibber
58e232a10a OStatus: when finding webfinger @-replies, override a local profile match if found at the same location (eg @someguy vs @someguy@example.org) 
Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output.
 2010-02-25 02:56:56 +00:00
Brion Vibber
b798faf9ea OStatus: abort processing of this PuSH in item if we got an exception, rather than letting it be re-run. 2010-02-25 02:43:20 +00:00
Zach Copley
10884dcd49 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 
* 'testing' of gitorious.org:statusnet/mainline:
  Merge StatusNet core localization updates from 0.9.x branch
  Fix update_po_templates.php to support the plural and context variants of _m() in plugins
  Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
  OStatus: handle update-profile Salmon pings
  Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
  OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
 2010-02-24 16:52:16 -08:00
Zach Copley
543ff40ef6 Populate more profile information when doing a remote subscribe 2010-02-24 16:51:24 -08: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
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
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
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
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
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
Zach Copley
618ce6a855 - Move ActivityParseTests to core 
- Add test for Portable Contacts stuff
 2010-02-23 23:58:21 -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
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
James Walker
391b45949f adding xfn, foaf and hcard rel's to our webfinger output 2010-02-23 18:25:31 -05: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
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
Sarven Capadisli
b67bb182b0 Refactored preview info and form for authorizing a remote subscription 2010-02-23 04:59:34 +01:00
Brion Vibber
193448d1be OStatus: cleanup on ostatussub preparing for final UI work on the remote sub/join forms. 2010-02-23 01:58:05 +00:00
Zach Copley
cbf6ebae01 Merge branch 'rationalize-activity' into testing 
* rationalize-activity:
  Move ActivityObject and related stuff to core
  Add PoCo bits, avatar link, geo point, etc. to person activity obj output
 2010-02-22 17:12:33 -08:00
Zach Copley
6a711c6cdc Move ActivityObject and related stuff to core 2010-02-22 17:10:50 -08:00
Brion Vibber
870e556faa Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-23 00:52:47 +00:00
Zach Copley
a3e800e67c Add PoCo bits, avatar link, geo point, etc. to person activity obj output 2010-02-22 16:46:54 -08:00