Robin Millette 
							
						 
					 
					
						
						
							
						
						ba6beaa310 
					 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x  
						
						
						
						
					 
					
						2009-06-10 14:18:41 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						e120cb1a53 
					 
					
						
						
							
							Uploaded content now displays in overlay (and removed var_dump crap)  
						
						
						
						
					 
					
						2009-06-10 14:17:46 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5469e46ef5 
					 
					
						
						
							
							merge error in util.php  
						
						
						
						
					 
					
						2009-06-10 09:14:48 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c0853e3040 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						
						
						
					 
					
						2009-06-10 09:09:57 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1a077b0a7f 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-06-10 09:08:41 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f4a1cd75ab 
					 
					
						
						
							
							Remove FIXME-marked Opera links until they actually work  
						
						
						
						
					 
					
						2009-06-10 08:47:46 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ed627bb4bd 
					 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x  
						
						
						
						
					 
					
						2009-06-09 21:48:56 -07:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						207750e757 
					 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x  
						
						
						
						
					 
					
						2009-06-09 15:19:19 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						27af3c67a2 
					 
					
						
						
							
							Improve file upload and attachment interface.  
						
						
						
						
					 
					
						2009-06-09 15:18:12 -04:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						388677a6a6 
					 
					
						
						
							
							Updated notice attach UI for biz theme.  
						
						
						
						
					 
					
						2009-06-09 17:59:08 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						6af79f4755 
					 
					
						
						
							
							Updated default stylesheet for notice attach  
						
						
						
						
					 
					
						2009-06-09 17:49:24 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						3aebd847e7 
					 
					
						
						
							
							Added title and minor CSS cleanup to notice attach  
						
						
						
						
					 
					
						2009-06-09 17:34:33 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						d9e5cda35d 
					 
					
						
						
							
							Removed 404 test  
						
						
						
						
					 
					
						2009-06-09 00:09:44 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						67cb99c442 
					 
					
						
						
							
							Clearing notice_data-test and resetting notice_text-count if the  
						
						... 
						
						
						
						notice XHR. Removed hanging text URL from previous commit. 
						
						
					 
					
						2009-06-08 20:52:27 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						c5378beb83 
					 
					
						
						
							
							Revert "Clearing notice_data-test and resetting notice_text-count if the notice XHR"  
						
						... 
						
						
						
						This reverts commit b20ac7a1fe 
						
						
					 
					
						2009-06-08 20:50:13 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						b20ac7a1fe 
					 
					
						
						
							
							Clearing notice_data-test and resetting notice_text-count if the notice XHR  
						
						... 
						
						
						
						response is empty and have a 20x,30x HTTP status 
						
						
					 
					
						2009-06-08 20:45:44 +00:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						a2ca9d96d2 
					 
					
						
						
							
							Temporary workaround for silenting mysterious 200 OK error for XHR  
						
						... 
						
						
						
						notice posts.
