Evan Prodromou
f5ec7c2707
some logging for OStatusPlugin::onStartFindMentions()
2010-02-23 16:13:24 -05: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
Sarven Capadisli
b67bb182b0
Refactored preview info and form for authorizing a remote subscription
2010-02-23 04:59:34 +01:00
Sarven Capadisli
a306ac3976
Added a general classname for remote authorization
2010-02-23 04:58:58 +01:00
Brion Vibber
55f83fe516
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-23 01:58:49 +00: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
89dc6dee01
Add PoCo namespace to optional ns output in Notice::asAtomEntry()
2010-02-22 17:56:43 -08:00
Zach Copley
1f859e72a2
Add activity.php to common includes
2010-02-22 17:47:40 -08: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
Brion Vibber
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
James Walker
caad5859b5
swapping pear error handling so Crypt_RSA can properly detect available
...
math libraries
2010-02-22 19:01:12 -05:00
Sarven Capadisli
3b823f8fbd
Leaves the original URL alone and adds ? or & when it does the XHR.
2010-02-23 00:27:41 +01:00
Sarven Capadisli
8aa8e124cb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 22:24:45 +01:00
Sarven Capadisli
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
Brion Vibber
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
Sarven Capadisli
7e8c3ea418
Removed extra comma
2010-02-22 19:37:42 +01:00
Sarven Capadisli
a1549ebf87
Minor JSLinting
2010-02-22 19:36:03 +01:00
Sarven Capadisli
3ed3796135
Added licensing info and a note about migrating
2010-02-22 19:18:32 +01:00
Sarven Capadisli
85cb850cd5
Set and reuse a cookie with own profile value at a StatusNet instance
2010-02-22 19:13:30 +01:00
Brion Vibber
2b16532ffb
OStatus: use 'profile' consistently as param on ostatussub and ostatusinit to help us stay sane.
2010-02-22 10:03:34 -08:00
Sarven Capadisli
c88507fe11
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 17:08:54 +01:00
Sarven Capadisli
3569493ba7
Added link to Subscriptions page to XHR get the ostatus sub form
2010-02-22 17:07:48 +01:00
Sarven Capadisli
e6ce04cbce
Generalised Subscription XHR dialogbox
2010-02-22 17:05:43 +01:00
Evan Prodromou
13ad48fab3
Merge branch 'master' into testing
2010-02-22 11:04:11 -05:00
Evan Prodromou
5a6967db6c
clear the site owner when profile changes
2010-02-22 11:03:56 -05:00
Sarven Capadisli
8ccc9e2c38
Added before and after event hooks for subscriptions content
2010-02-22 17:03:28 +01:00
James Walker
2f65fa646a
wiring in magicsig
2010-02-22 09:05:52 -05:00
James Walker
e0388cc1d3
adding magic sig stuff
2010-02-22 09:05:32 -05:00
James Walker
8fe097d7d1
Merge remote branch 'statusnet/testing' into testing
2010-02-22 09:03:42 -05:00
Evan Prodromou
75fdef2092
handle poco nicknames in Ostatus_profile
2010-02-22 07:57:44 -05:00
Evan Prodromou
b79d4ed6a1
add PoCo preferredUsername for nickname in Profile::asActivityNoun()
2010-02-22 07:43:12 -05:00
Evan Prodromou
fae5a15a88
add strongly-suggested link to Profile::asActivityNoun()
2010-02-22 07:40:20 -05:00
Evan Prodromou
074e3fa895
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 07:09:08 -05:00
Evan Prodromou
e94800ced9
fix broken link in OpenID documentation
2010-02-22 07:08:57 -05:00
Sarven Capadisli
f54c9b70db
Fixed error/warning message location in OStatus autorize subscription page
2010-02-22 11:53:34 +01:00