Commit Graph

8549 Commits

Author SHA1 Message Date
Evan Prodromou
79e6fd9c85 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 21:08:17 -05: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
Zach Copley
207cc89074 Set avatar height correctly 2010-02-25 18:06:03 -08:00
Brion Vibber
c8ddcbe0d3 init_conversation.php script to copy old notice conversations into the conversation table 2010-02-25 17:56:01 -08: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
Brion Vibber
593885f98c Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>") 2010-02-25 23:52:34 +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
Evan Prodromou
76216af806 Add an hcard action
A dedicated hcard action for users. Our profile page includes
an hcard, but it's so full of other hcards that it's ambiguous which
one is the "real" one. So, this one make sense for meaning, "This is
my hcard."
2010-02-25 18:39:55 -05:00
Brion Vibber
e254c660f6 Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject 2010-02-25 15:22:23 -08: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
Zach Copley
bac959ad46 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  Not sure how this ended up in wrong-cased dir...
  OStatus: fix remote groups to work with new user_groups/local_groups split.

Conflicts:
	classes/User_group.php
2010-02-25 13:40:14 -08:00
Zach Copley
e61edb55d9 Rationalize group activity stuff 2010-02-25 13:34:43 -08:00
Brion Vibber
8278eca7ff Not sure how this ended up in wrong-cased dir... 2010-02-25 21:15:20 +00: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
Brion Vibber
7e0872c7ca Add local_group.sql with DB changes to user_group, setup and populate local_group. 2010-02-25 12:08:23 -08:00
Brion Vibber
b7037a49af Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-25 11:57:21 -08:00
Brion Vibber
a8d0c8d8ef Normalize nickname case on login; fixes failed logins where people were typing MixedCase nicknames (if browser saved this form, it would never work again until clearing the saved form data; very icky.) 2010-02-25 11:56:48 -08:00
Brion Vibber
fb8b8615b0 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-02-25 11:27:21 -08:00
Brion Vibber
79c0d52daa OStatus: save categories from the Atom entry as hashtags. 2010-02-25 11:26:33 -08:00
Evan Prodromou
5ea01435c1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 13:33:08 -05:00
Brion Vibber
39a8e9d8e6 Ensure that shortened URLs haven't accumulated whitespace when fetched by a plugin. Some shorteners have ended up inserting extra newlines when the string gets extracted from tidied HTML. 2010-02-25 10:30:37 -08:00
Evan Prodromou
85b5f01729 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 13:18:37 -05:00
Brion Vibber
4a71753f20 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-25 09:28:19 -08:00
Evan Prodromou
2f03b2cc45 method for getting a group's URI 2010-02-25 12:15:26 -05: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
Brion Vibber
99c0e16844 Merge commit 'refs/merge-requests/121' of git://gitorious.org/statusnet/mainline into integration 2010-02-25 09:12:45 -08:00
Brion Vibber
66373f8e5a Merge commit 'refs/merge-requests/2220' of git://gitorious.org/statusnet/mainline into integration 2010-02-25 09:11:07 -08:00
Evan Prodromou
22255da735 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 12:10:57 -05:00
Evan Prodromou
d53b4b9b84 save mainpage element for groups 2010-02-25 12:05:22 -05:00
Evan Prodromou
8f42d37593 Add 'mainpage' to User_group
Add the mainpage attribute to user_group objects.
2010-02-25 09:24:29 -05:00
Sarven Capadisli
ffdcdbc198 Removed dangling icons in Realtime plugin 2010-02-25 13:55:06 +00:00
Sarven Capadisli
a0f6977baa Fixes replyto JS after the upgrade from jQuery 1.4.2 2010-02-25 14:51:23 +01:00
Sarven Capadisli
b54480247a Updated jQuery JavaScript Library from v1.4.1 to v1.4.2 2010-02-25 14:50:40 +01:00
Evan Prodromou
e6858d7203 modify group actions so they use Local_group to look up by nickname 2010-02-25 08:44:15 -05:00