Evan Prodromou
|
e603bcd56b
|
Merge branch 'master' into 1.1.x
|
2012-04-16 15:44:12 -04:00 |
|
Evan Prodromou
|
7d07149f60
|
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
|
2012-04-16 15:44:03 -04:00 |
|
Evan Prodromou
|
347ba8c4a3
|
Merge branch 'master' of gitorious.org:statusnet/mainline
|
2012-04-16 15:43:28 -04:00 |
|
Evan Prodromou
|
8f7f06e35a
|
fix bug with sender_id and recipient_id in direct_messages
|
2012-04-13 11:28:43 -04:00 |
|
Evan Prodromou
|
35521d4a5b
|
fix bug with sender_id and recipient_id in direct_messages
|
2012-04-13 11:28:18 -04:00 |
|
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
|
1fdb539b48
|
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:15:58 -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
|
b2639b723f
|
add created timestamp
|
2012-04-02 22:32:47 -04:00 |
|
Evan Prodromou
|
562ac50e7c
|
add created timestamp
|
2012-04-02 22:32:30 -04:00 |
|
Evan Prodromou
|
43f46c1aa2
|
correctly update sites
|
2012-04-02 22:08:28 -04:00 |
|
Evan Prodromou
|
e06bb8ead5
|
correctly update sites
|
2012-04-02 22:08:14 -04:00 |
|
Evan Prodromou
|
086b474069
|
%s for a string
|
2012-04-02 21:42:04 -04:00 |
|
Evan Prodromou
|
0774ef456d
|
Remove filtering notice stream debug comments
|
2012-04-02 21:31:24 -04:00 |
|
Evan Prodromou
|
4e3fb63855
|
Remove filtering notice stream debug comments
|
2012-04-02 21:29:57 -04:00 |
|
Evan Prodromou
|
391676863a
|
Take out unnecessary HideNoticeStream
|
2012-03-25 14:21:22 -04:00 |
|
Evan Prodromou
|
97cc277040
|
Take out unnecessary HideNoticeStream
|
2012-03-25 14:21:11 -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 |
|
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
|
3e46a9b164
|
Make blocks work for non-subscription deliveries
|
2012-03-23 12:55:51 -04:00 |
|
Evan Prodromou
|
76e6bee6aa
|
Make blocks work for non-subscription deliveries
|
2012-03-23 12:55:39 -04:00 |
|
Evan Prodromou
|
3b09465fc4
|
flush anonymous scope when a profile is silenced
|
2012-03-22 11:37:59 -04:00 |
|
Evan Prodromou
|
88f3e690c3
|
flush anonymous scope when a profile is silenced
|
2012-03-22 11:37:45 -04:00 |
|
Evan Prodromou
|
d4bb8fa77a
|
make sure we have an integer value for askFor
|
2012-03-21 22:53:14 -04:00 |
|
Evan Prodromou
|
7e76d116d8
|
make sure we have an integer value for askFor
|
2012-03-21 22:53:02 -04:00 |
|
Evan Prodromou
|
d98a4be24e
|
Merge branch '1.0.x'
|
2012-03-21 16:40:51 -04:00 |
|
Evan Prodromou
|
1c625bd040
|
show correct conversation notice count
|
2012-03-21 16:40:42 -04:00 |
|
Evan Prodromou
|
6e04133427
|
private group fix
|
2012-03-21 16:33:23 -04:00 |
|
Evan Prodromou
|
8981a420c1
|
private group fix
|
2012-03-21 16:33:10 -04:00 |
|
Evan Prodromou
|
09b80a6e90
|
empty array wrappers
|
2012-03-21 16:28:53 -04:00 |
|
Evan Prodromou
|
2d3c19c254
|
empty array wrappers
|
2012-03-21 16:28:40 -04:00 |
|
Evan Prodromou
|
0f0ddbe0c3
|
bad boolean logic for impossible stream
|
2012-03-21 16:26:43 -04:00 |
|
Evan Prodromou
|
e76b191c4b
|
bad boolean logic for impossible stream
|
2012-03-21 16:26:33 -04:00 |
|
Evan Prodromou
|
473f6ffac9
|
store our own userprofile for checking impossibility
|
2012-03-21 16:24:04 -04:00 |
|
Evan Prodromou
|
51229ca662
|
store our own userprofile for checking impossibility
|
2012-03-21 16:23:52 -04:00 |
|
Evan Prodromou
|
6215ff8e07
|
Don't try to find groupnoticestream if impossible
|
2012-03-21 16:18:56 -04:00 |
|
Evan Prodromou
|
f807bd1b30
|
Don't try to find profilenoticestream if impossible
|
2012-03-21 16:18:48 -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
|
07f70b43b5
|
Sanity check on profile streams
|
2012-03-21 14:22:56 -04:00 |
|
Evan Prodromou
|
e21b0948ed
|
Sanity check on profile streams
|
2012-03-21 14:22:45 -04:00 |
|
Evan Prodromou
|
cbd13407d8
|
Prefill profile roles when checking scope
|
2012-03-21 13:51:28 -04:00 |
|
Evan Prodromou
|
4ea9a0a7e8
|
Prefill profile roles when checking scope
|
2012-03-21 13:51:17 -04:00 |
|
Evan Prodromou
|
8706d8d351
|
double-check profile
|
2012-03-21 13:05:15 -04:00 |
|
Evan Prodromou
|
b1555fe373
|
double-check profile
|
2012-03-21 13:05:02 -04:00 |
|
Evan Prodromou
|
ad1649e4ba
|
Pass profile down to spam-hiding function
|
2012-03-21 13:02:45 -04:00 |
|
Evan Prodromou
|
b95de95463
|
Pass profile down to spam-hiding function
|
2012-03-21 13:02:33 -04:00 |
|
Evan Prodromou
|
3cc69c678a
|
Increment rounds
|
2012-03-21 12:24:12 -04:00 |
|
Evan Prodromou
|
d03ca746f2
|
Increment rounds
|
2012-03-21 12:23:59 -04:00 |
|
Evan Prodromou
|
0d8dd9078c
|
Don't fetch more than needed if exhausted
|
2012-03-21 12:21:48 -04:00 |
|