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 
						 
				 
			
				
					
						
							
							
								RedSwede 
							
						 
					 
					
						
						
							
						
						1d7bd0ba90 
					 
					
						
						
							
							Looked through the whole doc/-folder more or less. Added and commented a few things here and there.  
						
						... 
						
						
						
						One question:
* Is the crypto-js E2EE or not? If the devs agree that it is NOT then I propose
removing this from the help files and gui. 
						
						
					 
					
						2015-01-17 00:19:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tobias Luther 
							
						 
					 
					
						
						
							
						
						1a118a0828 
					 
					
						
						
							
							Tidied the folder from old backups  
						
						... 
						
						
						
						created new files for a quick explanation of the use of accounts, profiles, channels
added FAQ for users, admins and developers (the last one might not be exactly necessary?)
created a file to explain posting for new users
created new file to explain nomadic identities for users
modified main.bb 
						
						
					 
					
						2014-06-29 21:07:42 +02:00