Zach Copley 
							
						 
					 
					
						
						
							
						
						f3ffc8bc46 
					 
					
						
						
							
							Missed a couple of conflicts  
						
						
						
						
					 
					
						2011-02-28 15:51:46 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						b7d0746694 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css 
						
						
					 
					
						2011-02-28 15:39:43 -08:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						7db24c32d6 
					 
					
						
						
							
							* fix some i18n and L10n issues  
						
						... 
						
						
						
						* update/add translator documentation
* remove superfluous whitespace 
						
						
					 
					
						2011-01-29 00:33:13 +01:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						56e2bc10d9 
					 
					
						
						
							
							Cleanup stray PHP 4-style references in hook calls for navigation bars. We can't replace the live action from here, and don't need a reference to keep the object mutable. Dumping the references helps ensure we don't end up getting errors when things calling the hooks might forget to use the reference and the PHP error reporting settings expose this fact at us.  
						
						
						
						
					 
					
						2011-01-18 12:34:27 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5c25364141 
					 
					
						
						
							
							remove extraneous <dl> and <dt> tags  
						
						
						
						
					 
					
						2011-01-14 15:36:06 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						5fdcba472b 
					 
					
						
						
							
							RemoteProfileAction cleanup:  
						
						... 
						
						
						
						- meta robots to prevent spidering
- a little notice if silenced 
						
						
					 
					
						2010-11-15 16:12:16 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						6849b8f9e5 
					 
					
						
						
							
							Workaround for display of Twitter remote users in remoteprofile (ModPlus plugin): use 73px avatar if no 96px present  
						
						
						
						
					 
					
						2010-11-15 15:39:42 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0d0e51292d 
					 
					
						
						
							
							some User -> Profile cleanup to help in adapting the profile page action to show stuff for remote users. Subscriptions, groups, roles, etc are all on profiles now so go ahead and use em.  
						
						
						
						
					 
					
						2010-11-15 15:32:57 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						67f2f01c5e 
					 
					
						
						
							
							Merge branch 'testing' into 0.9.x  
						
						
						
						
					 
					
						2010-03-17 12:15:40 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						441e52718e 
					 
					
						
						
							
							Background deletion of user accounts. Notices are deleted in chunks, then the user itself when they're all gone.  
						
						... 
						
						
						
						While deletion is in progress, the account is locked with the 'deleted' role, which disables all actions with rights control.
Todo:
* Pretty up the notice on the profile page about the pending delete. Show status?
* Possibly more thorough account disabling, such as disallowing all use for login and access.
* Improve error recovery; worst case is that an account gets left locked in 'deleted' state but the queue jobs have gotten dropped out. This would leave the username in use and any undeleted notices in place. 
						
						
					 
					
						2010-03-15 16:08:00 -07:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						5b078eadd9 
					 
					
						
						
							
							Assigned an identifier for the representative user and group profile  
						
						
						
						
					 
					
						2010-03-13 16:48:21 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4a2511139e 
					 
					
						
						
							
							Initial user role controls on profile pages, for owner to add/remove administrator and moderator options.  
						
						... 
						
						
						
						Buttons need to be themed. 
						
						
					 
					
						2010-03-03 15:43:49 -08:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						fc19179bc5 
					 
					
						
						
							
							Added event hook to remote subscription  
						
						
						
						
					 
					
						2010-02-13 18:40:36 +01:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						5f5a107991 
					 
					
						
						
							
							Init UI to show/hide a group of moderation actions.  
						
						
						
						
					 
					
						2009-11-26 18:46:11 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0580e824f0 
					 
					
						
						
							
							use return-to method for UserProfile widget  
						
						
						
						
					 
					
						2009-11-16 17:54:50 +01:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a723cc979b 
					 
					
						
						
							
							correct constructor for DeleteUserForm  
						
						
						
						
					 
					
						2009-11-16 17:06:12 +01:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d24ed193e7 
					 
					
						
						
							
							add forms for silence, sandbox, delete user  
						
						
						
						
					 
					
						2009-11-15 16:00:29 +01:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d10ee1763b 
					 
					
						
						
							
							->action -> ->out in UserProfile  
						
						
						
						
					 
					
						2009-11-07 13:18:09 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						742317c0da 
					 
					
						
						
							
							fix userprofile widget so it correctly provides an action  
						
						
						
						
					 
					
						2009-11-07 13:16:29 -05:00 
						 
				 
			
				
					
						
							
							
								Shashi 
							
						 
					 
					
						
						
							
						
						b12caedb88 
					 
					
						
						
							
							Widgetized user profile rendering.  
						
						
						
						
					 
					
						2009-11-04 18:41:17 +05:30