root 
								
							 
						 
						
							
							
								
							
							
	325343a492  
						 
						
							
							
								
								
								Update install wizard  
							
							 
							
							... 
							
							
							
							- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section 
							
						 
						
							2012-05-23 07:38:31 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas Willingham 
								
							 
						 
						
							
							
								
							
							
	a5f78cf655  
						 
						
							
							
								
								
								modified:   images/smiley-thumbsup.gif  
							
							 
							
							... 
							
							
							
							Restored some yellow where there shouldn't have been transparency.
Probably introduced by me in the first place. 
							
						 
						
							2012-05-01 21:05:55 +01: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 
								
							 
						 
						
							
							
								
							
							
	7ef1ed2d70  
						 
						
							
							
								
								
								theme screenshots  
							
							 
							
							
							
						 
						
							2012-03-25 17:55:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	894278dbcc  
						 
						
							
							
								
								
								change default profile photo to something more interesting than a reddish brown square  
							
							 
							
							
							
						 
						
							2012-03-20 15:41:06 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	6ae5962b00  
						 
						
							
							
								
								
								More improved transparency for smilies  
							
							 
							
							
							
						 
						
							2012-03-09 01:49:12 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	dadf80f644  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	images/smiley-beard.png 
							
						 
						
							2012-03-06 23:56:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	22624917e0  
						 
						
							
							
								
								
								improved smiley transparency  
							
							 
							
							
							
						 
						
							2012-03-06 23:54:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	415ca107fd  
						 
						
							
							
								
								
								Merge branch 'master', remote-tracking branch 'remotes/upstream/master'  
							
							 
							
							... 
							
							
							
							* remotes/upstream/master:
  fix html reshares when editplain in use
* master: 
							
						 
						
							2012-03-06 18:38:44 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	a265afe7eb  
						 
						
							
							
								
								
								added beard smileys  
							
							 
							
							
							
						 
						
							2012-03-06 20:44:53 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	8b0dd349f5  
						 
						
							
							
								
								
								add img  
							
							 
							
							
							
						 
						
							2012-03-06 08:31:54 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tomtom84 
								
							 
						 
						
							
							
								
							
							
	1dfd5c4f85  
						 
						
							
							
								
								
								Merge pull request  #67  from tomtom84/master  
							
							 
							
							... 
							
							
							
							fixes in diabook theme 
							
						 
						
							2012-03-03 10:09:28 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tommy tomson 
								
							 
						 
						
							
							
								
							
							
	d4ac1f2a9c  
						 
						
							
							
								
								
								fixed star/unstar  
							
							 
							
							
							
						 
						
							2012-03-03 19:07:55 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	9c698b1a60  
						 
						
							
							
								
								
								fix for comment-wwedit-wrapper CSS class in tpl had a stray $  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-03-02 12:00:16 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Abinoam P. Marques Jr 
								
							 
						 
						
							
							
								
							
							
	2219c1b581  
						 
						
							
							
								
								
								friendica.svg - Friendika -> Friendica  
							
							 
							
							
							
						 
						
							2012-02-20 19:38:42 -03:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	49179f9033  
						 
						
							
							
								
								
								add :headdesk and fix doc/Pages.md to remove the absolute URL to /  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-02-19 05:17:26 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	7dcef67492  
						 
						
							
							
								
								
								facepalm smiley  
							
							 
							
							
							
						 
						
							2012-02-16 15:15:28 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	fe3e8ee854  
						 
						
							
							
								
								
								quattro: icons for attachments  
							
							 
							
							
							
						 
						
							2012-02-15 11:10:02 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	c506bb42a9  
						 
						
							
							
								
								
								:coffee extended smilie  
							
							 
							
							
							
						 
						
							2012-02-07 17:03:09 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	3d099bd99a  
						 
						
							
							
								
								
								beer  
							
							 
							
							
							
						 
						
							2012-02-06 01:08:00 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	1f074cb44c  
						 
						
							
							
								
								
								shaka, slackr theme  
							
							 
							
							
							
						 
						
							2012-01-23 15:07:40 -08: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 
								
							 
						 
						
							
							
								
							
							
	99fc4309be  
						 
						
							
							
								
								
								slightly better group icon  
							
							 
							
							
							
						 
						
							2012-01-10 21:09:38 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	a9670cbb7d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/master'  
							
							 
							
							
							
						 
						
							2012-01-06 09:10:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	48a5a2484e  
						 
						
							
							
								
								
								new smiley  
							
							 
							
							
							
						 
						
							2012-01-04 00:04:19 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	84bbf5d3bd  
						 
						
							
							
								
								
								icons: lock and unlock  
							
							 
							
							
							
						 
						
							2011-12-19 18:00:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	834639ebab  
						 
						
							
							
								
								
								\o/ smiley  
							
							 
							
							
							
						 
						
							2011-12-11 16:58:36 -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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	f5bfe5a1a3  
						 
						
							
							
								
								
								quattro: tags style  
							
							 
							
							
							
						 
						
							2011-11-15 17:42:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	6d507a840a  
						 
						
							
							
								
								
								some doc updates  
							
							 
							
							
							
						 
						
							2011-11-08 14:12:01 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	00c342e13d  
						 
						
							
							
								
								
								Merge branch 'oauthapi'  
							
							 
							
							
							
						 
						
							2011-11-07 17:41:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	967f8b575e  
						 
						
							
							
								
								
								New icon 'plugin'  
							
							 
							
							
							
						 
						
							2011-11-07 17:34:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1aa1cd2cf5  
						 
						
							
							
								
								
								soften the content-types  
							
							 
							
							
							
						 
						
							2011-10-25 15:52:54 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	718a9009be  
						 
						
							
							
								
								
								new icon "play"  
							
							 
							
							
							
						 
						
							2011-10-24 17:27:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	d80c0da3c0  
						 
						
							
							
								
								
								add custom style to object tag in tinymce  
							
							 
							
							
							
						 
						
							2011-10-21 16:26:57 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	e986fc3e30  
						 
						
							
							
								
								
								quattro: actions in wall_item  
							
							 
							
							... 
							
							
							
							less html in conversation.php
