Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						adfb79a9bb
					 | 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x
						
						
						
						
						
						
						
						Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh 
						
						
					 | 
					
						2009-06-08 11:55:32 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						79ede2afdb
					 | 
					
						
						
							
							add get2gnow
						
						
						
						
						
						
					 | 
					
						2009-05-30 01:30:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						6885f082ea
					 | 
					
						
						
							
							Added Afficheur to notice sources
						
						
						
						
						
						
					 | 
					
						2009-05-28 17:51:45 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sarven Capadisli
							
						 
					 | 
					
						
						
							
						
						a456ceb47c
					 | 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x
						
						
						
						
						
						
					 | 
					
						2009-05-29 00:10:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						047038959c
					 | 
					
						
						
							
							Add any.io to sources
						
						
						
						
						
						
					 | 
					
						2009-05-28 17:37:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						e149404210
					 | 
					
						
						
							
							Add EventBox to notice sources
						
						
						
						
						
						
					 | 
					
						2009-05-26 21:36:17 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						74b08bff53
					 | 
					
						
						
							
							Added AgentSolo.com
						
						
						
						
						
						
					 | 
					
						2009-05-26 15:27:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						1306deff38
					 | 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
						
						
						
						
						
						
					 | 
					
						2009-05-26 15:22:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						a1f83b2933
					 | 
					
						
						
							
							added qtwitter
						
						
						
						
						
						
					 | 
					
						2009-05-26 15:22:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						18b1304562
					 | 
					
						
						
							
							Add EventBox to notice sources
						
						
						
						
						
						
					 | 
					
						2009-05-25 14:23:00 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sarven Capadisli
							
						 
					 | 
					
						
						
							
						
						47d475d66a
					 | 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x
						
						
						
						
						
						
					 | 
					
						2009-05-22 14:18:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						b118ef633a
					 | 
					
						
						
							
							Add Gravity to notice sources
						
						
						
						
						
						
					 | 
					
						2009-05-22 10:03:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sarven Capadisli
							
						 
					 | 
					
						
						
							
						
						d6ec21fbc6
					 | 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
						
						
						
						
						
						
					 | 
					
						2009-05-10 23:12:52 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						4b0e5ff271
					 | 
					
						
						
							
							Added Twitter to notice sources
						
						
						
						
						
						
					 | 
					
						2009-05-07 14:07:03 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						6a12598695
					 | 
					
						
						
							
							add pingvine notice source
						
						
						
						
						
						
					 | 
					
						2009-05-03 21:36:03 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								CiaranG
							
						 
					 | 
					
						
						
							
						
						4cb0a92980
					 | 
					
						
						
							
							Add feed2omb to notice sources
						
						
						
						
						
						
					 | 
					
						2009-04-21 20:43:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						9f2e2e4b2c
					 | 
					
						
						
							
							Notice sources: Fixed Nambu, added Tricklepost and sorted the list.
						
						
						
						
						
						
					 | 
					
						2009-04-14 11:50:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						fba0249932
					 | 
					
						
						
							
							add cliqset
						
						
						
						
						
						
					 | 
					
						2009-04-10 11:36:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						08c08d02aa
					 | 
					
						
						
							
							Added maisha to notice_source
						
						
						
						
						
						
					 | 
					
						2009-04-10 10:47:53 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						770788d98e
					 | 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
						
						
						
						
						
						
					 | 
					
						2009-04-07 11:40:38 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						f09886672b
					 | 
					
						
						
							
							add peoplebrowsr
						
						
						
						
						
						
					 | 
					
						2009-04-06 15:51:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						d83f6c3269
					 | 
					
						
						
							
							Add Yatca to notice sources
						
						
						
						
						
						
					 | 
					
						2009-04-03 14:16:32 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						24ce3928e3
					 | 
					
						
						
							
							fix sql error in notice source script
						
						
						
						
						
						
					 | 
					
						2009-03-23 16:37:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						92da8a59cb
					 | 
					
						
						
							
							add Mobidentica
						
						
						
						
						
						
					 | 
					
						2009-03-22 10:51:00 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						3eff673a0f
					 | 
					
						
						
							
							Add Adium to notice sources
						
						
						
						
						
						
					 | 
					
						2009-03-14 23:25:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						f53b6470cf
					 | 
					
						
						
							
							add notice source to default install
						
						
						
						
						
						
					 | 
					
						2009-03-04 05:42:20 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |