tommy tomson 
								
							 
						 
						
							
							
								
							
							
	f980b79edc  
						 
						
							
							
								
								
								new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator...  
							
							... 
							
							
							
							profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox... 
							
						 
						
							2012-04-06 11:19:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	355c42cb30  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/friendica/friendica  
							
							... 
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 
						
							2012-04-05 13:39:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	c34a71eba6  
						 
						
							
							
								
								
								some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus  
							
							
							
						 
						
							2012-03-31 05:51:56 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	4c585f759f  
						 
						
							
							
								
								
								theme description with preview (non-translatable unfortunately)  
							
							
							
						 
						
							2012-03-26 18:15:10 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	ca8769e193  
						 
						
							
							
								
								
								Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.  
							
							
							
						 
						
							2012-03-26 22:03:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	c88674aaf2  
						 
						
							
							
								
								
								theme preview for end users  
							
							
							
						 
						
							2012-03-25 19:05:14 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	1780fff161  
						 
						
							
							
								
								
								diabook: theme.php  
							
							... 
							
							
							
							remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links) 
							
						 
						
							2012-03-23 14:09:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	3ad02a749b  
						 
						
							
							
								
								
								make autocomplete work with updated tinymce  
							
							
							
						 
						
							2012-03-21 05:27:08 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tobias Hößl 
								
							 
						 
						
							
							
								
							
							
	453b5b46a3  
						 
						
							
							
								
								
								CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)  
							
							
							
						 
						
							2012-03-18 15:44:33 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	395a9530dc  
						 
						
							
							
								
								
								still getting parent relays on remote systems  
							
							
							
						 
						
							2012-03-07 18:23:55 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	3339428987  
						 
						
							
							
								
								
								fix @mention autocomplete in comments  
							
							
							
						 
						
							2012-03-03 00:12:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	9b6afc2a38  
						 
						
							
							
								
								
								one more attempt  
							
							
							
						 
						
							2012-02-25 17:07:38 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	35b5850af7  
						 
						
							
							
								
								
								missed a spot  
							
							
							
						 
						
							2012-02-25 17:04:31 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	da1411af47  
						 
						
							
							
								
								
								do not set notify popup empty anymore (though another solution is needed for firehose mode)  
							
							
							
						 
						
							2012-02-25 16:16:52 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	4839c235da  
						 
						
							
							
								
								
								theme seen,unseen notifications  
							
							
							
						 
						
							2012-02-25 03:28:07 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	41636a50aa  
						 
						
							
							
								
								
								new notify sort of working in testbubble  
							
							
							
						 
						
							2012-02-22 23:34:30 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Abinoam P. Marques Jr 
								
							 
						 
						
							
							
								
							
							
	cec0542cdd  
						 
						
							
							
								
								
								js/fk.autocomplete.js - Friendika -> Friendica  
							
							
							
						 
						
							2012-02-20 19:38:42 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	9047840ec2  
						 
						
							
							
								
								
								nav: fix "See all notifications"  
							
							
							
						 
						
							2012-01-23 09:23:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	8aa2552372  
						 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)  
							
							
							
						 
						
							2012-01-18 16:21:30 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	7011f71e8f  
						 
						
							
							
								
								
								post preview  
							
							
							
						 
						
							2012-01-09 20:03:00 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	a13156c0f3  
						 
						
							
							
								
								
								bypass D* markdown bug for now  
							
							
							
						 
						
							2012-01-09 18:52:49 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	b99cb511ca  
						 
						
							
							
								
								
								comment preview  
							
							
							
						 
						
							2012-01-05 16:38:24 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	e764990ce4  
						 
						
							
							
								
								
								better handling of the display of conflicting group permissions  
							
							
							
						 
						
							2011-12-21 18:04:24 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	2e088aad8d  
						 
						
							
							
								
								
								bug  #246  
							
							
							
						 
						
							2011-12-20 19:11:46 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	7fbfbdae07  
						 
						
							
							
								
								
								audio/video bb tags showing up on Diaspora  
							
							
							
						 
						
							2011-12-20 17:01:41 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	001e402311  
						 
						
							
							
								
								
								simplify live update  
							
							
							
						 
						
							2011-12-14 17:23:41 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	9768adf719  
						 
						
							
							
								
								
								testing  
							
							
							
						 
						
							2011-12-14 16:43:37 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	84fd2a1501  
						 
						
							
							
								
								
								live update glitches cont.  
							
							
							
						 
						
							2011-12-14 15:51:13 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	431a4abd25  
						 
						
							
							
								
								
								name change stragglers, fix newmember links, liveupdate glitch  
							
							
							
						 
						
							2011-12-14 14:17:48 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	4f2d516920  
						 
						
							
							
								
								
								liveupdate: only modify existing conversations if not page1  
							
							
							
						 
						
							2011-12-13 15:21:11 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	bda7ca2f36  
						 
						
							
							
								
								
								clearup update backlog after commenting  
							
							
							
						 
						
							2011-12-12 18:08:09 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	80428a33d5  
						 
						
							
							
								
								
								refactor updates  
							
							
							
						 
						
							2011-12-12 14:39:25 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zottel 
								
							 
						 
						
							
							
								
							
							
	720787b772  
						 
						
							
							
								
								
								Switch to jquery 1.7.1  
							
							
							
						 
						
							2011-12-12 08:11:35 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	4f254ffb5b  
						 
						
							
							
								
								
								system support for personal configurable ajax update interval  
							
							
							
						 
						
							2011-12-11 20:32:43 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zottel 
								
							 
						 
						
							
							
								
							
							
	237b4c74c2  
						 
						
							
							
								
								
								unpause the stream when posting a comment or liking/disliking  
							
							
							
						 
						
							2011-12-06 01:22:59 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									zottel 
								
							 
						 
						
							
							
								
							
							
	c5c99089ff  
						 
						
							
							
								
								
								Added stopping automatic reloads with Ctrl-Space. Will stay stopped till next Ctrl-Space.  
							
							
							
						 
						
							2011-12-06 00:00:27 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	4b95e8ebe8  
						 
						
							
							
								
								
								rework the liveupdate fixes - what a mess  
							
							
							
						 
						
							2011-11-24 18:26:06 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	cd81dcfc9d  
						 
						
							
							
								
								
								nasty stuff...  
							
							
							
						 
						
							2011-11-24 17:00:20 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	dcb209152d  
						 
						
							
							
								
								
								more thread update fixes  
							
							
							
						 
						
							2011-11-24 16:54:10 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	9e8053e3bd  
						 
						
							
							
								
								
								fixing conversation updates  
							
							
							
						 
						
							2011-11-24 16:42:12 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	8aae7f047d  
						 
						
							
							
								
								
								comments collapsing on page update  
							
							
							
						 
						
							2011-11-24 13:54:21 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	b795ce4fe7  
						 
						
							
							
								
								
								little stuff - name change, live updates, new network types  
							
							
							
						 
						
							2011-11-23 23:17:26 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	7a259d4acb  
						 
						
							
							
								
								
								ensure comment counts update after refactor of collapsed comments  
							
							
							
						 
						
							2011-11-23 14:03:53 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	cb05e677a9  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/master'  
							
							
							
						 
						
							2011-11-21 13:52:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	d4911f15e9  
						 
						
							
							
								
								
								don't allow space in autocomplete nickname  
							
							
							
						 
						
							2011-11-18 23:02:07 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	79603e3146  
						 
						
							
							
								
								
								expire settings for items, notes and photos.  
							
							... 
							
							
							
							show default privacy acl in popup 
							
						 
						
							2011-11-17 15:53:59 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	240a3431cc  
						 
						
							
							
								
								
								longer lifetime for system message popups so you have time to read them  
							
							
							
						 
						
							2011-11-12 14:25:04 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	6e52ea805b  
						 
						
							
							
								
								
								moved tiptip a few more pixels away to reduce flashing  
							
							
							
						 
						
							2011-11-12 12:42:19 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	ab6bf767df  
						 
						
							
							
								
								
								Merge pull request  #3  from fabrixxm/master  
							
							... 
							
							
							
							fix for #191  and some other 
							
						 
						
							2011-11-12 04:06:14 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	78bfb8b14e  
						 
						
							
							
								
								
								some works on autocomplete (return with no selection = cancel, tab = select next)  
							
							
							
						 
						
							2011-11-11 22:40:19 -08:00