removed unused tpls
fixed old themes 
							
						 
						
							2011-09-27 16:54:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	5792b3d358  
						 
						
							
							
								
								
								Merge branch 'master' into newui  
							
							 
							
							
							
						 
						
							2011-09-26 11:42:48 +02: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	634e52a671  
						 
						
							
							
								
								
								added testbubble mai, and modified some core fle to add classes  
							
							 
							
							
							
						 
						
							2011-09-24 23:54:23 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	672ecc7f7d  
						 
						
							
							
								
								
								more tag infrastructure  
							
							 
							
							
							
						 
						
							2011-09-18 22:42:47 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	80af4f3fe6  
						 
						
							
							
								
								
								new icons  
							
							 
							
							
							
						 
						
							2011-09-16 12:50:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	abd65e00ab  
						 
						
							
							
								
								
								Load infos and notices via ping and show them with js popup  
							
							 
							
							
							
						 
						
							2011-09-05 14:01:21 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	c308ac49af  
						 
						
							
							
								
								
								More icons  
							
							 
							
							
							
						 
						
							2011-09-05 11:13:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	058e329dfb  
						 
						
							
							
								
								
								Fix profile vcard and style  
							
							 
							
							
							
						 
						
							2011-09-01 12:37:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	bdf42473a0  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendika/master' into newui  
							
							 
							
							
							
						 
						
							2011-08-17 17:35:37 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	06408664db  
						 
						
							
							
								
								
								Diaspora logo  
							
							 
							
							
							
						 
						
							2011-08-10 05:28:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1bfe1283aa  
						 
						
							
							
								
								
								crypto stuff  
							
							 
							
							
							
						 
						
							2011-08-09 18:55:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	93eda9d9c1  
						 
						
							
							
								
								
								Initial work on new UI  
							
							 
							
							
							
						 
						
							2011-07-22 17:37:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	0a3ae96093  
						 
						
							
							
								
								
								add icons to acl selector  
							
							 
							
							
							
						 
						
							2011-07-19 17:15:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	9debbfde1e  
						 
						
							
							
								
								
								fix group image name  
							
							 
							
							
							
						 
						
							2011-07-19 16:25:40 +02:00