Evan Prodromou 
							
						 
					 
					
						
						
							
						
						55dd0dbcc0 
					 
					
						
						
							
							update how version is shown per semver.org  
						
						
						
						
					 
					
						2012-04-17 09:15:29 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						74e919e815 
					 
					
						
						
							
							Pre-alpha version changes  
						
						
						
						
					 
					
						2012-04-16 16:38:41 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5365ffc7d0 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into 1.1.x  
						
						
						
						
					 
					
						2011-12-02 15:45:01 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7af29bf0d2 
					 
					
						
						
							
							nativecode shows up in userinfo  
						
						
						
						
					 
					
						2011-11-26 10:20:32 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8cdbef098b 
					 
					
						
						
							
							die when we get a bad connection error  
						
						
						
						
					 
					
						2011-11-26 09:54:41 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f519858044 
					 
					
						
						
							
							Merge branch '1.0.x' into 1.1.x  
						
						... 
						
						
						
						Conflicts:
	lib/framework.php 
						
						
					 
					
						2011-11-16 12:00:13 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						43128e5da5 
					 
					
						
						
							
							Move GROUPS_PER_PAGE to lib/framework  
						
						
						
						
					 
					
						2011-10-07 13:52:38 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9c02713e9a 
					 
					
						
						
							
							1.0.1rc1 -> 1.0.1  
						
						
						
						
					 
					
						2011-10-03 12:46:04 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						71853f40a0 
					 
					
						
						
							
							1.0.1rc1  
						
						
						
						
					 
					
						2011-10-03 11:03:55 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d07780b478 
					 
					
						
						
							
							Output native PEAR DB errors to the log file  
						
						
						
						
					 
					
						2011-09-30 10:46:51 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9c2e454901 
					 
					
						
						
							
							It's the End of the World as We Know It (And I Feel Fine)  
						
						... 
						
						
						
						We had planned to change over to using Beastie Boys song titles for
the 1.x series of StatusNet releases, but with the end of REM last
week, the team thought naming one last StatusNet version after an REM
song was a nice tribute, and a good way to announce what we think this
release means. 
						
						
					 
					
						2011-09-30 10:19:54 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1817b25dfc 
					 
					
						
						
							
							Update the version info for 1.1.x  
						
						
						
						
					 
					
						2011-09-21 10:11:23 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4c9dc2530b 
					 
					
						
						
							
							Update documentation for 1.0.0rc1  
						
						
						
						
					 
					
						2011-09-20 16:05:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ce84555a50 
					 
					
						
						
							
							upgrade to beta4  
						
						
						
						
					 
					
						2011-09-16 15:28:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						507fd9bd69 
					 
					
						
						
							
							upgrade version to beta3  
						
						
						
						
					 
					
						2011-08-27 09:42:02 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						dc690459f5 
					 
					
						
						
							
							1.0.0beta2  
						
						
						
						
					 
					
						2011-08-02 15:12:27 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f6e929d61c 
					 
					
						
						
							
							beta1  
						
						
						
						
					 
					
						2011-07-07 13:12:34 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						cb090ab48d 
					 
					
						
						
							
							increment alpha version revision  
						
						
						
						
					 
					
						2011-05-23 12:37:29 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5a86900a34 
					 
					
						
						
							
							minor alpha version for i18n build errors  
						
						
						
						
					 
					
						2011-05-20 06:09:37 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c2f735a84e 
					 
					
						
						
							
							rev to alpha3  
						
						
						
						
					 
					
						2011-05-20 06:03:36 -07:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						ad86eb78d3 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						... 
						
						
						
						Conflicts:
	js/util.min.js
	lib/default.php 
						
						
					 
					
						2011-04-07 23:13:45 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8697f1a1e7 
					 
					
						
						
							
							alpha2  
						
						
						
						
					 
					
						2011-04-05 15:47:35 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						36b331d469 
					 
					
						
						
							
							Merge branch '1.0.x' into testing  
						
						... 
						
						
						
						Conflicts:
	plugins/Event/RSVP.php 
						
						
					 
					
						2011-04-05 13:16:28 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						5a2bab07b2 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						... 
						
						
						
						Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js 
						
						
					 
					
						2011-03-30 15:47:42 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						83fb5e6023 
					 
					
						
						
							
							Mass replacement of #-comments with //-comments  
						
						... 
						
						
						
						like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh? 
						
						
					 
					
						2011-03-22 11:54:23 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						31c1177970 
					 
					
						
						
							
							Merge branch '1.0.x' into people_tags_rebase  
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php 
						
						
					 
					
						2011-03-22 07:56:25 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						409f5f5658 
					 
					
						
						
							
							alpha1 version of the software  
						
						
						
						
					 
					
						2011-03-17 09:21:26 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a81a599d8a 
					 
					
						
						
							
							MESSAGES_PER_PAGE constant missing (merge error?)  
						
						
						
						
					 
					
						2011-03-16 11:11:06 -07:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						4b8ee81ca9 
					 
					
						
						
							
							Utility functions for people tags  
						
						
						
						
					 
					
						2011-03-06 23:33:39 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ca75adf408 
					 
					
						
						
							
							Update version number and codename  
						
						
						
						
					 
					
						2011-01-12 18:14:57 -05: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 
							
						 
					 
					
						
						
							
						
						a67160e01e 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						... 
						
						
						
						Conflicts:
	lib/common.php 
						
						
					 
					
						2010-10-19 15:19:46 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						201efe6b62 
					 
					
						
						
							
							Split the core-setup bits of common.php out to framework.php (better ideas?) so we can easily set up our framework to run Schema setup before we have a core database to load a live config from.  
						
						
						
						
					 
					
						2010-10-15 13:33:26 -07:00