Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ec90a9e6ad  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1602-diaspora  
							
							 
							
							
							
						 
						
							2016-03-24 16:19:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	799ff77797  
						 
						
							
							
								
								
								API: Support for the conversation api call from GNU Social  
							
							 
							
							
							
						 
						
							2016-03-23 10:24:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	16b92af71f  
						 
						
							
							
								
								
								Retraction do work as well  
							
							 
							
							
							
						 
						
							2016-03-17 12:24:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	56cb6cc897  
						 
						
							
							
								
								
								Removed just more old diaspora function calls.  
							
							 
							
							
							
						 
						
							2016-03-14 20:53:44 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b5851931d1  
						 
						
							
							
								
								
								Hotkey documentation  
							
							 
							
							
							
						 
						
							2016-03-12 08:57:07 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bc21fca345  
						 
						
							
							
								
								
								Remove the setting description from the documentation since it isn't a hidden one anymore.  
							
							 
							
							
							
						 
						
							2016-03-11 23:44:46 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	d30d13959b  
						 
						
							
							
								
								
								Merge pull request  #2328  from rabuzarus/0602_contact_profile  
							
							 
							
							... 
							
							
							
							polishing of the contact-edit page 
							
						 
						
							2016-03-06 19:56:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	497c40e674  
						 
						
							
							
								
								
								Merge pull request  #2383  from tobiasd/20160225  
							
							 
							
							... 
							
							
							
							a missing break 
							
						 
						
							2016-02-29 11:11:54 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	08a7802112  
						 
						
							
							
								
								
								old location might vanish, vinzv moved the GS API docs over here  
							
							 
							
							
							
						 
						
							2016-02-28 08:30:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f4b0e9316e  
						 
						
							
							
								
								
								a missing break  
							
							 
							
							
							
						 
						
							2016-02-25 21:37:37 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	48642a8544  
						 
						
							
							
								
								
								Merge pull request  #2379  from annando/1602-abstract-doc  
							
							 
							
							... 
							
							
							
							Some documentation for the usage of the "abstract" element. 
							
						 
						
							2016-02-25 13:15:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1b14b22b76  
						 
						
							
							
								
								
								Client section in DeveloperIntro docs  
							
							 
							
							
							
						 
						
							2016-02-24 20:46:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	68d7beb298  
						 
						
							
							
								
								
								Welcome to the live editing and commenting of the pull request ;-)  
							
							 
							
							
							
						 
						
							2016-02-24 07:43:13 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8369e6ce59  
						 
						
							
							
								
								
								Clarification between statusnet and GNU Social.  
							
							 
							
							
							
						 
						
							2016-02-24 07:37:18 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	db92663466  
						 
						
							
							
								
								
								One line, one sentence  
							
							 
							
							
							
						 
						
							2016-02-24 07:33:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a153f49920  
						 
						
							
							
								
								
								clarification to the docs  
							
							 
							
							
							
						 
						
							2016-02-24 06:27:31 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	86339cdb97  
						 
						
							
							
								
								
								Some documentation for the usage of the "abstract" element.  
							
							 
							
							
							
						 
						
							2016-02-23 22:45:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	0db83b9586  
						 
						
							
							
								
								
								contactedit-actions-button: move repair back to tabbar  
							
							 
							
							
							
						 
						
							2016-02-23 19:19:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4ee15cc682  
						 
						
							
							
								
								
								Merge pull request  #2334  from fabrixxm/feature_autoloader  
							
							 
							
							... 
							
							
							
							Autoloader 
							
						 
						
							2016-02-13 12:27:24 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	a7498ef50d  
						 
						
							
							
								
								
								doc: add quick intro to autoloading  
							
							 
							
							
							
						 
						
							2016-02-13 10:57:37 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	45c4e3455e  
						 
						
							
							
								
								
								docs: add brief autoloading help page, fix smarty3 help page name  
							
							 
							
							
							
						 
						
							2016-02-12 09:25:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ef0f826fd0  
						 
						
							
							
								
								
								Merge pull request  #2325  from fabrixxm/api_ping  
							
							 
							
							... 
							
							
							
							Api for notifications 
							
						 
						
							2016-02-10 23:47:11 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	902820b30d  
						 
						
							
							
								
								
								Added documentation  
							
							 
							
							
							
						 
						
							2016-02-10 07:56:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	04dceb9551  
						 
						
							
							
								
								
								Merge branch 'develop' into api_ping  
							
							 
							
							
							
						 
						
							2016-02-09 14:06:57 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	743f2e0391  
						 
						
							
							
								
								
								Merge develop into 0602_contact_profile  
							
							 
							
							... 
							
							
							
							Conflicts:
	mod/contacts.php 
							
						 
						
							2016-02-09 13:44:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b5100b3154  
						 
						
							
							
								
								
								Merge pull request  #2332  from annando/1602-no-guid  
							
							 
							
							... 
							
							
							
							Get rid of the "guid" table. We don't need it anymore. 
							
						 
						
							2016-02-09 13:40:05 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7b2fadcf43  
						 
						
							
							
								
								
								Get rid of the "guid" table. We don't need it anymore.  
							
							 
							
							
							
						 
						
							2016-02-09 10:21:10 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	5250fed447  
						 
						
							
							
								
								
								Revert "Merge pull request  #2319  from stieben/develop"  
							
							 
							
							... 
							
							
							
							This reverts commit 9330a6994c , reversing
