Zach Copley
37ed3af94e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 21:44:42 +00: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
Christopher Vollick
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
Christopher Vollick
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
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
Zach Copley
35be39e30e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 01:23:24 -08:00
Zach Copley
47300a2ae9
Upgrade profile-based activity noun to have more complete set of
...
profile fields
2010-02-22 01:21:34 -08:00
James Walker
7b2ea7aa22
Merge remote branch 'statusnet/testing' into testing
2010-02-22 01:40:03 -05:00
James Walker
effa4f5d1e
adding extlib for Crypt_RSA
2010-02-22 01:39:00 -05:00
Brion Vibber
17ed30dffc
OStatus: fix remote subscription when putting webfinger address in the little box
2010-02-22 06:00:13 +00:00
Evan Prodromou
891e002883
don't calculate replies for remote notices
2010-02-21 23:56:48 -05:00
Evan Prodromou
a9599d53c5
some info code for usersalmon.php
2010-02-21 23:39:52 -05:00
Evan Prodromou
e4c4f90c8a
don't save Notices that already exist in Salmon
2010-02-21 23:32:20 -05:00
Evan Prodromou
48839a1fcf
change erroneous common_sql_time() to common_sql_date()
2010-02-21 23:19:29 -05:00
Evan Prodromou
e39e6cdcc5
was using HTMLPurifier::purify() as a static method, which it is not
2010-02-21 23:16:42 -05:00
Evan Prodromou
aab7ce70dc
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 23:08:01 -05:00
Evan Prodromou
17c329ba89
add HTMLPurifier config
2010-02-21 23:07:46 -05:00
Brion Vibber
bd3051b85c
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-21 19:55:53 -08:00
Brion Vibber
5207783765
OStatus: record source profile & saving method in ostatus_source table; this allows us to distinguish posts that have come through an unverified group feed
2010-02-21 19:52:53 -08:00
Evan Prodromou
cc18f757a8
hook in OStatusPlugin to return Ostatus_profile URIs where applicable
2010-02-21 22:52:52 -05:00
Evan Prodromou
a745d38d6d
slight rearrangement of getting profile URIs
2010-02-21 22:52:27 -05:00
Evan Prodromou
232b5efa7e
Add error info for missing URI in attention
2010-02-21 22:44:58 -05:00
Evan Prodromou
13fb7bef78
reversed in_array() arguments in UsersalmonAction
2010-02-21 22:41:02 -05:00
Evan Prodromou
de522d7978
Wasn't putting in namespaces for reply salmons
2010-02-21 22:38:18 -05:00
Evan Prodromou
a0b64663be
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 22:35:04 -05:00
Evan Prodromou
bd21f48cee
Notice::getReplies() returns array of profile IDs
2010-02-21 22:34:40 -05:00
Brion Vibber
892cd801d1
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-21 19:02:23 -08:00
Brion Vibber
ad10e6e8da
OStatus: drop the remnants of feedsubsettings, replaced by ostatussub and no longer linked in UI
2010-02-21 19:01:32 -08:00
Evan Prodromou
79c76f1a87
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 21:57:32 -05:00
