Commit Graph

3552 Commits

Author SHA1 Message Date
Evan Prodromou
c5ae53166c Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2012-05-04 11:39:55 -04:00
Siebrand Mazeland
eafe507068 Localisation updates from http://translatewiki.net. 2012-05-03 22:13:22 +00:00
Siebrand Mazeland
c7013ceb1a Localisation updates from http://translatewiki.net. 2012-04-29 23:12:10 +00:00
Evan Prodromou
ab053fe2ca Don't always make spam_score writeable 2012-04-26 11:59:54 -04:00
Evan Prodromou
ffc2c72bc1 fix a problem with the facebookbridge translation in eu 2012-04-23 21:05:03 -04:00
Siebrand Mazeland
3898500ff9 Localisation updates from http://translatewiki.net. 2012-04-21 10:21:38 +00:00
Evan Prodromou
558e33436c change script path for new position in plugins/ActivitySpam 2012-04-17 11:57:45 -04:00
Evan Prodromou
7a9777df05 Merge ActivitySpam plugin 2012-04-17 09:02:48 -04:00
Evan Prodromou
20dc5addb7 Fix FacebookBridge es translation 2012-04-16 16:04:31 -04:00
Evan Prodromou
36d724cf03 Merge branch '1.0.x' 2012-04-16 15:49:09 -04:00
Siebrand Mazeland
b2c5b9de52 Localisation updates from http://translatewiki.net. 2012-04-15 12:11:05 +00:00
Siebrand Mazeland
71a9644b35 Localisation updates from http://translatewiki.net. 2012-04-09 01:38:31 +02:00
Evan Prodromou
b2639b723f add created timestamp 2012-04-02 22:32:47 -04:00
Evan Prodromou
e06bb8ead5 correctly update sites 2012-04-02 22:08:14 -04:00
Evan Prodromou
04ad0838be Add spam-training, spam-reviewing rights
Replaced the check for a moderator role in certain spam-training and
-reviewing points. Make sure modhelpers can check, too.
2012-03-25 13:18:16 -04:00
Siebrand Mazeland
c0b5c16ded Localisation updates from http://translatewiki.net. 2012-03-11 22:12:34 +01:00
Siebrand Mazeland
3b3671b228 Localisation updates from http://translatewiki.net. 2012-03-11 22:12:10 +01:00
Siebrand Mazeland
855fbfa782 Fix accidental revert by Evan in b4da5f3785. 2012-03-11 21:46:29 +01:00
Evan Prodromou
b4da5f3785 Merge branch 'master' into 1.0.x
Conflicts:
	plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
