Evan Prodromou
fc576562a3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 12:40:59 -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
Brion Vibber
b331e971b0
Merge branch 'master' into testing
2010-02-26 09:35:08 -08:00
Evan Prodromou
c188ae15d9
Blacklist user nickname and password on delete
2010-02-26 12:29:28 -05:00
Evan Prodromou
ea044722e0
'on' is what checkboxes use for boolean true
2010-02-26 12:28:58 -05:00
Evan Prodromou
200a32b922
don't choke on dupelimit in createsim.php
2010-02-26 12:19:33 -05:00
Evan Prodromou
d9d1a77bb0
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 11:40:12 -05:00
Michele
6ae39da198
Fixed object name
2010-02-26 11:35:55 +01: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
6cc26a613b
Remove unnecessary requires
2010-02-25 22:08:25 -08:00
Zach Copley
eabae96fb4
Get ApiAction autoloading properly
2010-02-25 22:08:17 -08:00
Zach Copley
e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
Zach Copley
3daf17d935
Get ApiAction autoloading properly
2010-02-25 22:02:40 -08:00
Brion Vibber
3aee8e0448
Fix a few keys that got dropped from statusnet.ini by mistake
2010-02-25 21:46:53 -08:00
Brion Vibber
b573c5e260
Fix for group timeline feeds by name
2010-02-25 21:27:59 -08:00
Brion Vibber
08c17bfcaa
try/catch on omb profile pings
2010-02-25 21:06:53 -08:00
Brion Vibber
da4b21d3a9
try/catch on omb profile pings
2010-02-25 21:06:16 -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
Evan Prodromou
417f5d653f
update to beta6
2010-02-25 23:27:20 -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
Evan Prodromou
00aba4a907
add beta5 to beta6 script
2010-02-25 22:30:04 -05:00
Zach Copley
8274bbedcf
Fix test to account for new way avatars are stored in ActivityObject
2010-02-25 19:17:50 -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
Evan Prodromou
254e210763
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 21:53:50 -05:00
Evan Prodromou
f9e5acbfa7
remove linkback from default plugins
2010-02-25 21:53:18 -05: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
195e0466ec
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 21:21:03 -05:00
Zach Copley
c49fbb63c5
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
init_conversation.php script to copy old notice conversations into the conversation table
cache results of webfinger lookups
Parse an hcard for hints, if available
use new hcard method for webfinger
add hkit for hCard parsing
use new dedicated hcard method for Webfinger profile
Add an hcard action
2010-02-25 18:13:34 -08:00
Zach Copley
792f0942f7
Fix atom feed IDs in user and group atom feeds
2010-02-25 18:13:06 -08:00
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
