friendica 
							
						 
					 
					
						
						
							
						
						3c4e6d3461 
					 
					
						
						
							
							bug  #369  - show contacts who are not in any groups  
						
						
						
						
					 
					
						2012-04-12 23:06:41 -07: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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						ac3df5fece 
					 
					
						
						
							
							dynamic group edit buttons  
						
						
						
						
					 
					
						2011-12-01 16:33:53 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						29b5d398fd 
					 
					
						
						
							
							everybody group gets id 0  
						
						
						
						
					 
					
						2011-11-30 23:01:42 -08:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						335c0cddcf 
					 
					
						
						
							
							diaspora reshared lists rendering as html  
						
						
						
						
					 
					
						2011-11-23 01:44:07 -08:00 
						 
				 
			
				
					
						
							
							
								Fabio Comuni 
							
						 
					 
					
						
						
							
						
						a86fd26bd8 
					 
					
						
						
							
							more work on quattro. remove html from php for groups and saved searches widgets.  
						
						
						
						
					 
					
						2011-11-21 12:34:22 +01:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						02f21fb74c 
					 
					
						
						
							
							some testbubble fixes  
						
						
						
						
					 
					
						2011-11-10 19:53:13 -08:00 
						 
				 
			
				
					
						
							
							
								Devlon Duthie 
							
						 
					 
					
						
						
							
						
						cb1c6dd1e3 
					 
					
						
						
							
							really commiting files this time, still getting the hang of git.  
						
						... 
						
						
						
						some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks 
						
						
					 
					
						2011-09-25 13:20:19 -05:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						3a2bf8ab7c 
					 
					
						
						
							
							w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator  
						
						
						
						
					 
					
						2011-09-23 03:12:31 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						5899c9f406 
					 
					
						
						
							
							bug  #157  - allow deleted group to be revived, but warn of side effects  
						
						
						
						
					 
					
						2011-09-18 06:20:18 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						1248a561e1 
					 
					
						
						
							
							group_public_members sql query typo  
						
						
						
						
					 
					
						2011-09-13 15:26:47 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						f5c9de19d5 
					 
					
						
						
							
							network insecure warnings on feeds  
						
						
						
						
					 
					
						2011-09-09 01:37:46 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						481853d2cc 
					 
					
						
						
							
							saved searches on network page  
						
						
						
						
					 
					
						2011-09-04 17:35:06 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						e440353013 
					 
					
						
						
							
							truncate overflow text on acl selector items (3 themes)  
						
						
						
						
					 
					
						2011-09-04 05:41:11 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						3b4da00495 
					 
					
						
						
							
							fix it again  
						
						
						
						
					 
					
						2011-08-23 18:28:17 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						b41592f556 
					 
					
						
						
							
							fix group public members  
						
						
						
						
					 
					
						2011-08-23 18:22:15 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						56d64316f4 
					 
					
						
						
							
							diaspora photos ?  
						
						
						
						
					 
					
						2011-08-23 18:17:35 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						684ebd2ed8 
					 
					
						
						
							
							enhance random_string, block public email replies  
						
						
						
						
					 
					
						2011-08-10 21:06:35 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						e22e823e93 
					 
					
						
						
							
							allow group selection from contact edit page  
						
						
						
						
					 
					
						2011-08-02 22:39:35 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						24836f2966 
					 
					
						
						
							
							improvied group highlighting, move new group link down  
						
						
						
						
					 
					
						2011-07-02 02:47:01 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						813d6c453c 
					 
					
						
						
							
							missed block  
						
						
						
						
					 
					
						2011-07-01 06:26:46 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						f53a2d6da9 
					 
					
						
						
							
							add group highlight to other pages  
						
						
						
						
					 
					
						2011-07-01 06:23:09 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						b1aa77584f 
					 
					
						
						
							
							indicate currently selected group in group picker  
						
						
						
						
					 
					
						2011-07-01 06:14:15 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						b8c4d73377 
					 
					
						
						
							
							show group affiliations in contact editor  
						
						
						
						
					 
					
						2011-05-31 19:24:26 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						dd4d5707b0 
					 
					
						
						
							
							order groups by name  
						
						
						
						
					 
					
						2011-05-29 21:45:00 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						a01c40a845 
					 
					
						
						
							
							no insecure warning on FB connections  
						
						
						
						
					 
					
						2011-04-26 05:45:53 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						ab099e9102 
					 
					
						
						
							
							email integration, cont.  
						
						
						
						
					 
					
						2011-04-17 23:27:11 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						f04e2e7044 
					 
					
						
						
							
							edit group links on network page  
						
						
						
						
					 
					
						2011-04-12 18:22:58 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						61915a524d 
					 
					
						
						
							
							first cut at group chooser UI  
						
						
						
						
					 
					
						2011-04-12 01:31:55 -07:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						9b50b0e16f 
					 
					
						
						
							
							Public exposure warning on affected network group pages. config-able so a plugin can shut it up.  
						
						
						
						
					 
					
						2011-04-03 20:41:40 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						f0b6400584 
					 
					
						
						
							
							more lint  
						
						
						
						
					 
					
						2010-10-31 16:38:22 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						d2c6fa3fa1 
					 
					
						
						
							
							group removal  
						
						
						
						
					 
					
						2010-08-11 04:14:47 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						f4e634ad52 
					 
					
						
						
							
							group drop  
						
						
						
						
					 
					
						2010-08-11 01:48:43 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						2e5fb9c37e 
					 
					
						
						
							
							lots of formatting, bug fixes on profile updates, i18n  
						
						
						
						
					 
					
						2010-07-27 19:27:14 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						52a2c7eb46 
					 
					
						
						
							
							group select on network page  
						
						
						
						
					 
					
						2010-07-25 16:27:22 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						d20e1a6f93 
					 
					
						
						
							
							feed related  
						
						
						
						
					 
					
						2010-07-14 23:04:10 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						7e16f8cdae 
					 
					
						
						
							
							groups and acls  
						
						
						
						
					 
					
						2010-07-12 23:08:07 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						83dc89d859 
					 
					
						
						
							
							group creation  
						
						
						
						
					 
					
						2010-07-11 06:06:30 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						7a21a000a2 
					 
					
						
						
							
							lots of little stuff  
						
						
						
						
					 
					
						2010-07-11 02:52:47 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Macgirvin 
							
						 
					 
					
						
						
							
						
						f5826105bf 
					 
					
						
						
							
							group work, dfrn_poll  
						
						
						
						
					 
					
						2010-07-05 03:33:02 -07:00