Commit Graph

14531 Commits

Author SHA1 Message Date
Evan Prodromou
ea0a1b6a03 Squashed commit of the following:
commit 6216ef2c9c1ab4bb038177f90b97127e4c2b6d00
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:14:07 2012 -0400

    filter the notices

commit 57fe6c012d380a8f2f8ec505f35e2094e58b4ac4
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:08:36 2012 -0400

    return value, end condition

commit cc985407f89f2d222f3164f8bc14b0764163e83f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:49 2012 -0400

    fix call to count()

commit 9efdfde70ea307b7409a4140647f343224cb595f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:05 2012 -0400

    fix class name in pivotGet

commit 311599ac117dda8b6cd5f522687322b89dcc909d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:03:28 2012 -0400

    inboxfix
2012-04-03 17:16:18 -04:00
Evan Prodromou
a51d2ece50 Merge remote-tracking branch 'origin/1.1.x' into 1.1.x 2012-04-03 13:37:42 -04:00
Evan Prodromou
4e3fb63855 Remove filtering notice stream debug comments 2012-04-02 21:29:57 -04:00
Evan Prodromou
97cc277040 Take out unnecessary HideNoticeStream 2012-03-25 14:21:11 -04:00
Evan Prodromou
0d487a1ea0 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:16:23 -04:00
Evan Prodromou
76e6bee6aa Make blocks work for non-subscription deliveries 2012-03-23 12:55:39 -04:00
Evan Prodromou
88f3e690c3 flush anonymous scope when a profile is silenced 2012-03-22 11:37:45 -04:00
Evan Prodromou
7e76d116d8 make sure we have an integer value for askFor 2012-03-21 22:53:02 -04:00
Evan Prodromou
8981a420c1 private group fix 2012-03-21 16:33:10 -04:00
Evan Prodromou
2d3c19c254 empty array wrappers 2012-03-21 16:28:40 -04:00
Evan Prodromou
e76b191c4b bad boolean logic for impossible stream 2012-03-21 16:26:33 -04:00
Evan Prodromou
51229ca662 store our own userprofile for checking impossibility 2012-03-21 16:23:52 -04:00
Evan Prodromou
38343f3877 Don't try to find groupnoticestream if impossible 2012-03-21 16:18:38 -04:00
Evan Prodromou
710eb8e86e Don't try to find profilenoticestream if impossible 2012-03-21 16:18:27 -04:00
Evan Prodromou
e21b0948ed Sanity check on profile streams 2012-03-21 14:22:45 -04:00
Evan Prodromou
4ea9a0a7e8 Prefill profile roles when checking scope 2012-03-21 13:51:17 -04:00
Evan Prodromou
b1555fe373 double-check profile 2012-03-21 13:05:02 -04:00
Evan Prodromou
b95de95463 Pass profile down to spam-hiding function 2012-03-21 13:02:33 -04:00
Evan Prodromou
d03ca746f2 Increment rounds 2012-03-21 12:23:59 -04:00
Evan Prodromou
9b0279c2d5 Don't fetch more than needed if exhausted 2012-03-21 12:21:36 -04:00
Evan Prodromou
0238aa9d19 Prefill done by notice stream 2012-03-21 12:10:54 -04:00
Evan Prodromou
dcbcd4731c adaptive filtering requests 2012-03-21 12:01:27 -04:00
Evan Prodromou
3fb3ddb3a6 Optionally hide spam from timelines
For sites with a lot of spam, this will hide that spam from timelines for everyone but moderators.
2012-03-21 10:17:11 -04:00
Evan Prodromou
4c4cd9ec77 New events for pre-filling a NoticeList
The NoticeList has some code to pre-fill some auxiliary data for
notices. These new events let plugins hook that event and do their own
pre-filling.
2012-03-21 09:26:35 -04:00
Evan Prodromou
e7a38f799b Use this for scope check 2012-03-20 21:13:12 -04:00
Evan Prodromou
3619f9faaa New events for overriding scope checks 2012-03-20 16:38:56 -04:00
Evan Prodromou
e7d187eb05 new event for notice option items 2012-03-08 06:58:45 -06:00
Evan Prodromou
eb6b4628b9 Merge from 1.0.x 2012-03-08 06:57:54 -06:00
Evan Prodromou
a4bf33d6b5 mismatched \n 2012-03-08 06:15:27 -06:00
Evan Prodromou
dd862de6fb mismatched \n in locale/es 2012-03-08 06:14:03 -06:00
Evan Prodromou
b4da5f3785 Merge branch 'master' into 1.0.x
Conflicts:
	plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
Evan Prodromou
12921d6b71 accessor for NoticeListItem's Notice 2012-03-07 16:06:50 -06:00
Evan Prodromou
6e01db2c92 accessor for Widget's HTMLOutputter 2012-03-07 16:06:33 -06:00
Evan Prodromou
376a19f3c1 Plugin::path() checks local/plugins/ first 2012-03-07 15:04:49 -06:00
Siebrand Mazeland
de7ad991f9 Consistency update. 2012-03-05 00:38:39 +01: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
14feccdf7c Merge branch 'master' of gitorious.org:statusnet/mainline 2012-02-20 10:59:14 -05:00
Evan Prodromou
183ffce78f check reply_to flag before sending replies to Facebook 2012-02-20 10:58:56 -05:00
Evan Prodromou
710febfba1 Merge branch 'master' of gitorious.org:statusnet/mainline 2012-02-07 16:27:40 +01:00
Evan Prodromou
4a95a0bb60 scripts to join and leave groups 2012-02-07 16:26:51 +01: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
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