The bug is sometimes reproduceable by sending a notice that includes
"@someusernamethatdoesntexist".
This patch doesn't throw alerts to user if server doesn't return with
an XHR response but HTTP is one of 20x, 30x. 
						
						
					 
					
						2009-06-08 18:55:23 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						265e2bd58d 
					 
					
						
						
							
							remember to convert messages  
						
						
						
						
					 
					
						2009-06-08 10:57:35 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						038cd8ac25 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-06-06 09:55:17 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d15fdac3d3 
					 
					
						
						
							
							add fixup messages for utf8  
						
						
						
						
					 
					
						2009-06-06 09:54:40 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2c81d8db76 
					 
					
						
						
							
							don't send smses to sender  
						
						
						
						
					 
					
						2009-06-05 10:07:26 -07:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						1a126032ef 
					 
					
						
						
							
							Adding clip illustration for notice attachments.  
						
						
						
						
					 
					
						2009-06-05 12:33:46 -04:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						b708b81065 
					 
					
						
						
							
							Init notice_data-attach UI for form_notice  
						
						
						
						
					 
					
						2009-06-05 00:00:04 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Moore 
							
						 
					 
					
						
						
							
						
						6658e2a2ee 
					 
					
						
						
							
							Handle the ways Twitter accepts passing the user in the query string.  
						
						
						
						
					 
					
						2009-06-04 17:57:03 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						4f5630099f 
					 
					
						
						
							
							Facebook Connect auth finally works with all major browsers!  
						
						
						
						
					 
					
						2009-06-04 21:33:04 +00:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						fe38827a76 
					 
					
						
						
							
							Remove js that crept back in, added another error string.  
						
						
						
						
					 
					
						2009-06-01 17:40:53 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						0cbd72e092 
					 
					
						
						
							
							Re-added some javascript to toggle upload field.  
						
						
						
						
					 
					
						2009-06-01 15:52:52 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						4bd195b80f 
					 
					
						
						
							
							Fixed small bug for attachment layout (css/js).  
						
						
						
						
					 
					
						2009-06-01 19:40:39 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						a39fa0ce2b 
					 
					
						
						
							
							Unnecessary JavaScript for notice form attachment  
						
						
						
						
					 
					
						2009-06-01 15:20:12 -04:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						95bcc5afa1 
					 
					
						
						
							
							Updated markup for notice form attachment  
						
						
						
						
					 
					
						2009-06-01 15:18:23 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						52a1762e58 
					 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload  
						
						
						
						
					 
					
						2009-06-01 14:03:51 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						683b835c3e 
					 
					
						
						
							
							Attachments popups for supported files are now embedded with the object xhtml tag.  
						
						
						
						
					 
					
						2009-06-01 14:02:59 -04:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						c5d105f186 
					 
					
						
						
							
							Fixed z-index for IE7 on attachment thumbnail  
						
						
						
						
					 
					
						2009-06-01 17:12:41 +00:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						f8dae2bbc9 
					 
					
						
						
							
							Refactored some attachment code and fixed upload bug in interface.  
						
						
						
						
					 
					
						2009-05-31 21:03:55 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						abe68f4318 
					 
					
						
						
							
							Added attachments config descriptions to README.  
						
						
						
						
					 
					
						2009-05-31 18:33:38 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						ebeb5f744c 
					 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload  
						
						... 
						
						
						
						Conflicts:
	js/util.js
	lib/attachmentlist.php 
						
						
					 
					
						2009-05-31 17:12:04 -04:00 
						 
				 
			
				
					
						
							
							
								Robin Millette 
							
						 
					 
					
						
						
							
						
						3e0c291810 
					 
					
						
						
							
							Added configurable options for attachments: supported mimetypes and quotas for uploads.  
						
						
						
						
					 
					
						2009-05-31 16:42:29 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4ec1c33307 
					 
					
						
						
							
							correct last-modified date for shownotice.php  
						
						
						
						
					 
					
						2009-05-30 21:45:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f134ba68ab 
					 
					
						
						
							
							free memory for each iteration DB_DataObject in fixup_utf8  
						
						
						
						
					 
					
						2009-05-30 21:04:35 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						da0d2a9745 
					 
					
						
						
							
							make fixup_utf8.php handle profiles and groups too  
						
						
						
						
					 
					
						2009-05-30 20:58:29 -04:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						36fe5a85b2 
					 
					
						
						
							
							Using lowercase for form action 'post'  
						
						
						
						
					 
					
						2009-05-30 19:47:05 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						08b98a3d4d 
					 
					
						
						
							
							Typo in label @for  
						
						
						
						
					 
					
						2009-05-30 19:45:34 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						6981a708ae 
					 
					
						
						
							
							Cross-browser update for Design form labels  
						
						
						
						
					 
					
						2009-05-30 19:43:31 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						f56f2f52e7 
					 
					
						
						
							
							Some cross-browser updates for conversation UI  
						
						
						
						
					 
					
						2009-05-30 19:42:15 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9e16b7d89b 
					 
					
						
						
							
							Use mysql_set_charset for connection instead of SET NAMES  
						
						... 
						
						
						
						PHP doesn't get the info about the charset of the connection if
you use SET NAMES. So, we use the appropriate PHP function instead. 
						
						
					 
					
						2009-05-30 13:59:57 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a262f83210 
					 
					
						
						
							
							use mysqli_set_charset instead of set names  
						
						
						
						
					 
					
						2009-05-30 12:20:42 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7b1a72da30 
					 
					
						
						
							
							take a max and min argument for fixup_utf8  
						
						
						
						
					 
					
						2009-05-30 11:52:35 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						76ee1fd5da 
					 
					
						
						
							
							Removing inbox and memcached daemon handling  
						
						
						
						
					 
					
						2009-05-30 04:40:47 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						45c58c74d4 
					 
					
						
						
							
							take debug code out of omb.php  
						
						
						
						
					 
					
						2009-05-30 03:31:26 -04:00