Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						aaeed091d2 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						
						
						
					 
					
						2009-05-05 22:54:46 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						b8c700a745 
					 
					
						
						
							
							Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x  
						
						
						
						
					 
					
						2009-05-05 19:32:16 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						7f417cfee0 
					 
					
						
						
							
							More work on 2-way Twitter sync. Works better now with lastest version  
						
						... 
						
						
						
						of DB_DataObject that automatically reconnects to the DB, but forked
processes still lose connections occassionally. 
						
						
					 
					
						2009-05-05 19:28:57 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0bbf56f6dc 
					 
					
						
						
							
							Merge branch 'querybyid' into 0.7.x  
						
						
						
						
					 
					
						2009-05-04 10:22:22 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2f7820b15b 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-05-03 21:37:05 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6a12598695 
					 
					
						
						
							
							add pingvine notice source  
						
						
						
						
					 
					
						2009-05-03 21:36:03 -07:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						51377258a1 
					 
					
						
						
							
							Aligned shownotice page's entry-content to left. Fixing vcard photo  
						
						... 
						
						
						
						margin bottom value. 
						
						
					 
					
						2009-05-02 00:10:50 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						1fde80cf73 
					 
					
						
						
							
							Minor CSS updates (No min-height on shownotice page, site_notice is  
						
						... 
						
						
						
						floated instead of positioned absolutely, notice entry-content is
aligned with the nickname on shownotice page) 
						
						
					 
					
						2009-05-01 23:32:59 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5314d9b2cf 
					 
					
						
						
							
							make faves work with ids  
						
						
						
						
					 
					
						2009-05-01 12:01:28 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						021b520a11 
					 
					
						
						
							
							Make user group stream use IDs  
						
						
						
						
					 
					
						2009-05-01 11:38:50 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3328ec545c 
					 
					
						
						
							
							make profile notice getting use ids  
						
						
						
						
					 
					
						2009-05-01 11:27:57 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ec8dd014e3 
					 
					
						
						
							
							Merge branch '0.7.x' into querybyid  
						
						
						
						
					 
					
						2009-05-01 11:19:20 -07:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						c8fd3c5765 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						
						
						
					 
					
						2009-05-01 17:03:51 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						deb07487bd 
					 
					
						
						
							
							60 seconds hard timeout for XHR notice posting. JavaScript throws an  
						
						... 
						
						
						
						alert message to the client if the server doesn't respond back in any
