| 
							
						 | 
						
							
							
								
							
							
	59c12db020
						 | 
						
							
							
								
								
								Merge pull request #2949 from silke/vagrant-1604
							
							
							
							
							
							
							
							Added Vagrant for Ubuntu 16.04 
							
						 | 
						
							2016-11-20 15:39:31 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Silke Meyer
								
							 
						 | 
						
							
							
								
							
							
	bb3385a7e3
						 | 
						
							
							
								
								
								Adapted documentation for Vagrant multiple machines
							
							
							
							
							
						 | 
						
							2016-11-19 16:09:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1cc0cc5b82
						 | 
						
							
							
								
								
								DE update of the SSL doc
							
							
							
							
							
						 | 
						
							2016-11-19 15:51:12 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Silke Meyer
								
							 
						 | 
						
							
							
								
							
							
	5d779941e7
						 | 
						
							
							
								
								
								Updated SSL documentation
							
							
							
							
							
						 | 
						
							2016-11-19 13:28:45 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fca72c4996
						 | 
						
							
							
								
								
								DE translation of the BBCode reference, small stuff on the EN version
							
							
							
							
							
						 | 
						
							2016-11-09 14:05:33 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a6776f0cc1
						 | 
						
							
							
								
								
								Merge pull request #2885 from Hypolite/improvement/bbcode-documentation
							
							
							
							
							
							
							
							bbcode documentation: minor style changes 
							
						 | 
						
							2016-11-04 17:15:17 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	3d29b7745c
						 | 
						
							
							
								
								
								bbcode documentation: minor style changes
							
							
							
							
							
						 | 
						
							2016-11-04 11:20:47 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	75166cae27
						 | 
						
							
							
								
								
								Merge pull request #2882 from Hypolite/improvement/bbcode-documentation
							
							
							
							
							
							
							
							BBCodes documentation improvement 
							
						 | 
						
							2016-11-04 02:34:29 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	106f003447
						 | 
						
							
							
								
								
								bbcode documentation: BBCodes.md complete rewrite
							
							
							
							
							
							
							
							- Switched to table display to put BBCodes and result side-by-side
