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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #7335 from owncloud/fix-7333	Vincent Petry	2014-02-25	1	-2/+4
\|\ \| \| \| \|	Fix code to search for mount.json in custom data folders
\| *	Fixed mount config path	Vincent Petry	2014-02-24	1	-3/+4
\| \|
\| *	Fix code to search for mount.json in custom data folders	Lukas Reschke	2014-02-20	1	-1/+2
\| \|
* \|	Merge pull request #6299 from leo-b/ldap_nested_groups	VicDeo	2014-02-25	3	-10/+72
\|\ \ \| \| \| \| \| \|	Add LDAP nested groups
\| * \|	replace spaces with tabs	root	2014-02-21	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	use true instead of 1
\| * \|	fix coding style to blizzz happy.. ;-)	root	2014-02-12	1	-8/+10
\| \| \|
\| * \|	fix indentation	root	2013-12-11	1	-42/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use identity test where appropriate use camelcase variable names _getGroupsByMember is a private function
\| * \|	remove debug output	root	2013-12-10	1	-3/+0
\| \| \|
\| * \|	Merge remote branch 'upstream/master' into ldap_nested_groups	root	2013-12-10	73	-118/+133
\| \|\ \
\| * \| \|	move nested group checkbox to directory settings	root	2013-12-10	1	-1/+1
\| \| \| \|
\| * \| \|	combineFilterWithAnd recently moved to Access	root	2013-12-08	1	-3/+3
\| \| \| \|
\| * \| \|	add support for nested groups	root	2013-12-06	3	-10/+73
\| \| \| \|
* \| \| \|	Merge pull request #7374 from owncloud/enc_dont_overwrite_keys	Björn Schießle	2014-02-25	3	-4/+138
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[encryption] don't overwrite keys if rename was done by a stream copy
\| * \| \| \|	add test case if a file gets moved out from the shared folder	Bjoern Schiessle	2014-02-24	2	-0/+125
\| \| \| \| \|
\| * \| \| \|	don't overwrite keys if rename was done by a stream copy	Bjoern Schiessle	2014-02-24	1	-4/+13
\| \| \| \| \|
* \| \| \| \|	Merge pull request #7285 from owncloud/mimeicons-svg	Morris Jobke	2014-02-24	5	-18/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Show svg mime icons when no preview is available
\| * \| \| \| \|	rename url parameter	Robin Appelman	2014-02-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add url parameter to control whether previews should return 404 when the ↵	Robin Appelman	2014-02-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mimetype is unsupported
\| * \| \| \| \|	Merge branch 'master' into mimeicons-svg	Robin Appelman	2014-02-21	2	-3/+169
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Make unit tests expect the svg icons	Robin Appelman	2014-02-20	1	-2/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into mimeicons-svg	Robin Appelman	2014-02-20	19	-146/+317
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Fix svg icons for public shares and external/shared files	Robin Appelman	2014-02-19	2	-4/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Show svg mime icons when no preview is available	Robin Appelman	2014-02-19	3	-13/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1	Morris Jobke	2014-02-24	2	-3/+61
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Update page title when navigating through directories (local)
\| * \| \| \| \| \|	Merge branch 'master' into GuillaumeAmat-patch-1	Robin Appelman	2014-02-21	5	-8/+178
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	code style: else on same line	Jan-Christoph Borchardt	2014-02-21	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix intendation	Morris Jobke	2014-02-20	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed trashbin title	Vincent Petry	2014-02-20	2	-22/+46
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed title format	Vincent Petry	2014-02-20	1	-1/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'patch-1' of github.com:GuillaumeAmat/core into ↵	Vincent Petry	2014-02-20	1	-3/+31
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GuillaumeAmat-patch-1
\| \| * \| \| \| \| \|	Uses OC.basename instead of custom code	Guillaume AMAT	2014-02-19	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Gets the page title from oc_defaults in Files app	Guillaume AMAT	2014-02-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Update page title when navigating through directories	Guillaume AMAT	2014-02-12	1	-3/+31
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7305 from owncloud/extstorage-configclass	Lukas Reschke	2014-02-22	2	-1/+32
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added extra checks for ext storage class
\| * \ \ \ \ \ \ \	Merge branch 'master' into extstorage-configclass	Robin Appelman	2014-02-21	12	-31/+259
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added extra checks for ext storage class	Vincent Petry	2014-02-20	2	-1/+32
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #7355 from owncloud/new-menu-svg	icewind1991	2014-02-21	2	-13/+28
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use SVG icons in New file menu
\| * \| \| \| \| \| \| \| \|	fix too much distance between text and icon	Jan-Christoph Borchardt	2014-02-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	use SVG icons from icons.css for New file menu	Jan-Christoph Borchardt	2014-02-21	2	-13/+28
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	fix test so that it doesn't depend on the array order	Bjoern Schiessle	2014-02-21	1	-14/+25
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	fix usersPath and add unit tests	Bjoern Schiessle	2014-02-21	2	-10/+110
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #7312 from owncloud/ldap_fix_add_test	Thomas Müller	2014-02-21	2	-3/+169
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	LDAP: fix and extend tests
\| * \| \| \| \| \| \|	LDAP: fix and extend tests	Arthur Schiwon	2014-02-20	2	-3/+169
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #7290 from owncloud/issue/5463	icewind1991	2014-02-20	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly redirect to settings page when not selecting cert file for upload
\| * \| \| \| \| \| \|	Correctly redirect to settings page when not selecting cert file for upload	Joas Schilling	2014-02-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #5463
* \| \| \| \| \| \| \|	Merge pull request #7205 from owncloud/fix_7153	blizzz	2014-02-20	1	-0/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LDAP: prevent other configuration from being deleted when deleting the f...
\| * \| \| \| \| \| \| \|	LDAP: prevent other configuration from being deleted when deleting the first ↵	Arthur Schiwon	2014-02-14	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	one which has an empty prefix for historical reasons
* \| \| \| \| \| \| \| \|	Merge pull request #6999 from kofemann/mount-config	Lukas Reschke	2014-02-20	1	-4/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|	mount: make location of mount.json configurable
\| * \| \| \| \| \| \| \|	mount: make location of mount.json configurable	Tigran Mkrtchyan	2014-01-29	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* \| \| \| \| \| \| \| \|	Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix	Lukas Reschke	2014-02-20	2	-6/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added extra checks for invalid file chars in newfile.php and newfolder.php