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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "cache the storage info for 5 min"	Morris Jobke	2017-02-16	1	-29/+5
*	Merge pull request #3439 from nextcloud/oc-26963	Lukas Reschke	2017-02-16	1	-8/+8
\|\
\| *	Check if color exists in palette before using it	Victor Dubiniuk	2017-02-10	1	-3/+3
\| *	Make sure invalid images don't flood the log file	Joas Schilling	2017-02-10	1	-5/+5
* \|	Don't force displayname if backend already provides one	Lukas Reschke	2017-02-16	1	-1/+12
* \|	Merge pull request #2606 from temparus/master	blizzz	2017-02-15	1	-3/+6
\|\ \
\| * \|	Update license header	Sandro Lutz	2017-02-07	1	-0/+2
\| * \|	Merge remote-tracking branch 'nextcloud/master'	Sandro Lutz	2017-02-07	92	-3285/+1933
\| \|\ \
\| * \| \|	Add check if UserManager is of type PublicEmitter before calling preLogin hook	Sandro Lutz	2017-02-01	1	-1/+3
\| * \| \|	Change where preLogin hook gets called	Sandro Lutz	2017-02-01	1	-3/+2
\| * \| \|	Remove preLoginValidation hook	Sandro Lutz	2017-02-01	1	-3/+0
\| * \| \|	Fix indentation	Sandro Lutz	2017-02-01	1	-3/+3
\| * \| \|	Add preLoginValidation hook	Sandro Lutz	2017-02-01	1	-0/+3
* \| \| \|	Merge pull request #3495 from nextcloud/dav-protected	Roeland Jago Douma	2017-02-15	1	-7/+7
\|\ \ \ \
\| * \| \| \|	Make it easier to subclass DAV storage	Robin Appelman	2017-02-15	1	-7/+7
* \| \| \| \|	Merge pull request #3447 from nextcloud/getmetadata-permissions-mask	Roeland Jago Douma	2017-02-15	2	-1/+10
\|\ \ \ \ \
\| * \| \| \| \|	also apply permissions mask in getMetaData	Robin Appelman	2017-02-10	2	-1/+10
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #3262 from nextcloud/jail-scanner-storage-id	Roeland Jago Douma	2017-02-15	3	-7/+3
\|\ \ \ \ \
\| * \| \| \| \|	Make sure we use the correct storage id when scanning a jailed storage	Robin Appelman	2017-01-25	3	-7/+3
* \| \| \| \| \|	Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection	Morris Jobke	2017-02-14	2	-0/+6
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix DI of the cloud id manager into apps	Joas Schilling	2017-02-14	2	-0/+6
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #3472 from nextcloud/enable-avatars-always	Morris Jobke	2017-02-14	3	-6/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Always enable avatars	Morris Jobke	2017-02-13	3	-6/+3
* \| \| \| \| \| \|	Merge pull request #3465 from nextcloud/storage-log-locks	Lukas Reschke	2017-02-14	2	-3/+84
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add missing PHPDoc and properly throw exception	Morris Jobke	2017-02-13	2	-0/+6
\| * \| \| \| \| \|	Add storage to log item as well	Lukas Reschke	2017-02-13	1	-3/+33
\| * \| \| \| \| \|	Add option to enable locking debug logging	Robin Appelman	2017-02-13	1	-3/+48
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #3444 from nextcloud/recognize-bat-and-cmd	Morris Jobke	2017-02-13	1	-0/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Recognize .bat and .cmd files	Joas Schilling	2017-02-10	1	-0/+14
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #3448 from kuimovvg/master	Lukas Reschke	2017-02-13	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	bug when connect to yandex webdav server	vkuimov	2017-02-10	1	-1/+1
* \| \| \| \| \|	Merge pull request #3417 from nextcloud/push-notification	Morris Jobke	2017-02-10	2	-2/+27
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make sure to use the right appdata directory	Joas Schilling	2017-02-09	1	-0/+7
\| * \| \| \| \| \|	Save the used token id in the session so it can be used later on	Joas Schilling	2017-02-09	1	-2/+20
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #3430 from nextcloud/fix-ios-client-detection	Morris Jobke	2017-02-10	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix detection of the new iOS app	Joas Schilling	2017-02-10	1	-1/+1
* \| \| \| \| \|	Merge pull request #3424 from nextcloud/fix-upgrade-path	Björn Schießle	2017-02-10	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix return value of getAllowedPreviousVersions()	Morris Jobke	2017-02-09	1	-1/+1
\| \|/ / / / /
* / / / / /	Set vendor during install	Morris Jobke	2017-02-09	1	-0/+15
\|/ / / / /
* \| \| \| \|	Merge pull request #3297 from nextcloud/cloud-id-resolve	Robin Appelman	2017-02-09	6	-40/+209
\|\ \ \ \ \
\| * \| \| \| \|	fix copyright headers	Robin Appelman	2017-02-09	2	-1/+5
\| * \| \| \| \|	clean cloud ids	Robin Appelman	2017-02-09	1	-3/+2
\| * \| \| \| \|	add tests	Robin Appelman	2017-02-08	1	-1/+1
\| * \| \| \| \|	Add a single public api for resolving a cloud id to a user and remote and back	Robin Appelman	2017-02-08	6	-40/+206
\| \|/ / / /
* \| \| \| \|	Merge pull request #3184 from nextcloud/issue-3165	Lukas Reschke	2017-02-09	1	-20/+16
\|\ \ \ \ \
\| * \| \| \| \|	Prevent migration from ownCloud 11 to Nextcloud 12	Joas Schilling	2017-01-23	1	-20/+16
* \| \| \| \| \|	Merge pull request #3408 from nextcloud/nullstorage-free-space	Joas Schilling	2017-02-09	1	-1/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	return unknown free space from nullstorage	Robin Appelman	2017-02-08	1	-1/+2
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation	Lukas Reschke	2017-02-09	1	-1/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Don't log the password on confirmPassword when LDAP throws an exception	Joas Schilling	2017-02-07	1	-1/+2
\| \|/ / / / /