Commit Graph

14688 Commits

Author SHA1 Message Date
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
23bafaba26 add canonical rel 2012-01-26 11:02:29 -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
98acec74f5 rel=me for homepage in profile block 2012-01-20 10:34:59 -05:00
Evan Prodromou
e3f06ee220 Use X-Client header for IP for load-balancers 2012-01-10 10:51:36 -05:00
Evan Prodromou
71fa1d2462 slight improvement in location output 2012-01-03 11:03:18 -08:00
Evan Prodromou
8c9d967814 syntax error in position in activity streams json 2011-12-31 19:05:41 -08:00
Evan Prodromou
3d87176ece Better position formatting 2011-12-31 10:26:07 -08:00
Evan Prodromou
3117c38044 Revert "when silencing, blow scope for not-logged-in users"
This reverts commit 04f71a42d3.
2011-12-31 09:35:22 -08:00
Evan Prodromou
25f1e16952 Revert "don't show profile page of silenced users"
This reverts commit 7bb59ad2a1.
2011-12-31 09:34:59 -08:00
Evan Prodromou
70f9d41c4c Revert "Hide posts by silenced users"
This reverts commit d22fc7423c.
2011-12-31 09:34:42 -08:00
Evan Prodromou
04f71a42d3 when silencing, blow scope for not-logged-in users 2011-12-31 09:15:32 -08:00
Evan Prodromou
7bb59ad2a1 don't show profile page of silenced users 2011-12-31 09:09:07 -08:00
Evan Prodromou
d22fc7423c Hide posts by silenced users 2011-12-31 08:56:54 -08:00
Evan Prodromou
bff89bc864 catch up to spec 2011-12-31 02:31:26 -08:00
Evan Prodromou
6ca729803b activity streams json 'count' => 'totalItems' 2011-12-31 02:01:51 -08:00
Evan Prodromou
70aada690b add objectType, content to activity objects in JSON 2011-12-31 01:56:26 -08:00
Evan Prodromou
9092eb5535 throw exception on sphinx search error 2011-12-30 23:09:17 -08:00
Evan Prodromou
c9fbe2ead7 remove common_debug() from search.json, search.atom 2011-12-30 22:23:50 -08:00
Evan Prodromou
eb05bdfcaf remove debug message I'm sick of seeing 2011-12-30 22:16:22 -08:00
Siebrand Mazeland
31305cb743 Localisation updates from http://translatewiki.net. 2011-12-28 14:00:49 +01:00
Siebrand Mazeland
2624afbcd4 Crazy gettext way to support two plurals in one string. 2011-12-28 12:44:42 +01:00
Siebrand Mazeland
eb124c5a67 Add missing space between two sentences. 2011-12-28 12:35:03 +01:00
Evan Prodromou
24feeefcc3 remove unnecessary log() calls 2011-12-20 12:59:40 -05:00
Evan Prodromou
80ad09dd3b Initial version gets score at end of notice save 2011-12-20 12:24:22 -05: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
Evan Prodromou
0760c64264 log when including a file 2011-12-03 12:31:47 -05:00
Evan Prodromou
a818d5c61a use null for db/database config, check for it 2011-12-03 11:45:56 -05:00
Siebrand Mazeland
03657a90e1 Localisation updates from http://translatewiki.net. 2011-12-03 13:09:10 +01:00
Evan Prodromou
821904230d Merge branch 'master' of gitorious.org:statusnet/mainline 2011-12-02 15:48:43 -05:00
Michele macno Azzolari
ad2fd9abd4 Fix whitescreen on recoverpassword with unknown user 2011-12-02 15:48:29 -05:00
Michele macno Azzolari
d1fae16c70 Fix whitescreen on recoverpassword with unknown user 2011-12-02 15:47:35 -05:00
Evan Prodromou
5365ffc7d0 Merge branch 'master' of gitorious.org:statusnet/mainline into 1.1.x 2011-12-02 15:45:01 -05:00
Evan Prodromou
600a718a33 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-11-26 10:21:12 -05:00
Evan Prodromou
7af29bf0d2 nativecode shows up in userinfo 2011-11-26 10:20:32 -05:00
Evan Prodromou
8cdbef098b die when we get a bad connection error 2011-11-26 09:54:41 -05:00
Evan Prodromou
f519858044 Merge branch '1.0.x' into 1.1.x
Conflicts:
	lib/framework.php
2011-11-16 12:00:13 -05:00
Evan Prodromou
68676ad31d Merge branch '1.0.x' 2011-11-16 11:56:32 -05:00
Evan Prodromou
e2c65d72ae Merge branch 'master', remote-tracking branch 'origin' 2011-11-16 11:56:02 -05:00
Siebrand Mazeland
b4ecb24907 Localisation updates from http://translatewiki.net. 2011-11-12 23:35:01 +01:00
Evan Prodromou
cab76836cb isHTTP() -> isHTTPS() 2011-11-11 12:44:42 -05:00
Evan Prodromou
62fb12b369 use HTTPS for JSON if necessary 2011-11-11 12:35:00 -05:00
Evan Prodromou
0fe3afc495 smoothness is SSLed if using SSL 2011-11-11 12:22:33 -05:00