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 #7508 from owncloud/ldap-configkeycasing	Vincent Petry	2014-03-04	1	-1/+1
\|\ \| \| \| \|	Fixed configkey casing for PostgreSQL
\| *	Fixed configkey casing for PostgreSQL	Vincent Petry	2014-03-03	1	-1/+1
\| \|
* \|	Merge pull request #7525 from owncloud/fix_S3string	Thomas Müller	2014-03-04	1	-1/+1
\|\ \ \| \|/ \|/\|	fix https://github.com/owncloud/core/issues/6825
\| *	fix https://github.com/owncloud/core/issues/6825	Frank Karlitschek	2014-03-04	1	-1/+1
\| \|
* \|	remove remaining testing artefact	Arthur Schiwon	2014-03-03	1	-1/+1
\| \|
* \|	intendetion. where did the whitespaces come from?	Arthur Schiwon	2014-03-03	1	-2/+2
\| \|
* \|	LDAP: let proxy for multiple server access methods from Access	Arthur Schiwon	2014-03-03	1	-4/+13
\| \|
* \|	Merge pull request #7455 from owncloud/rawlist-fileinfo	icewind1991	2014-02-28	1	-31/+28
\|\ \ \| \| \| \| \| \|	Update rawlist to work with new fileinfo object
\| * \|	Update rawlist to work with new fileinfo object	Robin Appelman	2014-02-27	1	-31/+28
\| \| \|
* \| \|	Merge pull request #7454 from owncloud/enc_remember_fopen_mode	Björn Schießle	2014-02-28	2	-6/+29
\|\ \ \ \| \| \| \| \| \| \| \|	[enc] remember original fopen access type in pre-proxy
\| * \| \|	remember original fopen access type in pre-proxy because sometimes they change	Bjoern Schiessle	2014-02-27	2	-6/+29
\| \|/ / \| \| \| \| \| \| \| \| \|	during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
* \| \|	Fixed wrong field name	Vincent Petry	2014-02-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This re-fixes an issue where the unencrypted size isn't updated correctly when saving a text file in the UI multiple times. Fixes #7467
* \| \|	Merge pull request #7446 from owncloud/etag_assert_fixes	Thomas Müller	2014-02-27	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|	use assertSame and assertNotSame for etag checks
\| * \|	use assertSame and assertNotSame for etag checks	Jörn Friedrich Dreyer	2014-02-27	1	-2/+2
\| \| \|
* \| \|	Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all	Vincent Petry	2014-02-27	2	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \|	close encryption session after decryption was finished
\| * \| \|	close encryption session after decryption was finished	Bjoern Schiessle	2014-02-26	2	-0/+16
\| \|/ /
* \| \|	Merge pull request #7421 from owncloud/password-input	Thomas Müller	2014-02-26	1	-1/+4
\|\ \ \ \| \|/ / \|/\| \|	disable autocomplete for shared link password input, fix #7419
\| * \|	disable autocomplete for shared link password input, fix #7419	Jan-Christoph Borchardt	2014-02-26	1	-1/+4
\| \| \|
* \| \|	Merge pull request #7393 from owncloud/fix_path_in_sharing_results	Björn Schießle	2014-02-26	2	-0/+69
\|\ \ \ \| \| \| \| \| \| \| \|	fix path in sharing results if it is a file in the Shared folder
\| * \| \|	fix path in sharing results if it is a file in the Shared folder	Bjoern Schiessle	2014-02-25	2	-0/+69
\| \| \| \|
* \| \| \|	Merge pull request #7416 from owncloud/share_api_7311	Thomas Müller	2014-02-26	1	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[share api] only add "received_from" field if a share was found
\| * \| \| \|	only add "received_from" if a share was found	Bjoern Schiessle	2014-02-26	1	-6/+6
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #7174 from owncloud/issue/7166	Jan-Christoph Borchardt	2014-02-26	1	-22/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Add option to change email settings in admin section
\| * \| \|	Remove duplicated definition and move OC.msg to js/js.js	Joas Schilling	2014-02-19	1	-22/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issue #7166
* \| \| \|	coding style fixes, cut long lines, comments not on same lines, curly braces	Jan-Christoph Borchardt	2014-02-26	1	-8/+11
\| \| \| \|
* \| \| \|	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
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|