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 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						429cbb66b4 
					 
					
						
						
							
							Mapstraction plugin uses Plugin::path()  
						
						
						
						
					 
					
						2011-02-03 10:50:11 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						bf20258f4b 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-12-15 11:59:31 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						d8d9edfc99 
					 
					
						
						
							
							Merge branch 'master' into 0.9.x  
						
						
						
						
					 
					
						2010-12-08 15:01:25 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						26bd15ec0a 
					 
					
						
						
							
							Mapstraction plugin: use minified sources for OpenLayers  
						
						... 
						
						
						
						The default full build of OpenLayers.js is 943kb as of 2.10; this gzips down to a couple hundred kb
but is still rather nasty, plus loading it off a remote host could slow things down.
Using a local copy let us cut down the size significantly by discarding unused features, and further
minification with yui-compressor shaves a bit more off. Cuts down to about 1/5 the size of the
original.
Also threw in a bundled & minified copy of the Mapstraction classes plus our usermap.js,
which covers the common case of using the default OpenLayers provider. This cuts out three
additional script loads, two of which weren't getting launched until after the mxn.js main
file got loaded. 
						
						
					 
					
						2010-12-08 14:54:02 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9df856e667 
					 
					
						
						
							
							Merge branch '0.9.x' into merge  
						
						... 
						
						
						
						Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php 
						
						
					 
					
						2010-12-07 10:50:05 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						dc350b5463 
					 
					
						
						
							
							Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.  
						
						
						
						
					 
					
						2010-11-29 14:15:25 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b6af5a25ba 
					 
					
						
						
							
							don't try to initialize the mapstraction canvas if it doesn't exist  
						
						
						
						
					 
					
						2010-11-12 11:48:17 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fdf3a23da7 
					 
					
						
						
							
							don't try to initialize the mapstraction canvas if it doesn't exist  
						
						
						
						
					 
					
						2010-11-12 11:46:45 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						9f9126e524 
					 
					
						
						
							
							Load MS Virtual Earth javascript over https when browsing in https  
						
						
						
						
					 
					
						2010-10-27 00:09:43 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						34f95c26fd 
					 
					
						
						
							
							* FIXME/CHECKMEs added for (possible) bad i18n  
						
						... 
						
						
						
						* translator hints added
* superfluous whitespace removed 
						
						
					 
					
						2010-09-18 15:10:49 +02:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b0c589de9a 
					 
					
						
						
							
							Ticket  #2330 : fix Google Maps provider for Mapstraction plugin  
						
						
						
						
					 
					
						2010-06-01 18:29:01 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4f62d685d0 
					 
					
						
						
							
							Mapstraction PluginVersion  
						
						
						
						
					 
					
						2010-01-08 00:38:20 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4b5e977a7b 
					 
					
						
						
							
							New _m() gettext wrapper with smart detection of plugin domains. Plugin base class registers your gettext files if present at initialization.  
						
						... 
						
						
						
						update_pot.sh replaced with update_po_templates.php which can do core, plugins, or all (default).
Top-level Makefile added to build .mo files for plugins as well as core.
As described on list:
http://lists.status.net/pipermail/statusnet-dev/2009-December/002869.html  
						
						
					 
					
						2009-12-08 12:17:11 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e7e9dfceb4 
					 
					
						
						
							
							remove unnecessary debugging code from mapstraction output  
						
						
						
						
					 
					
						2009-12-04 14:36:24 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a92228c713 
					 
					
						
						
							
							Update Mapstraction to properly scrape data from notice-list pages  
						
						... 
						
						
						
						Refactored the JavaScript for Mapstraction use so it scrapes data from
the HTML of the page it's on, if possible, and otherwise generates a
JSON array. 
						
						
					 
					
						2009-12-04 14:31:19 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						35ff3961e8 
					 
					
						
						
							
							Remove unnecessary pass by reference indicators  
						
						
						
						
					 
					
						2009-12-03 19:59:31 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						43a1a35524 
					 
					
						
						
							
							refactor the common parts of usermap and allmap into a common base class  
						
						
						
						
					 
					
						2009-12-03 19:43:02 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						e3caec9d8a 
					 
					
						
						
							
							Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page  
						
						... 
						
						
						
						Clicking on a geo link pops up a map (round 2) 
						
						
					 
					
						2009-12-02 21:24:41 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						afe5e71c4e 
					 
					
						
						
							
							Quick fix for Safari XHTML error... the map doesn't currently work with Safari, but this gets the whole page parsing again!  
						
						
						
						
					 
					
						2009-11-20 12:04:27 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						1ca022464a 
					 
					
						
						
							
							Fix double-escaped HTML in mapstraction notice popups  
						
						
						
						
					 
					
						2009-11-20 10:17:14 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						46c5a52810 
					 
					
						
						
							
							fix notice bug  
						
						
						
						
					 
					
						2009-11-20 10:08:13 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2daa31f142 
					 
					
						
						
							
							show maps on inbox and personal page  
						
						
						
						
					 
					
						2009-11-19 12:34:56 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						844a28aa9d 
					 
					
						
						
							
							put out provider JS correctly  
						
						
						
						
					 
					
						2009-11-19 11:21:51 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1cc10aaef6 
					 
					
						
						
							
							set provider global JS variable from Mapstraction  
						
						
						
						
					 
					
						2009-11-18 08:33:48 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fc08a5c880 
					 
					
						
						
							
							first pass at Mapstraction plugin  
						
						
						
						
					 
					
						2009-11-17 23:23:13 -05:00