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 
							
						 
					 
					
						
						
							
						
						10b333a133 
					 
					
						
						
							
							Fix corrupted locale file that happened as a result of merging 0.9-release into master.  
						
						
						
						
					 
					
						2009-11-19 20:15:06 -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 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						c213477081 
					 
					
						
						
							
							Merge branch '0.9-release' of git@gitorious.org:statusnet/mainline into 0.9-release  
						
						
						
						
					 
					
						2009-11-20 04:03:58 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						b40948a700 
					 
					
						
						
							
							Removed call to NewDirectMessage() until IE return is fixed i.e.,  
						
						... 
						
						
						
						<script> maxLength 
						
						
					 
					
						2009-11-20 04:02:53 +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 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						67add64291 
					 
					
						
						
							
							Use the geo microformat as documented at  http://microformats.org/wiki/geo  
						
						
						
						
					 
					
						2009-11-19 19:13:55 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						aadb4f2093 
					 
					
						
						
							
							Upgrade to joverlay 0.8 (needed the html option)  
						
						
						
						
					 
					
						2009-11-19 19:13:55 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						377f95a20f 
					 
					
						
						
							
							Left a form_data class of a <ul> in the user admin panel  
						
						
						
						
					 
					
						2009-11-19 15:24:34 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						69ac99ff94 
					 
					
						
						
							
							Merge branch 'admin-sections/4' into 0.9.x  
						
						... 
						
						
						
						* admin-sections/4:
  Added validation to fields in user admin panel
  Added a user admin panel 
						
						
					 
					
						2009-11-19 15:17:59 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						288d875b79 
					 
					
						
						
							
							Added validation to fields in user admin panel  
						
						
						
						
					 
					
						2009-11-19 15:17:24 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						8618b064e2 
					 
					
						
						
							
							Added a user admin panel  
						
						
						
						
					 
					
						2009-11-19 15:02:25 -08:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						951e1c6204 
					 
					
						
						
							
							Added mobile logos for default and identica themes  
						
						
						
						
					 
					
						2009-11-19 21:17:41 +00: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 
							
						 
					 
					
						
						
							
						
						8971a12f89 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-19 20:47:43 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						a151ab7b99 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x  
						
						... 
						
						
						
						* '0.9.x' of gitorious.org:statusnet/mainline:
  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." 
						
						
					 
					
						2009-11-19 12:47:11 -08:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						3ff5dd6989 
					 
					
						
						
							
							Doing content negotiation only once  
						
						
						
						
					 
					
						2009-11-19 20:47:05 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						ad56ebbb97 
					 
					
						
						
							
							Add execute bit to pingqueuehandler  
						
						
						
						
					 
					
						2009-11-19 12:45:45 -08:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						93f6981b71 
					 
					
						
						
							
							Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-19 21:24:49 +01:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						69af084bcb 
					 
					
						
						
							
							Localisation updates for !StatusNet from !translatewiki.net  
						
						... 
						
						
						
						* adding plural forms for all localisations 
						
						
					 
					
						2009-11-19 21:24:24 +01:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						62b66d12d6 
					 
					
						
						
							
							Use the browser's geolocation API to set the location on the notice form  
						
						
						
						
					 
					
						2009-11-19 15:17:58 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						8628db5208 
					 
					
						
						
							
							Add geometa library, and include it.  
						
						... 
						
						
						
						Geometa provides a fallback for W3C geolocation so that Google Gears or Google's Client Location service can also be used 
						
						
					 
					
						2009-11-19 15:17:57 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						9a74a094ed 
					 
					
						
						
							
							Add location form elements to the noticeform, and save their values on submission  
						
						
						
						
					 
					
						2009-11-19 15:17:57 -05:00 
						 
				 
			
				
					
						
							
							
								Eric Helgeson 
							
						 
					 
					
						
						
							
						
						26a86402cd 
					 
					
						
						
							
							Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc  
						
						
						
						
					 
					
						2009-11-19 15:00:28 -05:00 
						 
				 
			
				
					
						
							
							
								Eric Helgeson 
							
						 
					 
					
						
						
							
						
						b96b5e9a07 
					 
					
						
						
							
							Revert "Re added NICKNAME_FMT constant to router.php."  
						
						... 
						
						
						
						This reverts commit 9f15febf88 
						
						
					 
					
						2009-11-19 14:58:32 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						7a37b71a87 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x  
						
						... 
						
						
						
						* '0.9.x' of gitorious.org:statusnet/mainline:
  take out void setLabel() call in Mapstraction
  Updated max-width for profile and single notice page
  add username and timestamp to map popup 
						
						
					 
					
						2009-11-19 11:56:00 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						b8de14af2c 
					 
					
						
						
							
							Moved most path and server settings to a new paths admin panel  
						
						
						
						
					 
					
						2009-11-19 11:55:07 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						507c7e1e6b 
					 
					
						
						
							
							take out void setLabel() call in Mapstraction  
						
						
						
						
					 
					
						2009-11-19 13:24:03 -05:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						664239d39f 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-19 18:22:05 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						269ccca9d4 
					 
					
						
						
							
							Updated max-width for profile and single notice page  
						
						
						
						
					 
					
						2009-11-19 18:21:40 +00: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 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						ee22b2ccf9 
					 
					
						
						
							
							tobyink's RDF compatibility patch  
						
						
						
						
					 
					
						2009-11-19 12:16:15 -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 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						ad0b9a7115 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-11-19 16:43:47 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						10dc9078f5 
					 
					
						
						
							
							Added lat and lon coordinates to notice location  
						
						
						
						
					 
					
						2009-11-19 16:42:04 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7e8ce8fe8d 
					 
					
						
						
							
							Merge branch '0.9.x' into mapstraction  
						
						
						
						
					 
					
						2009-11-19 11:30:35 -05:00