Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9fd2c3e1c9 
					 
					
						
						
							
							Store direct messages as an activity  
						
						
						
						
					 
					
						2013-06-08 17:45:49 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						14a111189d 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						
						
						
					 
					
						2013-06-08 14:57:20 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2252a9ffaf 
					 
					
						
						
							
							Throw exception if subscription is invalid  
						
						
						
						
					 
					
						2013-06-08 14:56:57 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						08eca420ca 
					 
					
						
						
							
							Add generator to JSON output  
						
						
						
						
					 
					
						2013-06-07 11:35:06 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fe2c0a9687 
					 
					
						
						
							
							Add generator to JSON output  
						
						
						
						
					 
					
						2013-06-07 11:34:54 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						25823f6e5b 
					 
					
						
						
							
							Some better context for notices as arrays  
						
						
						
						
					 
					
						2013-06-07 03:11:33 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6164940e8c 
					 
					
						
						
							
							Some better context for notices as arrays  
						
						
						
						
					 
					
						2013-06-07 03:11:23 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7229533b0f 
					 
					
						
						
							
							Use real attachments for JSON output  
						
						
						
						
					 
					
						2013-06-05 09:39:43 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						772383e84b 
					 
					
						
						
							
							Use real attachments for JSON output  
						
						
						
						
					 
					
						2013-06-05 09:39:13 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						15d466ebe6 
					 
					
						
						
							
							Don't add content as title for notes  
						
						
						
						
					 
					
						2013-06-04 19:53:07 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						736bc9cc96 
					 
					
						
						
							
							Don't add content as title for notes  
						
						
						
						
					 
					
						2013-06-04 19:52:38 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b493f3839c 
					 
					
						
						
							
							Use better type, title for service  
						
						
						
						
					 
					
						2013-06-04 16:31:17 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						08c72a00e8 
					 
					
						
						
							
							Use better type, title for service  
						
						
						
						
					 
					
						2013-06-04 16:30:40 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						04f6e4ce7b 
					 
					
						
						
							
							Better registrationActivity  
						
						
						
						
					 
					
						2013-06-04 15:21:33 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d81b257290 
					 
					
						
						
							
							Better registrationActivity  
						
						
						
						
					 
					
						2013-06-04 15:20:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fa1a1851db 
					 
					
						
						
							
							Add an ID to registered service  
						
						
						
						
					 
					
						2013-06-03 09:11:29 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9f94ed81ee 
					 
					
						
						
							
							Add an ID to registered service  
						
						
						
						
					 
					
						2013-06-03 08:55:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7ad5ed1db9 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline  
						
						
						
						
					 
					
						2013-06-02 15:24:57 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						49d265faa0 
					 
					
						
						
							
							Add a registration activity to the end of every backup  
						
						
						
						
					 
					
						2013-06-02 14:41:41 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						cbb5586ab7 
					 
					
						
						
							
							Add a registration activity to the end of every backup  
						
						
						
						
					 
					
						2013-06-02 14:38:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ea8151688e 
					 
					
						
						
							
							Throw an exception converting fave to activity for non-existent notice or profile  
						
						
						
						
					 
					
						2013-05-24 09:27:21 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b359854150 
					 
					
						
						
							
							Throw an exception converting fave to activity for non-existent notice or profile  
						
						
						
						
					 
					
						2013-05-24 09:26:58 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c5ef1e661e 
					 
					
						
						
							
							By default Notice::asActivity has a null argument  
						
						
						
						
					 
					
						2013-04-14 12:02:52 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6f424eb80f 
					 
					
						
						
							
							If there's an exception in notice distribution, continue  
						
						
						
						
					 
					
						2012-11-25 10:39:49 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1c3c269ab4 
					 
					
						
						
							
							cache key for member_ids  
						
						
						
						
					 
					
						2012-07-04 14:39:26 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						69fb79caae 
					 
					
						
						
							
							Cache IDs rather than profile objects  
						
						
						
						
					 
					
						2012-07-04 14:38:06 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						642b1044cc 
					 
					
						
						
							
							Better user group member queries  
						
						
						
						
					 
					
						2012-07-04 14:12:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						acf52a3041 
					 
					
						
						
							
							Hide stuff if there's an exception getting the profile  
						
						
						
						
					 
					
						2012-05-04 23:37:12 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5f2b62927c 
					 
					
						
						
							
							let author see own spam  
						
						
						
						
					 
					
						2012-04-23 21:25:53 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4746016dd5 
					 
					
						
						
							
							Don't convert deleted notices into repeats in Notice::asActivity()  
						
						
						
						
					 
					
						2012-04-23 19:15:12 -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 
							
						 
					 
					
						
						
							
						
						3e46a9b164 
					 
					
						
						
							
							Make blocks work for non-subscription deliveries  
						
						
						
						
					 
					
						2012-03-23 12:55:51 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3b09465fc4 
					 
					
						
						
							
							flush anonymous scope when a profile is silenced  
						
						
						
						
					 
					
						2012-03-22 11:37:59 -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 
							
						 
					 
					
						
						
							
						
						8706d8d351 
					 
					
						
						
							
							double-check profile  
						
						
						
						
					 
					
						2012-03-21 13:05:15 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ad1649e4ba 
					 
					
						
						
							
							Pass profile down to spam-hiding function  
						
						
						
						
					 
					
						2012-03-21 13:02:45 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d942072a6c 
					 
					
						
						
							
							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:26:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d2d75823a4 
					 
					
						
						
							
							Use this for scope check  
						
						
						
						
					 
					
						2012-03-20 21:13:35 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b65db93d29 
					 
					
						
						
							
							New events for overriding scope checks  
						
						
						
						
					 
					
						2012-03-20 16:39:43 -04: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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						d22fc7423c 
					 
					
						
						
							
							Hide posts by silenced users  
						
						
						
						
					 
					
						2011-12-31 08:56:54 -08: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 
						 
				 
			
				
					
						
							
							
								Michele macno Azzolari 
							
						 
					 
					
						
						
							
						
						ad2fd9abd4 
					 
					
						
						
							
							Fix whitescreen on recoverpassword with unknown user  
						
						
						
						
					 
					
						2011-12-02 15:48:29 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						499e7d7c41 
					 
					
						
						
							
							Squashed commit of the following:  
						
						... 
						
						
						
						commit 74c5e4cce42ae601c07b447e100f097c15ebf9d2
