e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
7c8031dc4b
Merge remote branch 'statusnet/testing' into testing
...
Conflicts:
plugins/OStatus/lib/webfinger.php
2010-02-25 23:49:45 -05:00
855692141d
use a real keypair from discovery
2010-02-25 23:38:25 -05:00
0afb09ad64
er. right.
2010-02-25 23:37:59 -05:00
02300ebfb0
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 19:52:19 -08:00
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
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
d8d8d59a03
- Updates to use new activity object factories
...
- Prune obsolete feed creation method
2010-02-25 18:55:11 -08:00
2fa953da22
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 18:52:26 -08:00
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
e197208a4a
info about discovery in Ostatus_profile::ensureWebfinger()
2010-02-25 21:07:52 -05:00
a43598c31e
cache Web responses in Webfinger library
2010-02-25 21:07:24 -05:00
c693365ae7
cache results of webfinger lookups
2010-02-25 20:29:52 -05:00
1cae324555
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 19:59:01 -05:00
894b221e8a
Parse an hcard for hints, if available
2010-02-25 19:58:51 -05:00
cc0670791e
use new hcard method for webfinger
2010-02-25 19:58:18 -05:00
36f02f459b
add hkit for hCard parsing
2010-02-25 19:11:39 -05:00
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
7922edb5b6
Add lots of fun avatars to our Atom output
2010-02-25 16:06:49 -08:00
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
4aa82f75ed
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 18:45:32 -05:00
6578e0e1af
use new dedicated hcard method for Webfinger profile
2010-02-25 18:45:08 -05:00
08413428a7
typo
2010-02-25 17:52:56 -05:00
93f4f07c12
moving webfinger action to xrdaction
2010-02-25 17:52:18 -05:00
5ae64a7adb
moving references to Webfinger to Discovery
2010-02-25 17:34:56 -05:00
bd90ef9f66
replace webfinger usage in hostmeta.php
2010-02-25 17:26:10 -05:00
b2dabe6a48
removing the webfinger lib
2010-02-25 17:12:46 -05:00
3d0ba3efc8
adding a new, more generic "discovery" class that does LRDD disco
...
(rather than webfinger specific)
2010-02-25 17:09:54 -05:00
5cb6e54bed
call-time pass by reference
2010-02-25 17:09:54 -05:00
e62e49ed3b
adding some exception handling for magicenv parsing
2010-02-25 17:09:54 -05:00
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
79c0d52daa
OStatus: save categories from the Atom entry as hashtags.
2010-02-25 11:26:33 -08:00
4a71753f20
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-25 09:28:19 -08:00
84fa3776e2
Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:14:42 -08:00
ffdcdbc198
Removed dangling icons in Realtime plugin
2010-02-25 13:55:06 +00:00
9ef7eb036c
Moved common icons from Realtime plugin to core icons file
2010-02-25 10:38:55 +00:00
374c488cf1
return attachement from saveHTMLFile()
2010-02-24 22:26:40 -05:00
b08a527139
content_* to common_*
2010-02-24 22:22:42 -05:00
75cf4d4312
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 22:03:01 -05:00
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
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
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
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
543ff40ef6
Populate more profile information when doing a remote subscribe
2010-02-24 16:51:24 -08:00
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
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
93507a1927
OStatus: handle update-profile Salmon pings
2010-02-24 23:28:01 +00:00
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
0c7844734e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 20:38:38 +00:00
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
269d567d94
use Subscription::start() for remote subscribes
2010-02-24 15:20:06 -05:00
daea988786
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 15:00:52 -05:00
07214f1370
OStatus: save updated profile bits when they come in over the wire; fix up nicknames
2010-02-24 19:06:10 +00:00
1f45273d53
Moved StatusNetInstance into SN in util.js
2010-02-24 16:35:20 +01:00
8e7606cc8d
Added processing indicator for .form_remote_authorize on ostatussub page
2010-02-24 15:20:44 +01:00
618ce6a855
- Move ActivityParseTests to core
...
- Add test for Portable Contacts stuff
2010-02-23 23:58:21 -08:00
2e58802cc9
OStatus: fix group delivery, send reply/group Salmon pings from background.
2010-02-24 02:20:31 +00:00
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
391b45949f
adding xfn, foaf and hcard rel's to our webfinger output
2010-02-23 18:25:31 -05:00
d6ad733247
OStatus: fixes for link/id and text extraction gets import of Buzz feeds working.
2010-02-23 21:47:14 +00:00
f5ec7c2707
some logging for OStatusPlugin::onStartFindMentions()
2010-02-23 16:13:24 -05:00
5f9a8ca64b
OStatus: accept webfinger addresses as well as profile URLs in the explicit remote subscribe form.
2010-02-23 21:11:44 +00:00
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
a0c255e231
move mention detection before default in OStatusPlugin
2010-02-23 15:59:10 -05:00
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
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
e070fcaaae
OStatus: fix for avatars, submit button in updated remote profile preview
2010-02-23 11:37:49 -08:00
1fe031844c
er typo
2010-02-22 23:44:33 -05:00
9494b0e5d7
magicsig shuffling
2010-02-22 23:30:32 -05:00
17b8020d25
clean up error logging
2010-02-22 23:30:31 -05:00
cd561657c2
missing return value check
2010-02-22 23:30:31 -05:00
f4b34d67c5
generate keypairs for users, and put them in the XRD for discovery
2010-02-22 23:30:31 -05:00
74f5c1e169
db_objectified magic sig - for persistence of local keypairs
2010-02-22 23:30:31 -05:00
cb32b676fa
moving magicsig.php to classes - to add storage
2010-02-22 23:30:31 -05:00
b67bb182b0
Refactored preview info and form for authorizing a remote subscription
2010-02-23 04:59:34 +01:00
193448d1be
OStatus: cleanup on ostatussub preparing for final UI work on the remote sub/join forms.
2010-02-23 01:58:05 +00:00
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
6a711c6cdc
Move ActivityObject and related stuff to core
2010-02-22 17:10:50 -08:00
870e556faa
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-23 00:52:47 +00:00
a3e800e67c
Add PoCo bits, avatar link, geo point, etc. to person activity obj output
2010-02-22 16:46:54 -08:00
d410df0406
OStatus group delivery initial implementation.
...
- added rel="ostatus:attention" links for group delivery
- added events for plugins to override group profile/permalink pages
- pulled Notice::saveGroups up to save-time so we can override;
it's relatively cheap and gives us a clean list of target
groups for distrib time even with customized delivery.
- fixed notice::getGroups to return group objects as expected
- added some doc on new parameters to Notice::saveNew
- 'groups' list of group IDs to push to in place of parsing
- messages that come in via PuSH and contain local group targets
are delivered to local group members
- messages that come in via PuSH and contain remote group targets
are delivered to local members of the remote group
Todo:
- handle group posts that only come through Salmon
- handle conflicts in case something comes in both through Salmon and PuSH
- better source verification
- need a cleaner interface to look up groups by URI
- need a way to handle remote groups with conflicting names
2010-02-23 00:44:45 +00:00
caad5859b5
swapping pear error handling so Crypt_RSA can properly detect available
...
math libraries
2010-02-22 19:01:12 -05:00
3b823f8fbd
Leaves the original URL alone and adds ? or & when it does the XHR.
2010-02-23 00:27:41 +01:00
8aa8e124cb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 22:24:45 +01:00
3c00472999
Removed unnecessary assignment to SN.C.I.OStatusProfile. It can be
...
brought back in the future if the value is to be set directly from the
HTML script output.
2010-02-22 22:23:37 +01:00
06f155c02d
OStatus: initial hookup of remote group membership (notice delivery not yet working quite right)
...
- added a temp config var to disable salmon magic signatures until they're working consistently
2010-02-22 12:13:57 -08:00
7e8c3ea418
Removed extra comma
2010-02-22 19:37:42 +01:00
a1549ebf87
Minor JSLinting
2010-02-22 19:36:03 +01:00
3ed3796135
Added licensing info and a note about migrating
2010-02-22 19:18:32 +01:00
85cb850cd5
Set and reuse a cookie with own profile value at a StatusNet instance
2010-02-22 19:13:30 +01:00
2b16532ffb
OStatus: use 'profile' consistently as param on ostatussub and ostatusinit to help us stay sane.
2010-02-22 10:03:34 -08:00
a6afc1cfd6
Made Blogspam Plugin Respect textlimit Setting.
...
The Blogspam plugin was setting a max-size to 140.
It was therefore rejecting posts with more characters as spam.
This kind of defeated the purpose of setting a higher limit...
2010-02-22 11:20:44 -05:00
1e8e1e836d
Rewrote How Blogspam Plugin Made HTTP Requests.
...
The old way didn't seem to work anymore.
It was just sending empty requests.
2010-02-22 11:19:16 -05:00
c88507fe11
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 17:08:54 +01:00
3569493ba7
Added link to Subscriptions page to XHR get the ostatus sub form
2010-02-22 17:07:48 +01:00
e6ce04cbce
Generalised Subscription XHR dialogbox
2010-02-22 17:05:43 +01:00
2f65fa646a
wiring in magicsig
2010-02-22 09:05:52 -05:00
e0388cc1d3
adding magic sig stuff
2010-02-22 09:05:32 -05:00
8fe097d7d1
Merge remote branch 'statusnet/testing' into testing
2010-02-22 09:03:42 -05:00
75fdef2092
handle poco nicknames in Ostatus_profile
2010-02-22 07:57:44 -05:00
Zach Copley
James Walker
Brion Vibber
Evan Prodromou
Sarven Capadisli
Christopher Vollick