599f4fe121
Beginning stub of Yammer message->notice import
2010-09-28 07:44:20 -07:00
6d0ac28460
Split SN_YammerClient out to own class file
2010-09-28 07:44:20 -07:00
10379e8ddb
initial work on yammer importer code
2010-09-28 07:44:19 -07:00
a6469aeed8
Fix PHP syntax errors introduced during localization fixups in a few files.
2010-09-25 12:10:36 -07:00
0dc5080a5d
Merge remote branch 'gitorious/master'
2010-09-25 06:30:36 -04:00
dc63626641
Optionally restrict Disqus comments to specific users' notices
2010-09-24 18:29:02 -07:00
7721e64a42
Merge branch '0.9.x'
2010-09-24 18:20:45 -07:00
9cd7bffcc0
Merge remote branch 'gitorious/master'
2010-09-24 16:50:33 -04:00
210e486d80
remove unnecesssary fieldset from sitemap admin panel
2010-09-24 16:50:03 -04:00
c75bd62a4c
Update OAuth actions in show application page so it will display the right endpoint URLs
2010-09-23 16:19:21 -07:00
da04858902
Update OAuth actions in show application page so it will display the right endpoint URLs
2010-09-23 16:16:32 -07:00
62f7d6c74d
Fix strings in Disqus plugin for i18n
2010-09-23 15:46:01 -07:00
7e177b7ec6
Add Netbeans project metadata dir to .gitignore
2010-09-23 12:48:15 -07:00
2006ced30a
Merge branch '0.9.x'
2010-09-23 11:07:25 -04:00
a2bfcc9734
Provisional versions of two new themes (plus new base).
2010-09-23 10:50:45 -04:00
0f1fc36a05
Merge branch '0.9.x'
2010-09-23 09:50:46 -04:00
5f409a0d7c
Cloudy theme fixes: show notice form only on appropriate pages; IE fix for top padding.
2010-09-22 22:41:17 -04:00
84331ca7bd
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:33:06 +00:00
77609e0c4a
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:30:50 +00:00
870be512d2
Update POT files for plugins.
2010-09-23 00:37:16 +02:00
be14f409e4
initial script to restore a backed-up user
2010-09-22 12:08:39 -04:00
4d01f8fbb6
save a URI with the user
2010-09-22 12:08:17 -04:00
b5cfcba471
Merge branch '0.9.x' into activityexport
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
f0105893b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-22 10:35:27 -04:00
8d019c03ee
Do not allow blank passwords when authenticating against LDAP.
2010-09-21 18:05:18 -04:00
834c09d5a3
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-09-21 13:08:01 -07:00
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
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
1bc45e191d
Merge branch 'twitter-avatar'
2010-09-21 12:46:16 -07:00
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
28fdc733a7
change the location and title of the feeds section
2010-09-21 14:09:46 -04:00
78ed0348b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-21 14:07:48 -04:00
91a1862510
printfv and printfq functions in commandline.inc
2010-09-21 14:06:39 -04:00
556a2a8fd8
use Profile::getUri() to get a profile's URI
2010-09-21 06:21:47 -04:00
f7ec40fa42
make some static functions public for OStatus_profile
2010-09-21 06:13:19 -04:00
ab24007f4c
throw a catchable exception in getUser()
2010-09-21 06:12:43 -04:00
d342899677
Fix #2323 : typo on oauth connections page
2010-09-20 18:07:19 -07:00
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
85bf20d95a
Fix error when editing OAuth app registration and only changing the icon.
2010-09-20 16:57:07 -07:00
aef42e2f65
Don't spew a notice warning to output while processing logging for PEAR DB errors
2010-09-20 16:52:22 -07:00
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
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
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
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
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
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
10f6e14134
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-09-20 21:12:56 +02:00
bccbe8f519
* i18n/L10n update.
...
* superfluous whitespace removed.
2010-09-20 21:12:43 +02:00
a58877a2f8
* i18n/L10n update.
...
* added onPluginVersion().
* superfluous whitespace removed.
2010-09-20 21:12:07 +02:00
5cc08ccd07
Superfluous whitespace removed.
2010-09-20 21:11:05 +02:00
Brion Vibber
Evan Prodromou
Zach Copley
Samantha Doherty
Siebrand Mazeland
Craig Andrews