way. 
						
						
					 
					
						2009-05-01 17:00:36 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b12e72ae31 
					 
					
						
						
							
							optionally add a username/password on server side for Comet  
						
						
						
						
					 
					
						2009-05-01 09:42:38 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5affe093ab 
					 
					
						
						
							
							add in_reply_to link and make HTML in source work correctly  
						
						
						
						
					 
					
						2009-05-01 08:39:47 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1a61a171cd 
					 
					
						
						
							
							Merge branch '0.7.x' into cometplugin  
						
						
						
						
					 
					
						2009-05-01 08:00:41 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a86a0e91a5 
					 
					
						
						
							
							add favor, reply, delete buttons for cometed notices  
						
						
						
						
					 
					
						2009-05-01 08:00:37 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						19a2194704 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-05-01 07:13:19 -04:00 
						 
				 
			
				
					
						
							
							
								Ori Avtalion 
							
						 
					 
					
						
						
							
						
						609ac4c224 
					 
					
						
						
							
							Fix link to identi.ca in JavaScript badge  
						
						
						
						
					 
					
						2009-05-01 07:12:37 -04:00 
						 
				 
			
				
					
						
							
							
								Ori Avtalion 
							
						 
					 
					
						
						
							
						
						c5e72e248f 
					 
					
						
						
							
							Several whitespace fixes  
						
						
						
						
					 
					
						2009-05-01 07:12:13 -04:00 
						 
				 
			
				
					
						
							
							
								Ori Avtalion 
							
						 
					 
					
						
						
							
						
						9cac6413a3 
					 
					
						
						
							
							Add s to user favorite notices  
						
						
						
						
					 
					
						2009-05-01 07:11:28 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8a142b272c 
					 
					
						
						
							
							ignore Eclipse project files  
						
						
						
						
					 
					
						2009-05-01 07:08:01 -04:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						10d42ce392 
					 
					
						
						
							
							Giving more contrast between the background colour and the laconica logo.  
						
						
						
						
					 
					
						2009-05-01 04:39:49 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						fb8340fb54 
					 
					
						
						
							
							Added laconica logo  
						
						... 
						
						
						
						Updated installation page markup 
						
						
					 
					
						2009-05-01 03:50:24 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						d30df07908 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						... 
						
						
						
						Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css 
						
						
					 
					
						2009-05-01 00:16:25 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						aee641ee1e 
					 
					
						
						
							
							make replies use new query format  
						
						
						
						
					 
					
						2009-04-29 20:45:33 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						b79fef3074 
					 
					
						
						
							
							Fixed remote subscription, broken in  fc6cedd222 
						
						
						
						
					 
					
						2009-04-29 23:43:42 +01:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						8295402fb3 
					 
					
						
						
							
							Added 'mentions' the the list of API methods requiring bare auth  
						
						
						
						
					 
					
						2009-04-29 13:16:52 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1e8ea1eb46 
					 
					
						
						
							
							Make the tag stream use ID mechanism  
						
						
						
						
					 
					
						2009-04-29 16:09:03 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e78342c484 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-04-29 12:12:28 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a4d959b8a2 
					 
					
						
						
							
							Public stream uses IDs method  
						
						... 
						
						
						
						Public stream now uses IDs method 
						
						
					 
					
						2009-04-29 12:05:31 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						10ef8a2f71 
					 
					
						
						
							
							Move algorithm for caching to Notice class  
						
						... 
						
						
						
						Moved the algorithm for notice stream caching to the Notice class. 
						
						
					 
					
						2009-04-29 11:27:45 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e85cddba45 
					 
					
						
						
							
							Ticket  #1428  - Changed replies API method to "mentions".  
						
						
						
						
					 
					
						2009-04-28 23:31:00 -07:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						f798d1ea43 
					 
					
						
						
							
							Added dirty dates to Foreign_link  
						
						
						
						
					 
					
						2009-04-28 17:08:20 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f8c34711b4 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-04-28 13:33:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fe53e780be 
					 
					
						
						
							
							Remove some debug comments in query-by-id  
						
						
						
						
					 
					
						2009-04-28 13:31:56 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c7105c2af1 
					 
					
						
						
							
							Change to avoid a join in notice inbox  
						
						... 
						
						
						
						The join in notice_inbox is causing temp-table sorting on identi.ca,
so I'm trying a finer-tuned approach. 
						
						
					 
					
						2009-04-28 13:07:05 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						5b78f95e97 
					 
					
						
						
							
							Only start daemons that are required, according to the site config. There is the potential to not start some more - see the checks in getvaliddaemons.php  
						
						
						
						
					 
					
						2009-04-28 13:30:54 +01:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						6a20ef71d3 
					 
					
						
						
							
							Fixed typo in stopdaemons.sh - was not stopping the new memcached queue handler  
						
						
						
						
					 
					
						2009-04-28 13:05:48 +01:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ce5b98ca01 
					 
					
						
						
							
							Merge branch '0.7.x' into querybyid  
						
						
						
						
					 
					
						2009-04-27 16:55:07 -04:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						df6c22c4cb 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-04-27 20:08:00 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						efe8c47d7d 
					 
					
						
						
							
							Minor CSS order/cleanup.  
						
						
						
						
					 
					
						2009-04-27 20:07:22 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8cf8298dc0 
					 
					
						
						
							
							Merge branch 'cometplugin' into 0.7.x  
						
						
						
						
					 
					
						2009-04-27 15:28:36 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7f0e57598a 
					 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x  
						
						
						
						
					 
					
						2009-04-27 14:22:53 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7405d9dfa6 
					 
					
						
						
							
							Don't add a node if it's already there  
						
						... 
						
						
						
						Try not to double-add a node on Ajax submit. Normally not a big deal,
but may happen if the CometPlugin (or in the future Strophe or other
auto-update plugins) is enabled. 
						
						
					 
					
						2009-04-26 21:16:09 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e97223b2ba 
					 
					
						
						
							
							Don't add a notice if it already exists on the page  
						
						... 
						
						
						
						Try not to interfere with Ajax posting; don't show something if it's
already on the page. 
						
						
					 
					
						2009-04-26 21:15:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						db3b56a2fd 
					 
					
						
						
							
							Display rendered HTML for a notice  
						
						... 
						
						
						
						Display the rendered HTML for a notice 
						
						
					 
					
						2009-04-26 20:50:39 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e438334c00 
					 
					
						
						
							
							add live updating for tag pages  
						
						
						
						
					 
					
						2009-04-26 18:00:06 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						192bc42c91 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-04-26 15:42:30 -04:00