Siebrand Mazeland
f34a196e83 Localisation updates from http://translatewiki.net. 2012-03-01 17:22:45 +01:00
Siebrand Mazeland
be71f1e4e7 Fix grammar. 2012-02-27 15:56:35 +01:00
Evan Prodromou
aa14a14f86 using wrong rules for facebook replies 2012-02-20 11:29:49 -05:00
Evan Prodromou
183ffce78f check reply_to flag before sending replies to Facebook 2012-02-20 10:58:56 -05:00
Evan Prodromou
5b6ecef24b script to gc all feeds 2012-01-27 16:12:54 -05:00
Evan Prodromou
e4085087f1 non-existent poco 2012-01-27 15:32:13 -05:00
Evan Prodromou
d28f726c5c weird error with SubMirror 2012-01-27 15:27:46 -05:00
Evan Prodromou
d625364354 LOG_ERROR -> LOG_ERR for SubMirror 2012-01-27 15:01:51 -05:00
Evan Prodromou
108d5d8d17 Merge branch 'master' of gitorious.org:statusnet/mainline 2012-01-26 11:04:54 -05:00
Evan Prodromou
f21f09f8b8 Merge commit 'refs/merge-requests/2227' of git://gitorious.org/statusnet/mainline into merge-requests/2227 2012-01-26 11:03:04 -05:00
Evan Prodromou
259a262df4 Merge branch 'master' of gitorious.org:statusnet/mainline 2012-01-21 21:12:53 -05:00
Evan Prodromou
b475c871a4 add displayName and targetUrl to activity JSON 2012-01-21 21:12:20 -05:00
Siebrand Mazeland
cebb565f18 Localisation updates from http://translatewiki.net. 2012-01-20 20:07:45 +01:00
Evan Prodromou
e3f06ee220 Use X-Client header for IP for load-balancers 2012-01-10 10:51:36 -05:00
Evan Prodromou
9092eb5535 throw exception on sphinx search error 2011-12-30 23:09:17 -08:00
Siebrand Mazeland
31305cb743 Localisation updates from http://translatewiki.net. 2011-12-28 14:00:49 +01:00
Siebrand Mazeland
7f257ddb95 Localisation updates from http://translatewiki.net. 2011-12-19 02:02:49 +01:00
Jean Baptiste Favre
184290b5cf Add my name to TwitterBridgePlugin onPluginVersion function 2011-12-18 12:17:28 +01:00
Jean Baptiste Favre
3e0a02f52d Enhance is_twitter_bound function from file plugins/TwitterBridge/twitter.php to deal with new-style replies from Web UI not using at-mention replies anymore, which caused all replies to be sent to Twitter. Definitely fix #3386 2011-12-18 12:13:42 +01:00
Jean Baptiste Favre
ac5e29de5a Fix precedence issue causing all replies to be sent to Twitter. Fix #3386 2011-12-13 20:30:03 +01:00
Siebrand Mazeland
03657a90e1 Localisation updates from http://translatewiki.net. 2011-12-03 13:09:10 +01:00
Siebrand Mazeland
b4ecb24907 Localisation updates from http://translatewiki.net. 2011-11-12 23:35:01 +01:00
Evan Prodromou
b5e1cf13e6 Merge branch '1.0.x' 2011-11-07 12:36:52 -05:00
Siebrand Mazeland
151ff6beb7 Localisation updates from http://translatewiki.net. 2011-10-29 14:30:42 +02:00
Evan Prodromou
a4ec8bb047 More free email domains 2011-10-25 10:00:19 -04:00
Evan Prodromou
ec20544baf More free or consumer email domains 2011-10-25 09:42:02 -04:00
Evan Prodromou
053e99733f add rel=nofollow to bookmark links if needed 2011-10-20 11:47:44 -04:00
Evan Prodromou
e64ae1f03d Don't start <p> element until we've checked for attachments 2011-10-20 10:57:58 -04:00
Evan Prodromou
d27b7627a5 more robust handling of bad data in offline backup queue handler 2011-10-12 17:03:56 -04:00
Siebrand Mazeland
6120af3901 Localisation updates from http://translatewiki.net. 2011-10-10 15:58:00 +02:00
Evan Prodromou
70827f3379 write all activity files to the feed file 2011-10-07 14:37:09 -04:00
Evan Prodromou
7075214589 dump out activities to directory 2011-10-07 13:56:47 -04:00
Evan Prodromou
7f4b23b8ed Use string output 2011-10-07 10:30:22 -04:00
Evan Prodromou
0d35673d5a add version for OfflineBackup 2011-10-07 10:01:44 -04:00
Evan Prodromou
737e23544a send backup files 2011-10-07 09:36:52 -04:00
Evan Prodromou
d92acda02a start doing some writing 2011-10-06 17:31:50 -04:00
Evan Prodromou
d37bc805c6 first pass, some files ready 2011-10-05 12:05:05 -04:00
Zach Copley
7dcb27672f Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-09-30 19:52:16 +00:00
Zach Copley
c137d69aee Switch from oohembed to noembed for default oembed provider 2011-09-30 19:51:23 +00:00
Evan Prodromou
1094e7c2c6 Update openid docs 2011-09-30 14:52:51 -04:00
Evan Prodromou
4af466f1a6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-09-30 14:25:06 -04:00
Evan Prodromou
82badb19c7 Move docs menu to site primary menu 2011-09-30 14:24:27 -04:00
Zach Copley
e7ef9e2117 Remove gettext wrapper from log msg 2011-09-30 18:20:22 +00:00
Zach Copley
1d2a3be88e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-09-30 18:15:38 +00:00
Zach Copley
fd62f6b934 Don't throw exception if bookmark has no attachments; log error and render as normal notice instead. 2011-09-30 18:13:25 +00:00
Evan Prodromou
e3c010a870 try to check whether file exists over and over and over 2011-09-30 13:03:42 -04:00
Evan Prodromou
4e5af7513c 50px more for bookmarklet popup 2011-09-30 10:15:40 -04:00
Evan Prodromou
2e8d92dbe9 use the 'top' action for bookmarklet popup 2011-09-30 10:10:15 -04:00
Evan Prodromou
3aad58c37f Only show some profiles in events 2011-09-30 09:40:15 -04:00
Zach Copley
d438a55434 Fix navigation for SubMirrorPlugin 2011-09-29 20:11:51 +00:00
Samantha Doherty
d51a93ddb9 Quick style for event attendee avatar lists. 2011-09-29 16:00:10 -04:00
Evan Prodromou
699a90f11c Show Event attendees in mini-list 2011-09-29 15:12:30 -04:00
Evan Prodromou
797e187acb Merge commit 'refs/merge-requests/174' of git://gitorious.org/statusnet/mainline into merge-requests/174 2011-09-28 16:14:42 -04:00
Scott Sweeny
94b524d6dc plugins/MobileProfile/MobileProfilePlugin.php: add 'maemo' to recognized devices 2011-09-27 23:54:42 -04:00
Zach Copley
8ca9f33f45 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-09-27 16:59:43 +00:00
Zach Copley
cd30c94096 Move check for valid access token to the right place 2011-09-27 16:59:10 +00:00
Evan Prodromou
23e02ea76a Merge branch '1.0.x' into testing 2011-09-27 11:45:24 -04:00
Evan Prodromou
9f954eddc5 remove unsupported hcard action 2011-09-27 11:43:41 -04:00
Zach Copley
ec53e68cf2 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-09-27 04:33:00 +00:00
Zach Copley
000e5c0c01 Do a better job of saving the original avatar from Facebook 2011-09-27 04:31:41 +00:00
Zach Copley
3b28f226c7 Facebook bridge back in business with new JS-SDK and OAuth 2.0 flow.
Might be better to rewrite the login mechanism to use server side flow
now that Facebook provides it.
2011-09-27 04:09:47 +00:00
Evan Prodromou
eb711321c3 Merge branch '1.0.x' into testing 2011-09-26 14:10:43 -04:00
Samantha Doherty
b0ee583270 Tiny layout fix for QnA. 2011-09-26 08:26:38 -04:00
Zach Copley
634fb64c11 Facebook bridge mostly working again with new OAuth 2.0 flow 2011-09-26 05:32:19 +00:00
Siebrand Mazeland
e7dac240ef Localisation updates from http://translatewiki.net. 2011-09-26 00:01:00 +02:00
Zach Copley
118e84be19 Update to latest Facebook PHP sdk 2011-09-22 15:47:55 -07:00
Evan Prodromou
59043dca7f Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
Conflicts:
	classes/Avatar.php

