Zach Copley 
							
						 
					 
					
						
						
							
						
						f12972a50f 
					 
					
						
						
							
							Facebook plugin no longer takes over Login and Connect settings nav menus  
						
						
						
						
					 
					
						2009-11-25 00:43:20 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						3556861596 
					 
					
						
						
							
							Fix SSL options for Twitter bridge HTTP requests  
						
						
						
						
					 
					
						2009-11-24 19:12:57 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						b20b59e9ea 
					 
					
						
						
							
							Fix SSL options for Twitter bridge HTTP requests  
						
						
						
						
					 
					
						2009-11-24 19:11:34 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						2eae258319 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-24 18:47:56 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						84ed094f40 
					 
					
						
						
							
							Moved initPopupWindow CSS out of JS in Realtime plugin  
						
						
						
						
					 
					
						2009-11-24 13:10:34 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						9f6b3daaec 
					 
					
						
						
							
							Added realtime-popup class to <body> for popup output.  
						
						
						
						
					 
					
						2009-11-24 13:09:17 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						5973192593 
					 
					
						
						
							
							Enable border-top when Realtime pop up window is initialized  
						
						
						
						
					 
					
						2009-11-24 12:55:08 +00:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						83ba93e945 
					 
					
						
						
							
							Change the format of the lat/lon output on a notice in HTML  
						
						
						
						
					 
					
						2009-11-20 17:40:38 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						3db551ed5a 
					 
					
						
						
							
							Undo part of  c6e4feb815 so that blacklisted notices are not displayed in realtime  
						
						
						
						
					 
					
						2009-11-20 13:58:13 -08:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						953f3a6e4f 
					 
					
						
						
							
							Undo part of  c6e4feb815 so that blacklisted notices are not displayed in realtime  
						
						
						
						
					 
					
						2009-11-20 15:34:48 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						028a44e080 
					 
					
						
						
							
							use caching in geonames plugin  
						
						
						
						
					 
					
						2009-11-20 15:27:47 -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 
							
						 
					 
					
						
						
							
						
						e7663ce38f 
					 
					
						
						
							
							fix notice bug  
						
						
						
						
					 
					
						2009-11-20 13:57:35 -05: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 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b189c9500c 
					 
					
						
						
							
							Initial functional version of feed subscription plugin, currently supporting only PuSH-enabled feeds.  
						
						
						
						
					 
					
						2009-11-20 09:42:19 -08:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						09d67d6f80 
					 
					
						
						
							
							Fix js error on non-map containing pages  
						
						
						
						
					 
					
						2009-11-20 11:16:39 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d645db38ae 
					 
					
						
						
							
							Merge branch 'master' of git@gitorious.org:statusnet/mainline  
						
						
						
						
					 
					
						2009-11-20 08:00:34 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						85ec057422 
					 
					
						
						
							
							use caching in geonames plugin  
						
						
						
						
					 
					
						2009-11-20 07:58:28 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						4bace8f1a5 
					 
					
						
						
							
							Add routing rules for FB app in front of other rules  
						
						
						
						
					 
					
						2009-11-20 11:13:24 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e640561ccd 
					 
					
						
						
							
							Add routing rules for FB app in front of other rules  
						
						
						
						
					 
					
						2009-11-20 11:11:18 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						f8b76ebc11 
					 
					
						
						
							
							Updated form markup  
						
						
						
						
					 
					
						2009-11-20 05:50:46 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						501170f3cf 
					 
					
						
						
							
							Updated form markup  
						
						
						
						
					 
					
						2009-11-20 05:48:05 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						c6e4feb815 
					 
					
						
						
							
							These changes didn't go into master (from 0.9-release)  
						
						
						
						
					 
					
						2009-11-20 05:28:10 +00:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						dd36c2de23 
					 
					
						
						
							
							Initial functional version of feed subscription plugin, currently supporting only PuSH-enabled feeds.  
						
						
						
						
					 
					
						2009-11-19 21:04:21 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						003b25ee56 
					 
					
						
						
							
							Merge branch '0.9-release'  
						
						... 
						
						
						
						* 0.9-release:
  Changed DEFINE name to avoid conflicts 
						
						
					 
					
						2009-11-19 20:51:20 -08:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						e1fcac0e09 
					 
					
						
						
							
							Changed DEFINE name to avoid conflicts  
						
						
						
						
					 
					
						2009-11-20 04:49:35 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e3de04f8cd 
					 
					
						
						
							
							Merge branch '0.9-release'  
						
						... 
						
						
						
						* 0.9-release:
  Reduced entity_profile width in pop up 
						
						
					 
					
						2009-11-19 20:18:35 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						4b98edf75f 
					 
					
						
						
							
							Merge branch '0.9-release'  
						
						... 
						
						
						
						* 0.9-release: (874 commits)
  Removed call to NewDirectMessage() until IE return is fixed i.e.,
  Don't show flag user button your own profile
  Fixed HXR response for flag user
  Using the right form class name
  Using common_redirect
  Left a form_data class of a <ul> in the user admin panel
  Added validation to fields in user admin panel
  Added a user admin panel
  Added mobile logos for default and identica themes
  Changed gif to png
  Changed this to action. THANKS zach!
  Doing content negotiation only once
  Add execute bit to pingqueuehandler
  Localisation updates for !StatusNet from !translatewiki.net
  Use the browser's geolocation API to set the location on the notice form
  Add geometa library, and include it.
  Add location form elements to the noticeform, and save their values on submission
  Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc
  Revert "Re added NICKNAME_FMT constant to router.php."
  Moved most path and server settings to a new paths admin panel
  ...
