redmatrix 
							
						 
					 
					
						
						
							
						
						5733491ac8 
					 
					
						
						
							
							more work on items  
						
						... 
						
						
						
						and
Merge branch 'master' of https://github.com/redmatrix/redmatrix 
Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php 
						
						
					 
					
						2015-06-11 17:56:56 -07:00 
						 
				 
			
				
					
						
							
							
								redmatrix 
							
						 
					 
					
						
						
							
						
						51b89f0ed8 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/redmatrix/redmatrix  
						
						... 
						
						
						
						Conflicts:
	doc/DerivedTheme1.md
	doc/Developers.md
	doc/Features.md
	doc/Plugins.md
	doc/Privacy.md
	doc/README.md
	doc/Remove-Account.md
	doc/Translations.md
	doc/about.bb
	doc/account_basics.bb
	doc/accounts_profiles_channels_basics.bb
	doc/addons.bb
	doc/addons_gnusocial.bb
	doc/bbcode.html
	doc/campaign.bb
	doc/classRedmatrix_1_1Import_1_1Import-members.html
	doc/classRedmatrix_1_1Import_1_1Import.html
	doc/cloud.bb
	doc/connecting_to_channels.bb
	doc/connecting_to_channels.md
	doc/credits.bb
	doc/de/channels.bb
	doc/de/features.bb
	doc/de/main.bb
	doc/de/registration.bb
	doc/developers.bb
	doc/encryption.bb
	doc/external-resource-links.bb
	doc/extra_features.bb
	doc/faq_admins.bb
	doc/faq_developers.bb
	doc/faq_members.bb
	doc/features.bb
	doc/hidden_configs.bb
	doc/history.md
	doc/html/index.php
	doc/main.bb
	doc/permissions.bb
	doc/plugins.bb
	doc/problems-following-an-update.bb
	doc/profiles.bb
	doc/red2pi.bb
	doc/registration.bb
	doc/roadmap.bb
	doc/sv/main.bb
	doc/what_is_zot.bb
	doc/zot.md 
						
						
					 
					
						2015-05-13 19:23:13 -07:00 
						 
				 
			
				
					
						
							
							
								redmatrix 
							
						 
					 
					
						
						
							
						
						364025e550 
					 
					
						
						
							
							remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script.  
						
						
						
						
					 
					
						2015-05-13 17:59:45 -07:00 
						 
				 
			
				
					
						
							
							
								redmatrix 
							
						 
					 
					
						
						
							
						
						5b5f0666f9 
					 
					
						
						
							
							second pass name change  
						
						
						
						
					 
					
						2015-05-05 03:59:51 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						a496036066 
					 
					
						
						
							
							local_user => local_channel  
						
						
						
						
					 
					
						2015-01-28 20:56:04 -08:00 
						 
				 
			
				
					
						
							
							
								zottel 
							
						 
					 
					
						
						
							
						
						8ddf16f1ee 
					 
					
						
						
							
							add main_footer include to all .md files except TOS and README  
						
						
						
						
					 
					
						2014-12-08 11:06:37 +01:00 
						 
				 
			
				
					
						
							
							
								jeroenpraat 
							
						 
					 
					
						
						
							
						
						888c5dc849 
					 
					
						
						
							
							missing '  
						
						
						
						
					 
					
						2014-08-31 21:25:33 +02:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						f2daed5188 
					 
					
						
						
							
							basic gotcha's enumerated when porting Friendica addons  
						
						
						
						
					 
					
						2013-10-18 17:01:06 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						7e5570aa9c 
					 
					
						
						
							
							add hooklist to plugin page  
						
						
						
						
					 
					
						2013-10-18 15:52:17 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						78475d349b 
					 
					
						
						
							
							and did it again  
						
						
						
						
					 
					
						2013-10-16 21:51:42 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						2cf136b186 
					 
					
						
						
							
							wrong function name  
						
						
						
						
					 
					
						2013-10-16 21:50:09 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						da73813487 
					 
					
						
						
							
							advanced plugins as a stepping stone to building modules  
						
						
						
						
					 
					
						2013-10-16 21:00:14 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						06e1e6a1b6 
					 
					
						
						
							
							minor edits  
						
						
						
						
					 
					
						2013-10-16 20:30:56 -07:00 
						 
				 
			
				
					
						
							
							
								friendica 
							
						 
					 
					
						
						
							
						
						aee569fc47 
					 
					
						
						
							
							first cut at plugin author's guide  
						
						
						
						
					 
					
						2013-10-16 20:04:52 -07:00 
						 
				 
			
				
					
						
							
							
								Thomas Willingham 
							
						 
					 
					
						
						
							
						
						96fa691f8a 
					 
					
						
						
							
							Doco  
						
						
						
						
					 
					
						2013-05-14 19:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								Klaus Weidenbach 
							
						 
					 
					
						
						
							
						
						1f9fe8b5ee 
					 
					
						
						
							
							Remove Gravatar from core and add new hook avatar_lookup.  
						
						... 
						
						
						
						This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow? 
						
						
					 
					
						2012-04-09 21:22:09 +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 
							
						 
					 
					
						
						
							
						
						94c7289a3f 
					 
					
						
						
							
							updates to plugin docs  
						
						
						
						
					 
					
						2012-02-13 19:06:15 -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 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						02a1fdacd7 
					 
					
						
						
							
							strip duplicate code blocks bb2d*  
						
						
						
						
					 
					
						2011-11-08 15:38:06 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						6d507a840a 
					 
					
						
						
							
							some doc updates  
						
						
						
						
					 
					
						2011-11-08 14:12:01 -08:00 
						 
				 
			
				
					
						
							
							
								Friendika 
							
						 
					 
					
						
						
							
						
						767f165965 
					 
					
						
						
							
							local documentation library  
						
						
						
						
					 
					
						2011-04-13 07:07:21 -07:00