I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -04:00
Evan Prodromou
1014e295ee bad sprintf format for new follow activity notices 2011-09-21 10:18:16 -04:00
Evan Prodromou
838c3988ee Change defaults for ActivityPlugin to only log joins and follows 2011-09-21 10:15:34 -04:00
Zach Copley
58b9f83a02 Allow repeats to flow through the Twitter bridge 2011-09-21 05:23:47 +00:00
Zach Copley
c9cbc31481 Don't send notices from the ActivityPlugin to Twitter 2011-09-21 02:31:51 +00:00
Evan Prodromou
ac1ea3e8cf Remove template plugin
I don't think this still works; it's probably a bad idea to leave it in 1.0.x.
2011-09-20 11:06:18 -04:00
Evan Prodromou
0ee660af23 fix problem with using wrong arg to EndLeaveGroup event 2011-09-18 19:28:17 -04:00
Evan Prodromou
822cb1482a right URLs for search subs 2011-09-18 19:20:28 -04:00
Evan Prodromou
e2914189f3 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-09-18 17:33:38 -04:00
Evan Prodromou
bba39c4aaf reorder routes for ostatus for better matches 2011-09-18 17:32:59 -04:00
Evan Prodromou
52ed4678f3 correct link for searchsubs 2011-09-18 17:32:13 -04:00
Zach Copley
116840a80e Reorder directory router connections / fix regex 2011-09-18 13:35:09 -07:00
Evan Prodromou
dbb7324b25 test for missing profile in ostatus queue handler 2011-09-18 14:36:49 -04:00
Evan Prodromou
2f1953ca25 Correct args for join event 2011-09-18 14:06:35 -04:00
Evan Prodromou
75bdc37b61 Correct args for join event 2011-09-18 14:06:27 -04:00