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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Nextcloud bot	2017-04-03	32	-24/+204
\|
*	Merge pull request #4183 from nextcloud/css-shortcuts-view	Lukas Reschke	2017-04-02	1	-1/+30
\|\ \| \| \| \|	Add CSS for styling of keyboard shortcuts view
\| *	Add CSS for styling of keyboard shortcuts view	Jan-Christoph Borchardt	2017-03-30	1	-1/+30
\| \| \| \| \| \| \| \|	Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* \|	[tx-robot] updated from transifex	Nextcloud bot	2017-04-02	18	-2/+64
\| \|
* \|	Merge pull request #4139 from nextcloud/phpseclib	Roeland Jago Douma	2017-04-01	1	-0/+0
\|\ \ \| \| \| \| \| \|	[3rdparty] Bump phpseclib to 2.0.4
\| * \|	[3rdparty] Bump phpseclib to 2.0.4	Roeland Jago Douma	2017-03-30	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \|	Merge pull request #4174 from nextcloud/mergejs-newline	Christoph Wurst	2017-04-01	2	-7/+24
\|\ \ \ \| \| \| \| \| \| \| \|	mergejs should print a newline between imports
\| * \| \|	mergejs should print a newline between imports	Roeland Jago Douma	2017-03-31	2	-7/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-04-01	26	-200/+1036
\|/ / /
* \| \|	Merge pull request #3438 from nextcloud/external-storage-user-folder	Roeland Jago Douma	2017-03-31	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Allow using '/' as external storage mountpoint
\| * \| \|	Allow using '/' as external storage root	Robin Appelman	2017-03-23	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
* \| \| \|	Merge pull request #4140 from nextcloud/no_encryption_no_wrapper	Björn Schießle	2017-03-31	2	-3/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Don't add the Encryption Storage Wrapper if there are no encryption modules
\| * \| \| \|	fix setup of external storage integration tests	Robin Appelman	2017-03-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \|	Don't add the Encryption Storage Wrapper if there are no encryption modules	Roeland Jago Douma	2017-03-29	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #4125 If there is no encryption module enabled it makes no sense to setup the encryption wrapper (because we can't do anything anyway). This saves reading the header of files. Especialy on external storage/objectstore this should improve performance Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-03-31	54	-224/+568
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3832 from nextcloud/fix_1303	Roeland Jago Douma	2017-03-30	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Do not clear CSRF token on logout (fix for #1303)
\| * \| \| \| \|	Do not clear CSRF token on logout (fix for #1303)	Roeland Jago Douma	2017-03-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a hacky way to allow the use case of #1303. What happens is 1. User tries to login 2. PreLoginHook kicks in and figures out that the user need to change their LDAP password or whatever => redirects user 3. While loading the redirect some logic of ours kicks in and logouts the user (thus clearing the session). 4. We render the new page but now the session and the page disagree about the CSRF token This is kind of hacky but I don't think it introduces new attack vectors. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \| \| \| \|	Merge pull request #4150 from nextcloud/capped-memcache-push	Joas Schilling	2017-03-30	2	-2/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support pushing to CappedMemoryCache
\| * \| \| \| \| \|	user ids are strings	Robin Appelman	2017-03-30	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \|	support pushing to CappedMemoryCache	Robin Appelman	2017-03-30	1	-1/+5
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
* \| \| \| \| \|	Merge pull request #4128 from nextcloud/updateclipboard	Joas Schilling	2017-03-30	6	-1485/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update clipboard.js
\| * \| \| \| \| \|	Use minified clipboard.js	Roeland Jago Douma	2017-03-29	5	-1517/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
\| * \| \| \| \| \|	Update clipboard.js	Roeland Jago Douma	2017-03-29	2	-210/+246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* \| \| \| \| \| \|	Merge pull request #4143 from nextcloud/ldap-downstream-64	Roeland Jago Douma	2017-03-30	2	-32/+366
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly apply quota
\| * \| \| \| \| \| \|	Include tests for "default" and "none" quotas	Juan Pablo Villafáñez	2017-03-29	1	-0/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \| \|	Add comments in the updateQuota method to explain the behavior	Juan Pablo Villafáñez	2017-03-29	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \| \|	Add new testes to cover more cases	Juan Pablo Villafáñez	2017-03-29	1	-0/+210
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \| \|	Adjust current tests to match the expectations	Juan Pablo Villafáñez	2017-03-29	1	-28/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \| \|	Check if the user exists before trying to set the quota	Juan Pablo Villafáñez	2017-03-29	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
\| * \| \| \| \| \| \|	Correctly apply quota	Juan Pablo Villafáñez	2017-03-29	1	-6/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* \| \| \| \| \| \| \|	Merge pull request #3089 from nextcloud/cache-move-single-query	Roeland Jago Douma	2017-03-30	18	-28/+542
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	Move all children of a folder in a single query
\| * \| \| \| \| \| \|	rename fun to func	Robin Appelman	2017-03-30	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	Add tests for query builder (i)like	Robin Appelman	2017-03-30	2	-1/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	dont double escape	Robin Appelman	2017-03-30	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	update autoloader	Robin Appelman	2017-03-30	2	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	fix licence headers	Robin Appelman	2017-03-30	6	-48/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	Move all children of a folder in a single query	Robin Appelman	2017-03-30	1	-18/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	Add function builder to the query builder	Robin Appelman	2017-03-30	8	-0/+326
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	add support for escaping like parameters when using the query builder	Robin Appelman	2017-03-30	4	-8/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
\| * \| \| \| \| \| \|	Add MD5() to sqlite	Robin Appelman	2017-03-30	1	-0/+3
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Robin Appelman <robin@icewind.nl>
* \| \| \| \| \| \|	Merge pull request #4132 from nextcloud/fix-safari-gzip	Lukas Reschke	2017-03-30	8	-18/+18
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|	Fix gzip files for Safari
\| * \| \| \| \| \|	Fix gzip files for Safari	Morris Jobke	2017-03-29	8	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Safari support gzip only if the filename does not end on .gz - so this renames them to .gzip Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* \| \| \| \| \| \|	Merge pull request #4100 from nextcloud/header-indicator	Morris Jobke	2017-03-29	2	-2/+26
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	show triangle below user menu too when an entry inside there is active
\| * \| \| \| \| \| \|	adjust opacity of search and gear icons in header	Jan-Christoph Borchardt	2017-03-27	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
\| * \| \| \| \| \| \|	add pointer finger to full clickable app icon area	Jan-Christoph Borchardt	2017-03-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
\| * \| \| \| \| \| \|	show triangle below user menu too when an entry inside there is active	Jan-Christoph Borchardt	2017-03-27	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Nextcloud bot	2017-03-30	98	-308/+402
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4142 from nextcloud/numeric_avatar	Morris Jobke	2017-03-29	1	-0/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow avatars for full numeric users
\| * \| \| \| \| \| \| \|	Fix tests	Roeland Jago Douma	2017-03-29	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
\| * \| \| \| \| \| \| \|	Allow avatars for full numeric users	Roeland Jago Douma	2017-03-29	1	-0/+3
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4087 Because of fancy javascript if a full numeric uid was used javascript would convert this to an int. Now we just convert everything to a string first. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>