Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						409550e1dc 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-04-13 15:48:18 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						0644cdb6d0 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-04-11 15:10:09 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						396a0c08b3 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-04-09 20:53:29 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						09523a19d7 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-04-03 15:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						d2a2575648 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-04-01 22:59:31 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						4ac471f380 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-03-31 23:30:07 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						5bb6fae307 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-03-18 20:59:45 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						69e11bb45e 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-03-11 19:33:52 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						7a9b989349 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						... 
						
						
						
						Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know! 
						
						
					 
					
						2011-03-06 02:52:28 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						5fd9767e80 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						... 
						
						
						
						* Fix previous commit. Pot files were built against master instead of 1.0.x. 
						
						
					 
					
						2011-03-03 18:39:12 +01: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 
							
						 
					 
					
						
						
							
						
						3e7e6138a8 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-02-17 12:27:14 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						e6e402cefd 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-01-29 23:10:15 +01:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e53793edf4 
					 
					
						
						
							
							make 'admin' a safe user name  
						
						... 
						
						
						
						'admin' is a pretty common username that people try when installing;
it was blacklisted because all of our admin panels were at /admin/*,
which would conflict with the admin user's namespace.
Changed the location of all admin panels to /panel/*, blacklisted the
nickname 'panel', and allowed 'admin'. Tested with a fresh install;
seems to work great. 
						
						
					 
					
						2011-01-23 10:18:35 -05:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						f1820459a8 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2011-01-15 01:30:01 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						cf824621b9 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2010-12-16 16:30:30 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						ed0e91c7a1 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2010-11-29 20:28:28 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						f8b2ec4b53 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2010-11-07 22:33:23 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						7a564276a9 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2010-10-28 01:58:43 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						1545c1228b 
					 
					
						
						
							
							Localisation updates from  http://translatewiki.net .  
						
						
						
						
					 
					
						2010-10-23 20:50:55 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						3329685beb 
					 
					
						
						
							
							* onPluginVersion added.  
						
						... 
						
						
						
						* i18n fix: use _m() in plugins, don't use _()
* some translator documentation added.
* superfluous whitespace removed. 
						
						
					 
					
						2010-10-23 19:23:25 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						749fe8ca2e 
					 
					
						
						
							
							OpenX plugin admin panel  
						
						
						
						
					 
					
						2010-10-18 16:42:43 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						dd413ff4fa 
					 
					
						
						
							
							move script into OpenXPlugin::showAd() so it works  
						
						
						
						
					 
					
						2010-01-27 18:44:46 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						97a1ef14d2 
					 
					
						
						
							
							using an action for output in OpenX plugin  
						
						
						
						
					 
					
						2010-01-27 18:39:55 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0373ab6fa4 
					 
					
						
						
							
							Plugin to enable OpenX ads  
						
						
						
						
					 
					
						2010-01-27 18:35:02 -05:00