Conflicts:
	js/util.js
	locale/it_IT/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	locale/vi_VN/LC_MESSAGES/statusnet.mo
	plugins/InfiniteScroll/infinitescroll.js
	plugins/Realtime/realtimeupdate.js 
						
						
					 
					
						2009-11-19 20:12:46 -08:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						b51df36189 
					 
					
						
						
							
							Reduced entity_profile width in pop up  
						
						
						
						
					 
					
						2009-11-20 04:09:40 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						50827d5e81 
					 
					
						
						
							
							Don't show flag user button your own profile  
						
						
						
						
					 
					
						2009-11-19 19:56:24 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						3d2a2d4173 
					 
					
						
						
							
							Fixed HXR response for flag user  
						
						
						
						
					 
					
						2009-11-19 19:29:55 -08:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						2eed928837 
					 
					
						
						
							
							Using the right form class name  
						
						
						
						
					 
					
						2009-11-20 03:06:12 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						30f660b05c 
					 
					
						
						
							
							Using common_redirect  
						
						
						
						
					 
					
						2009-11-20 02:12:09 +00:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						dc90e90fd2 
					 
					
						
						
							
							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 
						
						
					 
					
						2009-11-19 19:13:55 -05:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						5a3267900d 
					 
					
						
						
							
							Changed gif to png  
						
						
						
						
					 
					
						2009-11-19 20:59:21 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						78c6056133 
					 
					
						
						
							
							Changed this to action. THANKS zach!  
						
						
						
						
					 
					
						2009-11-19 20:52:42 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						3ff5dd6989 
					 
					
						
						
							
							Doing content negotiation only once  
						
						
						
						
					 
					
						2009-11-19 20:47:05 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						507c7e1e6b 
					 
					
						
						
							
							take out void setLabel() call in Mapstraction  
						
						
						
						
					 
					
						2009-11-19 13:24:03 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2723bee69f 
					 
					
						
						
							
							add username and timestamp to map popup  
						
						
						
						
					 
					
						2009-11-19 13:20:55 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						640bb39891 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-19 12:37:26 -05:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						318dd70de8 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-19 17:35:45 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ea561b88d1 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-19 12:35:19 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2daa31f142 
					 
					
						
						
							
							show maps on inbox and personal page  
						
						
						
						
					 
					
						2009-11-19 12:34:56 -05:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						60391d0b96 
					 
					
						
						
							
							Brought the plugin up to date with recent 0.9.x changes e.g.,  
						
						... 
						
						
						
						Theme::path 
						
						
					 
					
						2009-11-19 17:13:51 +00:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						4463768bae 
					 
					
						
						
							
							tobyink's location RDF patch  
						
						
						
						
					 
					
						2009-11-19 12:00:25 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ae710f20d8 
					 
					
						
						
							
							add markers for each notice and show the bounding box correctly  
						
						
						
						
					 
					
						2009-11-19 11:51:15 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7e8ce8fe8d 
					 
					
						
						
							
							Merge branch '0.9.x' into mapstraction  
						
						
						
						
					 
					
						2009-11-19 11:30:35 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						844a28aa9d 
					 
					
						
						
							
							put out provider JS correctly  
						
						
						
						
					 
					
						2009-11-19 11:21:51 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						c721884b52 
					 
					
						
						
							
							Should be using onHandleQueuedNotice instead of onEndNoticeSave  
						
						
						
						
					 
					
						2009-11-19 11:08:13 -05:00