Zach Copley 
							
						 
					 
					
						
						
							
						
						d2b42577de 
					 
					
						
						
							
							Was deleting wrong subscription during block. Now deletes the blockee's sub if it exists.  
						
						 
						
						
						
						
					 
					
						2009-12-03 17:44:34 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						aef4cc0a59 
					 
					
						
						
							
							Make it impossible to block (and thus unsubscribe from your  
						
						 
						
						... 
						
						
						
						self-subscription) via the API.  Additionally, make it impossible
to block yourself or unsubscribe from yourself, period.
I also made User use the subs.php helper function for unsubscribing
during a block.
Hopefully, these changes will get rid of the problem of people
accidentally deleting their self-subscriptions once and for all
(knock on wood). 
						
						
					 
					
						2009-12-03 17:06:58 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6a1afda259 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	classes/statusnet.ini 
						
						
					 
					
						2009-11-17 06:25:07 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d2145a5b7f 
					 
					
						
						
							
							Move rights check to profile and add right for new notices  
						
						 
						
						... 
						
						
						
						Added a right for new notices, realized that the hasRight() method
should be on the profile, and moved it.
Makes this a less atomic commit but that's the way it goes sometimes. 
						
						
					 
					
						2009-11-16 19:03:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						7177585630 
					 
					
						
						
							
							getGroups was not handling the case where limit=null correctly  
						
						 
						
						
						
						
					 
					
						2009-11-16 11:22:45 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3e08309826 
					 
					
						
						
							
							change uses of User_role to Profile_role  
						
						 
						
						
						
						
					 
					
						2009-11-16 16:06:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						792590bcdc 
					 
					
						
						
							
							move role functions to Profile class  
						
						 
						
						
						
						
					 
					
						2009-11-16 15:52:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c9475c76a8 
					 
					
						
						
							
							define rights around how to silence, sandbox, and delete a user  
						
						 
						
						
						
						
					 
					
						2009-11-15 15:59:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						ed690615de 
					 
					
						
						
							
							Added a User_username table that links the external username with a StatusNet user_id  
						
						 
						
						... 
						
						
						
						Added EmailAuthenticationPlugin
Added ReverseUsernameAuthenticationPlugin
Changed the StartChangePassword and EndChangePassword events to take a user, instead of a nickname
User::allowed_nickname was declared non-static, but used as if it was static, so I made the declaration static 
						
						
					 
					
						2009-11-12 20:12:36 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						088081675f 
					 
					
						
						
							
							Revert "Remove more contractions"  
						
						 
						
						... 
						
						
						
						This reverts commit 5ab709b739 .
Missed this one yesterday... 
						
						
					 
					
						2009-11-09 20:01:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						5ab709b739 
					 
					
						
						
							
							Remove more contractions  
						
						 
						
						... 
						
						
						
						* doesn't
* won't
* isn't
* don't 
						
						
					 
					
						2009-11-08 23:32:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						111f6a775d 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						 
						
						
						
						
					 
					
						2009-11-08 17:06:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8d44b6a5a2 
					 
					
						
						
							
							Fix bug 1962: deleteuser.php regression when OpenID plugin not enabled  
						
						 
						
						... 
						
						
						
						The User_openid data object was explicitly listed as a related field to delete from in User::delete(); this class doesn't exist anymore by default since OpenID was broken out to a plugin.
Added UserDeleteRelated event for plugins to add related tables to delete from at user delete time. 
						
						
					 
					
						2009-11-08 14:40:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						38833af6f1 
					 
					
						
						
							
							use upper-case constants for roles and rights in hasRight()  
						
						 
						
						
						
						
					 
					
						2009-11-07 19:16:54 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a2b8303925 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	classes/User.php 
						
						
					 
					
						2009-11-02 18:13:04 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						61419038e5 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	README 
						
						
					 
					
						2009-11-02 18:11:45 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						15d0055c6f 
					 
					
						
						
							
							allowed_nickname blocks top level url router names  
						
						 
						
						
						
						
					 
					
						2009-11-02 15:18:56 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6664528244 
					 
					
						
						
							
							Revert "Blacklist all files and directories in the web root (INSTALLDIR). Much more elegant than manually keep tracking of these invalid usernames."  
						
						 
						
						... 
						
						
						
						This reverts commit 15f9c80c28 .