- Added all missing BBCodes 
							
						 | 
						
							2016-11-02 22:42:19 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	8e50254bb9
						 | 
						
							
							
								
								
								Merge branch 'develop' into improvement/ping-performance
							
							
							
							
							
						 | 
						
							2016-10-28 22:26:38 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	bc407080d2
						 | 
						
							
							
								
								
								ping.php performance: improve documentation and formatting
							
							
							
							
							
						 | 
						
							2016-10-28 22:14:51 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	967ecb4205
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1610-performance
							
							
							
							
							
							
							
							Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php 
							
						 | 
						
							2016-10-25 16:16:01 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	8da5a23267
						 | 
						
							
							
								
								
								Improved doc formatting
							
							
							
							
							
						 | 
						
							2016-10-24 11:57:25 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ee5ada6991
						 | 
						
							
							
								
								
								We now use memcache if configured and installed.
							
							
							
							
							
						 | 
						
							2016-10-23 21:59:40 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	2ecd1f5d09
						 | 
						
							
							
								
								
								Update settings documentation
							
							
							
							
							
						 | 
						
							2016-10-23 07:57:40 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	fe17ce2150
						 | 
						
							
							
								
								
								Add upgrade documentation
							
							
							
							
							
						 | 
						
							2016-10-05 16:39:37 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	8fc558b8e6
						 | 
						
							
							
								
								
								Fix #2817
							
							
							
							
							
							
							
							- Change all references to language folders 
							
						 | 
						
							2016-09-30 10:46:56 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gerhard6380
								
							 
						 | 
						
							
							
								
							
							
	afc7d316a7
						 | 
						
							
							
								
								
								Change API documentation to contain new API call /api/friendica/profile/show
							
							
							
							
							
						 | 
						
							2016-09-23 19:26:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e5c2c66487
						 | 
						
							
							
								
								
								Show the worker queue count if the workers are active
							
							
							
							
							
						 | 
						
							2016-09-20 15:45:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ben-utzer
								
							 
						 | 
						
							
							
								
							
							
	2040cb4473
						 | 
						
							
							
								
								
								Update htconfig.md
							
							
							
							
							
							
							
							typo, siehe auch https://github.com/friendica/friendica/pull/2754 
							
						 | 
						
							2016-09-05 00:22:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	35813ab377
						 | 
						
							
							
								
								
								Set the PHP requirements to php 5.4
							
							
							
							
							
						 | 
						
							2016-09-01 06:47:36 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	59ff309ee5
						 | 
						
							
							
								
								
								Add the new charset parameter to the database creation
							
							
							
							
							
						 | 
						
							2016-09-01 04:44:29 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bd99eedd9b
						 | 
						
							
							
								
								
								Merge branch '3.5rc' of https://github.com/friendica/friendica into 3.5rc
							
							
							
							
							
						 | 
						
							2016-08-14 22:05:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gerhard6380
								
							 
						 | 
						
							
							
								
							
							
	728fb76f3d
						 | 
						
							
							
								
								
								adapted documentation
							
							
							
							
							
							
							
							removed reference to Windows 10 app 
							
						 | 
						
							2016-08-14 22:04:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gerhard6380
								
							 
						 | 
						
							
							
								
							
							
	7daaaf0ab8
						 | 
						
							
							
								
								
								updated api documentation to reflect changes on direct_messages
							
							
							
							
							
							
							
							added direct_messages/destroy, friendica/direct_messages_setseen 
							
						 | 
						
							2016-08-14 22:04:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f79a9f67f1
						 | 
						
							
							
								
								
								DOCs we have a new developer forum
							
							
							
							
							
						 | 
						
							2016-08-14 09:34:50 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	11e3c3bfad
						 | 
						
							
							
								
								
								DOCS: clarify Settings also discusses the Admin Panel
							
							
							
							
							
						 | 
						
							2016-08-13 12:11:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4b29937a74
						 | 
						
							
							
								
								
								Worker: New value for cooldown time after each function call
							
							
							
							
							
						 | 
						
							2016-07-13 19:43:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	19d820a9c4
						 | 
						
							
							
								
								
								Added fcontact doc
							
							
							
							
							
						 | 
						
							2016-07-10 14:08:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c7373dcec4
						 | 
						
							
							
								
								
								author-id/owner-id: Post update function/added database documentation
							
							
							
							
							
						 | 
						
							2016-06-23 21:15:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	2f266382c5
						 | 
						
							
							
								
								
								code highlight - add docu
							
							
							
							
							
						 | 
						
							2016-06-17 11:02:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e8d39b290a
						 | 
						
							
							
								
								
								show the workerqueue in the admin panel summary
							
							
							
							
							
						 | 
						
							2016-06-09 18:08:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	1dd77ee443
						 | 
						
							
							
								
								
								Merge pull request #2569 from tobiasd/doc-settings-de
							
							
							
							
							
							
							
							German translation of doc/Settings 
							
						 | 
						
							2016-06-07 07:57:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	04594666dc
						 | 
						
							
							
								
								
								Typos
							
							
							
							
							
						 | 
						
							2016-06-07 06:53:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	06c0588817
						 | 
						
							
							
								
								
								German translation of doc/Settings, part of #2194
							
							
							
							
							
						 | 
						
							2016-06-06 22:17:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5420c98ff0
						 | 
						
							
							
								
								
								removed some copy&paste fragments
							
							
							
							
							
						 | 
						
							2016-06-04 12:30:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e33defbe3e
						 | 
						
							
							
								
								
								Added documentation
							
							
							
							
							
						 | 
						
							2016-06-04 12:23:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	177fbd2a7c
						 | 
						
							
							
								
								
								small fixes
							
							
							
							
							
						 | 
						
							2016-05-23 14:05:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	3df9876d74
						 | 
						
							
							
								
								
								remote_self
							
							
							
							
							
						 | 
						
							2016-05-23 09:05:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8e89ba7a42
						 | 
						
							
							
								
								
								placement of the logfiles
							
							
							
							
							
						 | 
						
							2016-05-23 09:03:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	0a5f70acb9
						 | 
						
							
							
								
								
								Typo
							
							
							
							
							
						 | 
						
							2016-05-21 06:02:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	aedbbdc0bf
						 | 
						
							
							
								
								
								added short intoduction of the term admin panel
							
							
							
							
							
						 | 
						
							2016-05-20 20:09:45 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	0d6b49977b
						 | 
						
							
							
								
								
								rewrite of the doc/settings.md
							
							
							
							
							
						 | 
						
							2016-05-20 20:06:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	a61361f351
						 | 
						
							
							
								
								
								add some hook docu
							
							
							
							
							
						 | 
						
							2016-04-28 23:18:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	76b24f61a9
						 | 
						
							
							
								
								
								New (experimental) value to define the maximum level of database connections for the worker
							
							
							
							
							
						 | 
						
							2016-04-23 10:11:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |