Evan Prodromou
f0105893b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-22 10:35:27 -04:00
Brion Vibber
acd7613933
Fixes for Yammer groups import: pulling explicit list, fixed avatar fetch
2010-09-21 23:19:36 -07:00
Brion Vibber
7a381f2533
Support non-image file uploads in Yammer import
2010-09-21 22:00:25 -07:00
Brion Vibber
0ed506ee93
Add group link on Yammer import (won't work until memberships are fixed)
2010-09-21 18:21:36 -07:00
Brion Vibber
da87d4334a
Fetch more user data in Yammer imports, including the primary email address (preconfirmed, so we can do stuff like tell people to reset their passwords and log in!) and some bio info.
2010-09-21 18:15:32 -07:00
Brion Vibber
9652e77376
Yammer import: mark group posts with the proper group inbox (should we append a !foo or leave them as is, as current?)
2010-09-21 17:35:32 -07:00
Brion Vibber
db5a4ce70d
Pull group descriptions in Yammer import
2010-09-21 17:25:02 -07:00
Brion Vibber
ed3d9a11bf
Image file attachment support for Yammer import
2010-09-21 17:08:40 -07:00
Brion Vibber
47cf29b2a2
Copy favorites in Yammer importer
2010-09-21 16:27:26 -07:00
Brion Vibber
9be9d2f720
Full dump of input data in yamdump also for my reference...
2010-09-21 16:27:10 -07:00
Brion Vibber
0ff28ac8e0
Fix for replies in Yammer import
2010-09-21 16:19:02 -07:00
Brion Vibber
8091c4d291
Avatars for Yammer import
2010-09-21 16:10:44 -07:00
Brion Vibber
3e2cf3876d
Initial semi-working yammer import :D
...
* no avatars
* no details of user accounts or their auth info
* no group memberships or subscriptions
* no attachments
* will probably esplode if >20 messages in your network *whistle innocently*
2010-09-21 15:54:39 -07:00
Brion Vibber
5b9efbb501
fix notices in SN_YammerClient
2010-09-21 15:29:04 -07:00
Brion Vibber
9b1b9b711b
Poking around at import funcs...
2010-09-21 15:24:14 -07:00
Craig Andrews
8d019c03ee
Do not allow blank passwords when authenticating against LDAP.
2010-09-21 18:05:18 -04:00
Brion Vibber
05af14e1ca
YammerImport: initial processing code for users, groups, and messages
2010-09-21 14:56:20 -07:00
Brion Vibber
14a3697a61
Beginning stub of Yammer message->notice import
2010-09-21 13:56:30 -07:00
Brion Vibber
025184ce75
Split SN_YammerClient out to own class file
2010-09-21 13:29:44 -07:00
Brion Vibber
324fada5ea
initial work on yammer importer code
2010-09-21 13:13:37 -07:00
Zach Copley
834c09d5a3
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-09-21 13:08:01 -07:00
Zach Copley
da4463cb76
License admin panel should allow empty or valid URLs for (license
...
URL and license image URL) when selecting private or allrightsreserved
licenses.
2010-09-21 13:06:23 -07:00
Brion Vibber
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
Brion Vibber
1bc45e191d
Merge branch 'twitter-avatar'
2010-09-21 12:46:16 -07:00
Brion Vibber
94de78fa0f
Workaround for #2485 : in profile output on feeds, fall back to the Twitter 73x73 avatar instead of going straight to the 96x96 default image on twitter-import profiles.
2010-09-21 12:38:04 -07:00
Evan Prodromou
28fdc733a7
change the location and title of the feeds section
2010-09-21 14:09:46 -04:00
Evan Prodromou
78ed0348b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-21 14:07:48 -04:00
Evan Prodromou
91a1862510
printfv and printfq functions in commandline.inc
2010-09-21 14:06:39 -04:00
Evan Prodromou
556a2a8fd8
use Profile::getUri() to get a profile's URI
2010-09-21 06:21:47 -04:00
Evan Prodromou
f7ec40fa42
make some static functions public for OStatus_profile
2010-09-21 06:13:19 -04:00
Evan Prodromou
ab24007f4c
throw a catchable exception in getUser()
2010-09-21 06:12:43 -04:00
Brion Vibber
d342899677
Fix #2323 : typo on oauth connections page
2010-09-20 18:07:19 -07:00
Brion Vibber
28b06864fb
Fix for #2227 : 'view profile designs' and other default-on options are initially mis-set to off due to caching at account creation
2010-09-20 17:37:21 -07:00
Brion Vibber
85bf20d95a
Fix error when editing OAuth app registration and only changing the icon.
2010-09-20 16:57:07 -07:00
Brion Vibber
aef42e2f65
Don't spew a notice warning to output while processing logging for PEAR DB errors
2010-09-20 16:52:22 -07:00
Brion Vibber
a47e664094
Fix for #2419 : There is no function maxDescription in Oauth_application class (broke the 'description too long' error message when editing oauth app registrations)
2010-09-20 16:43:00 -07:00
Brion Vibber
24bb6feba7
Clean up notice spew from accessing member variables of null when opening the add/edit oauth application form
2010-09-20 16:39:51 -07:00
Brion Vibber
f9e04993dd
Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow.
2010-09-20 16:26:50 -07:00
Brion Vibber
521daf5562
Ticket #2327 : fixing block to remove the blocking user's subscription to the blockee if present; also cleaning up inbox delivery to apply the block checks more consistently, instead of just to group posts.
2010-09-20 16:00:25 -07:00
Brion Vibber
64cdbe6c55
Ticket #2750 : fixes to HTTP caching behavior across login/logout boundaries
...
* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout
For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)
There'll still be some last-modified stamps that aren't including user info properly, probably.
2010-09-20 13:42:58 -07:00
Brion Vibber
2f38c9c99c
Fix bug in db queue manager: when receiving an invalid or deleted notice, we were running it through the 'temporary fail, release it to try again' path instead of the 'done, discard item' path. Should fix some infinite-loop-of-doom-in-queue cases.
2010-09-20 13:19:58 -07:00
Siebrand Mazeland
10f6e14134
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-09-20 21:12:56 +02:00
Siebrand Mazeland
bccbe8f519
* i18n/L10n update.
...
* superfluous whitespace removed.
2010-09-20 21:12:43 +02:00
Siebrand Mazeland
a58877a2f8
* i18n/L10n update.
...
* added onPluginVersion().
* superfluous whitespace removed.
2010-09-20 21:12:07 +02:00
Siebrand Mazeland
5cc08ccd07
Superfluous whitespace removed.
2010-09-20 21:11:05 +02:00
Brion Vibber
a3de417ca5
DirectionDetector plugin: tabs to spaces
2010-09-20 12:02:04 -07:00
Brion Vibber
d055b63187
DirectionDetector plugin: cleanup on reference usage & code comments.
...
Changed getClearText() to return its value instead of changing the input to keep things clearer to maintainers.
2010-09-20 12:00:39 -07:00
Siebrand Mazeland
500f8e5a87
* i18n/L10n updates.
...
* remove superfluous whitespace.
2010-09-20 20:54:30 +02:00
Brion Vibber
2475e25e78
Update DirectionDetector plugin to 0.2.0 from everplays
2010-09-20 11:49:39 -07:00
Siebrand Mazeland
e0952bf56b
Superfluous whitespace removed.
2010-09-20 20:40:55 +02:00