Commit Graph

3484 Commits

Author SHA1 Message Date
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