changes made to ecfb6ec924 .
But it keeps changes to doc/Plugins.md and doc/de/Plugins.md 
							
						 
						
							2016-02-09 09:39:29 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	c1c21ada0a  
						 
						
							
							
								
								
								contactedit-actions-button: remove contact tabs which aren't needed anymore  
							
							 
							
							
							
						 
						
							2016-02-08 23:51:51 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	a283691149  
						 
						
							
							
								
								
								api docs: fix indentation  
							
							 
							
							
							
						 
						
							2016-02-08 10:34:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	870d2f844d  
						 
						
							
							
								
								
								Update API docs  
							
							 
							
							... 
							
							
							
							Add `friendica/notification` and `friendica/notification/seen` endpoints
Fix some list rendering issues
Move all `friendica/*` endpoints under "Implemented API calls (not compatible with other APIs)" section
Add info about permitted HTTP methods and required auth 
							
						 
						
							2016-02-08 10:22:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	a81d929cdf  
						 
						
							
							
								
								
								Minor documentation update, as requested by @tobiasd  
							
							 
							
							
							
						 
						
							2016-02-05 14:11:10 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	48e6ff21aa  
						 
						
							
							
								
								
								Added the possibility for themes to override core module functions  
							
							 
							
							
							
						 
						
							2016-02-04 21:45:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	acefb84681  
						 
						
							
							
								
								
								Improved documentation formatting (of Plugins.md)  
							
							 
							
							
							
						 
						
							2016-02-04 19:37:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Silke Meyer 
								
							 
						 
						
							
							
								
							
							
	c715877261  
						 
						
							
							
								
								
								Slightly updated docs about Let's Encrypt  
							
							 
							
							
							
						 
						
							2016-02-03 20:47:41 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c7691ce68d  
						 
						
							
							
								
								
								OStatus clarification  
							
							 
							
							
							
						 
						
							2016-01-25 09:58:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	47a936eaa3  
						 
						
							
							
								
								
								groups vs forums and mentioning those  
							
							 
							
							
							
						 
						
							2016-01-24 07:42:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	924bf238df  
						 
						
							
							
								
								
								typos  
							
							 
							
							
							
						 
						
							2016-01-22 09:02:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	76d588f929  
						 
						
							
							
								
								
								typos  
							
							 
							
							
							
						 
						
							2016-01-22 09:00:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	420e3021f9  
						 
						
							
							
								
								
								clarification to the forum docs  
							
							 
							
							
							
						 
						
							2016-01-22 07:42:03 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	15febca93d  
						 
						
							
							
								
								
								Update to the translation docs (email templates and language selection problems in Safari)  
							
							 
							
							
							
						 
						
							2016-01-22 07:36:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3eef0cea3d  
						 
						
							
							
								
								
								small additions to the docs, part of  #2194  
							
							 
							
							
							
						 
						
							2016-01-19 10:02:05 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	90a8d6f0f5  
						 
						
							
							
								
								
								Several performance improvements  
							
							 
							
							
							
						 
						
							2016-01-15 23:27:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	012107f5f7  
						 
						
							
							
								
								
								Table documentation added  
							
							 
							
							
							
						 
						
							2016-01-11 20:17:31 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5ab2786c00  
						 
						
							
							
								
								
								Get rid of the table "unique_contacts"  
							
							 
							
							
							
						 
						
							2016-01-06 22:23:12 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	c2d1016014  
						 
						
							
							
								
								
								remove linebreak in doc/api.md  
							
							 
							
							
							
						 
						
							2015-12-28 18:30:28 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	f579b2af55  
						 
						
							
							
								
								
								Fix TOC links href, no TOC in home  
							
							 
							
							
							
						 
						
							2015-12-28 10:24:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	1776b19dbf  
						 
						
							
							
								
								
								Add table of content in aside of help pages  
							
							 
							
							
							
						 
						
							2015-12-28 10:24:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	e752d41389  
						 
						
							
							
								
								
								Update API docs  
							
							 
							
							
							
						 
						
							2015-12-28 10:23:06 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	cf86162a08  
						 
						
							
							
								
								
								Merge pull request  #2214  from rabuzarus/2612_db_docu  
							
							 
							
							... 
							
							
							
							add db documentation to the help pages 
							
						 
						
							2015-12-28 10:22:33 +01:00