nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix accesslist when a user has an ID only containting 0-9	Joas Schilling	2017-11-14	1	-1/+1
\| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
*	[tx-robot] updated from transifex	Nextcloud bot	2017-11-12	2	-8/+8
\|
*	[tx-robot] updated from transifex	Nextcloud bot	2017-11-11	12	-36/+2606
\|
*	[tx-robot] updated from transifex	Nextcloud bot	2017-11-10	12	-0/+2588
\|
*	Merge pull request #7117 from nextcloud/fix-welcome-string	Morris Jobke	2017-11-09	1	-1/+1
\|\ \| \| \| \|	Fix welcome text for better grammar in themed instances
\| *	Fix welcome text for better grammar in themed instances	Morris Jobke	2017-11-09	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \|	Merge pull request #7014 from nextcloud/rename-locks	Morris Jobke	2017-11-09	1	-83/+86
\|\ \ \| \| \| \| \| \|	Unlock files even if an exception occurs while renaming
\| * \|	Unlock files even if an exception occurs	korelstar	2017-11-03	1	-83/+86
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
* \| \|	Merge pull request #7027 from nextcloud/Rello-patch-1	Morris Jobke	2017-11-09	1	-5/+22
\|\ \ \ \| \|_\|/ \|/\| \|	Rello patch 1
\| * \|	Add the return which is being used	Joas Schilling	2017-10-31	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Joas Schilling <coding@schilljs.com>
\| * \|	Mapping of m3u, m3u8, pls to audio streams	Rello	2017-10-31	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-Off-By: Rello <Rello@users.noreply.github.com>
* \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-11-09	48	-46/+524
\| \| \|
* \| \|	Merge pull request #6220 from nextcloud/cached-mount-info-filepath	Lukas Reschke	2017-11-09	6	-3/+111
\|\ \ \ \| \| \| \| \| \| \| \|	Allow getting the filepath when getting cached mounts by fileid
\| * \| \|	Allow getting the filepath when getting cached mounts by fileid	Robin Appelman	2017-10-27	6	-3/+111
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
* \| \|	Merge pull request #7109 from nextcloud/fix_6898	Morris Jobke	2017-11-08	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \|	If for some reason the json can't be decoded it is not cached
\| * \| \|	If for some reason the json can't be decoded it is not cached	Roeland Jago Douma	2017-11-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Should fix #6898 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \| \|	Merge pull request #6788 from staabm/master	Lukas Reschke	2017-11-08	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Prevent XSS in links which open a new browser window
\| * \| \| \|	Prevent XSS in links which open a new browser window	Markus Staab	2017-10-19	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Revert "Only allow colons in db host for IPv6 addresses"	Morris Jobke	2017-11-08	1	-16/+0
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1287d6ddb303fc9b088b8a6837490042a1540dc6. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \|	Merge pull request #6552 from nextcloud/notifications-add-highlight-definition	Morris Jobke	2017-11-07	1	-0/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Notifications: Add highlight type definition
\| * \| \| \|	Notifications: Add highlight type definition	Julius Härtl	2017-10-03	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Julius Härtl <jus@bitgrid.net>
* \| \| \| \|	Merge pull request #6988 from starypatyk/stable12-mount-cache-performance	Morris Jobke	2017-11-07	1	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of UserMountCache with external storage folders
\| * \| \| \| \|	Improve performance of UserMountCache with external storage folders	Dariusz Olszewski	2017-11-01	1	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #7075 from nextcloud/remove-unused-variables	Roeland Jago Douma	2017-11-07	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused variables
\| * \| \| \| \| \|	Remove unused variables	Morris Jobke	2017-11-06	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \|	Run updated license header updater	Morris Jobke	2017-11-07	7	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \|	Merge pull request #7020 from Fiech/master	Morris Jobke	2017-11-07	1	-2/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extended list of sensitive configuration values (2)
\| * \ \ \ \ \ \	Merge branch 'master' into master	Johannes S	2017-10-31	10	-2/+207
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Extended list of sensitive configuration values	Johannes Schlichenmaier	2017-10-31	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In accordance with the issuetemplate app issue: https://github.com/nextcloud/issuetemplate/issues/27 Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-11-07	2	-0/+516
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Change @georgehrke's email	Morris Jobke	2017-11-06	30	-29/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \| \|	Merge pull request #7083 from nextcloud/update-license-headers	Morris Jobke	2017-11-06	413	-246/+872
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update license headers
\| * \| \| \| \| \| \| \|	Update license headers	Morris Jobke	2017-11-06	413	-246/+872
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \| \| \|	Merge pull request #7076 from nextcloud/s3-valid-bucket-name	Morris Jobke	2017-11-06	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Better error message for invalid bucket names
\| * \| \| \| \| \| \| \|	Better error message for invalid bucket names	Morris Jobke	2017-11-06	1	-2/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \| \|	Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure	Morris Jobke	2017-11-06	3	-3/+74
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement plugins infrastructure in User_LDAP
\| * \| \| \| \| \| \| \|	User_LDAP plugins: smaller fixes	Vinicius Cubas Brand	2017-11-03	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
\| * \| \| \| \| \| \| \|	Plugins infrastructure in User_LDAP	Vinicius Cubas Brand	2017-11-03	3	-3/+67
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* \| \| \| \| \| \| \|	Merge pull request #6402 from nextcloud/dav-email-customization	Morris Jobke	2017-11-06	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enhance calendar invitation emails
\| * \| \| \| \| \| \| \|	Make L10N->l provide weekdayName	Georg Ehrke	2017-11-03	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-11-06	4	-64/+84
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-11-03	4	-0/+1032
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage	Roeland Jago Douma	2017-11-02	1	-2/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix seeking on object storage
\| * \| \| \| \| \| \| \|	Fix seeking on object storage	Morris Jobke	2017-10-27	1	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \| \| \|	Update autoloader	Roeland Jago Douma	2017-11-02	2	-0/+2
\| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \| \| \| \| \| \|	Merge branch 'master' into autocomplete-gui	Arthur Schiwon	2017-11-01	60	-132/+1114
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge pull request #6958 from ↵	Joas Schilling	2017-11-01	2	-1/+13
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nextcloud/improved-mimetype-detection-for-object-storage Improve mimetype detection for object storages
\| \| * \| \| \| \| \| \| \|	Improve mimetype detection for object storages	Morris Jobke	2017-10-26	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
\| * \| \| \| \| \| \| \| \|	Merge pull request #6975 from nextcloud/s3-read-object-fopen	Joas Schilling	2017-11-01	1	-5/+8
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use fopen directly when reading objects from s3
\| \| * \| \| \| \| \| \| \| \|	use fopen directly when reading objects from s3	Robin Appelman	2017-10-27	1	-5/+8
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>