Author: Evan Prodromou <evan@status.net >
Date:   Thu Oct 20 12:48:52 2011 -0400
    Add back in some optimization indices lost in schema conversion
commit ef5c2acfcd123b25910a1c8bb4ae01a3f9608e5e
Author: Evan Prodromou <evan@status.net >
Date:   Thu Oct 20 12:29:57 2011 -0400
    restore some of the lost optimized indices on notice table 
						
						
					 
					
						2011-10-20 12:50:39 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						22fead1b46 
					 
					
						
						
							
							Squashed commit of the following:  
						
						... 
						
						
						
						commit fb1dfa9e98ded23fb5bdebae6465424a8cb8acd6
Author: Evan Prodromou <evan@status.net >
Date:   Thu Oct 20 10:40:07 2011 -0400
    Use popular notice stream for favorited page
commit e1d409ff738e39061ad35589d546ce9bed456975
Author: Evan Prodromou <evan@status.net >
Date:   Thu Oct 20 10:32:23 2011 -0400
    Use a caching stream for popular notice section
    Instead of a big cached query, we now use a caching notice stream for
    the popular notice section. It uses a single-table query at the
    bottom, then scopes the notices and filters for silenced users. This
    should be much nicer to our database servers.
    Also clears the popular cache when someone favors or disfavors
    something. A nice optimization would be to save the last weights and
    re-calculate them at invalidation time, adding the new notice (or not)
    depending on its own score. That will have to wait for another day,
    though.
commit e9b7ab4c26c95e755adaff53c3957dcfca31c16b
Author: Evan Prodromou <evan@status.net >
Date:   Thu Oct 20 10:31:14 2011 -0400
    Let CachingNoticeStream users skip the ';last' optimization 
						
						
					 
					
						2011-10-20 10:40:39 -04:00