So, so, elegant! And so, so, incorrect!
We can't have a user named 'notice' because that would interfere with
URLs like /notice/1234. However, there is no file named 'notice' in
the Web root.
If there were a way to automatically pull out the virtual paths in the
root dir, this may make sense. Until then, we keep track here. 
						
						
					 
					
						2009-11-01 11:09:14 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b73d6d18ba 
					 
					
						
						
							
							Merge branch '0.9.x' into location  
						
						 
						
						
						
						
					 
					
						2009-10-28 17:24:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Carlos Perilla 
							
						 
					 
					
						
						
							
						
						bf701b8235 
					 
					
						
						
							
							Enable welcome bot to broadcast it's notices  
						
						 
						
						
						
						
					 
					
						2009-10-27 23:38:08 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						943b2bea09 
					 
					
						
						
							
							update location while registering  
						
						 
						
						
						
						
					 
					
						2009-10-23 11:46:44 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4f5badda94 
					 
					
						
						
							
							remove inboxes option  
						
						 
						
						
						
						
					 
					
						2009-10-13 17:38:27 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c5047fd90a 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	classes/Profile.php 
						
						
					 
					
						2009-10-04 03:07:37 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						94e3f6bb09 
					 
					
						
						
							
							also delete blocks  
						
						 
						
						
						
						
					 
					
						2009-10-02 15:29:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b3b3af9a2e 
					 
					
						
						
							
							Merge branch '0.8.x' into deleteuser  
						
						 
						
						
						
						
					 
					
						2009-10-02 15:27:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						38345d0783 
					 
					
						
						
							
							let hooks override standard user rights  
						
						 
						
						
						
						
					 
					
						2009-09-27 21:11:45 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6c069312e2 
					 
					
						
						
							
							user rights  
						
						 
						
						
						
						
					 
					
						2009-09-27 21:11:45 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8284b3cb82 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/noticeform.php 
						
						
					 
					
						2009-09-23 09:45:22 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						15f9c80c28 
					 
					
						
						
							
							Blacklist all files and directories in the web root (INSTALLDIR). Much more elegant than manually keep tracking of these invalid usernames.  
						
						 
						
						
						
						
					 
					
						2009-09-18 17:53:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						815630fe63 
					 
					
						
						
							
							used standard SQL that mysql and pgsql both like  
						
						 
						
						
						
						
					 
					
						2009-08-28 20:45:12 +12:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						b9ea2bf1bc 
					 
					
						
						
							
							used standard SQL that mysql and pgsql both like  
						
						 
						
						
						
						
					 
					
						2009-08-28 20:44:11 +12:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						b833b725a8 
					 
					
						
						
							
							make use of common_database_tablename()  
						
						 
						
						
						
						
					 
					
						2009-08-28 20:42:13 +12:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						522008dee5 
					 
					
						
						
							
							methods on User to grant, check, and revoke roles  
						
						 
						
						
						
						
					 
					
						2009-08-27 11:38:31 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5d09b6b3f0 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php 
						
						
					 
					
						2009-08-27 11:16:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						df86aa7214 
					 
					
						
						
							
							define LACONICA and accept LACONICA for backwards compatibility  
						
						 
						
						
						
						
					 
					
						2009-08-26 10:41:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						865b716f09 
					 
					
						
						
							
							change LACONICA to STATUSNET  
						
						 
						
						
						
						
					 
					
						2009-08-25 18:42:34 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4737563b95 
					 
					
						
						
							
							a distributed -> the distributed  
						
						 
						
						
						
						
					 
					
						2009-08-25 18:14:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c8b8f07af1 
					 
					
						
						
							
							change Laconica and Control Yourself to StatusNet in PHP files  
						
						 
						
						
						
						
					 
					
						2009-08-25 18:12:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						622c0b24c3 
					 
					
						
						
							
							move redirect-to-openid code to OpenID plugin  
						
						 
						
						
						
						
					 
					
						2009-08-04 13:17:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						51ac34e80c 
					 
					
						
						
							
							first version of deleting users  
						
						 
						
						
						
						
					 
					
						2009-07-26 13:06:38 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5f7fb99447 
					 
					
						
						
							
							change NOTICE_GATEWAY to Notice::GATEWAY so autoloading works  
						
						 
						
						
						
						
					 
					
						2009-07-23 14:22:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8b65883f9d 
					 
					
						
						
							
							cache frequently-used subscriber, subscription, notice and fave count values  
						
						 
						
						
						
						
					 
					
						2009-07-09 17:28:38 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ac361791c4 
					 
					
						
						
							
							fix caching of faves by own, other  
						
						 
						
						
						
						
					 
					
						2009-07-05 11:32:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						994768b821 
					 
					
						
						
							
							break up big inbox queries into lots of small ones  
						
						 
						
						
						
						
					 
					
						2009-06-25 23:00:46 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						31325f0995 
					 
					
						
						
							
							Stop Twitter gateway notices from leaking via user faves pages  
						
						 
						
						
						
						
					 
					
						2009-06-23 13:51:23 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3f54840b51 
					 
					
						
						
							
							Only show twitter msgs in your own inbox  
						
						 
						
						
						
						
					 
					
						2009-06-18 11:45:48 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4df1ea49ec 
					 
					
						
						
							
							Merge branch '0.8.x' into userdesign  
						
						 
						
						... 
						
						
						
						Conflicts:
	actions/designsettings.php 
						
						
					 
					
						2009-06-09 21:51:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						adfb79a9bb 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh 
						
						
					 
					
						2009-06-08 11:55:32 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7656277313 
					 
					
						
						
							
							remove debug code from replies  
						
						 
						
						
						
						
					 
					
						2009-05-30 03:02:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						705abf31ee 
					 
					
						
						
							
							add getDesign to User  
						
						 
						
						
						
						
					 
					
						2009-05-23 23:27:42 -04:00