Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5d09b6b3f0 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php 
						
						
					 
					
						2009-08-27 11:16:45 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						df86aa7214 
					 
					
						
						
							
							define LACONICA and accept LACONICA for backwards compatibility  
						
						
						
						
					 
					
						2009-08-26 10:41:36 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						865b716f09 
					 
					
						
						
							
							change LACONICA to STATUSNET  
						
						
						
						
					 
					
						2009-08-25 18:42:34 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ae883ceb9b 
					 
					
						
						
							
							change controlyourself.ca to status.net  
						
						
						
						
					 
					
						2009-08-25 18:19:04 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d35b2d3f3c 
					 
					
						
						
							
							change laconi.ca to status.net  
						
						
						
						
					 
					
						2009-08-25 18:16:46 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c8b8f07af1 
					 
					
						
						
							
							change Laconica and Control Yourself to StatusNet in PHP files  
						
						
						
						
					 
					
						2009-08-25 18:12:20 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7a68272580 
					 
					
						
						
							
							correct instructions for length in groupeditform  
						
						
						
						
					 
					
						2009-08-21 06:37:22 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3acdda4327 
					 
					
						
						
							
							reformat groupeditform.php  
						
						
						
						
					 
					
						2009-08-21 06:17:13 -04:00 
						 
				 
			
				
					
						
							
							
								Jeffery To 
							
						 
					 
					
						
						
							
						
						280f8faab4 
					 
					
						
						
							
							Merge branch '0.8.x' into small-fixes  
						
						... 
						
						
						
						Conflicts:
	lib/peoplesearchresults.php
	lib/profilelist.php 
						
						
					 
					
						2009-06-24 01:25:55 +08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ecbd7718d5 
					 
					
						
						
							
							Code for adding and saving group aliases  
						
						... 
						
						
						
						Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three. 
						
						
					 
					
						2009-06-14 23:37:24 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffery To 
							
						 
					 
					
						
						
							
						
						216ada5cc4 
					 
					
						
						
							
							Fix "Trying to get property of non-object" errors in groupeditform.php  
						
						
						
						
					 
					
						2009-06-12 19:48:26 +08:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						e272adb321 
					 
					
						
						
							
							fixed a few bugs and logic problems in groups  
						
						
						
						
					 
					
						2009-01-22 08:01:40 +00:00 
						 
				 
			
				
					
						
							
							
								sarven 
							
						 
					 
					
						
						
							
						
						03117fe3e8 
					 
					
						
						
							
							Cleanup.. some for IE and other for cascading  
						
						
						
						
					 
					
						2009-01-22 04:35:22 +00:00 
						 
				 
			
				
					
						
							
							
								sarven 
							
						 
					 
					
						
						
							
						
						4b42c35269 
					 
					
						
						
							
							General markup and style cleanup  
						
						
						
						
					 
					
						2009-01-21 22:44:27 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9dafcce015 
					 
					
						
						
							
							add new group action  
						
						
						
						
					 
					
						2009-01-21 09:06:18 -05:00