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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #8483 from owncloud/encryption_use_oc_preferences	Thomas Müller	2014-06-05	14	-183/+318
\|\
\| *	adding unit tests for encryption data migration	Thomas Müller	2014-06-05	4	-14/+224
\| *	use oc_preferences instead of oc_encryption to store encyption settings	Bjoern Schiessle	2014-06-05	9	-184/+69
\| *	allow to set pre-condition for setValue	Bjoern Schiessle	2014-06-05	3	-31/+71
* \|	Merge pull request #8865 from owncloud/improve_share_settings	Vincent Petry	2014-06-05	7	-28/+38
\|\ \ \| \|/ \|/\|
\| *	unify share settings	Bjoern Schiessle	2014-06-05	6	-18/+32
\| *	This settings doesn't belong together	Bjoern Schiessle	2014-06-05	2	-11/+10
\| *	improve share settings working	Bjoern Schiessle	2014-06-05	1	-5/+2
* \|	Merge pull request #8893 from owncloud/feature/get-users-by-preference	Thomas Müller	2014-06-05	2	-0/+48
\|\ \
\| * \|	Sort the result before comparing	Joas Schilling	2014-06-05	1	-1/+3
\| * \|	Hack around oracle for CLOB fields	Joas Schilling	2014-06-05	1	-1/+9
\| * \|	Add method to get users by their preference	Joas Schilling	2014-06-05	2	-0/+38
* \| \|	Merge pull request #8902 from owncloud/fix_ldap_typo_2	Thomas Müller	2014-06-05	1	-1/+1
\|\ \ \
\| * \| \|	fix typo in var name	Arthur Schiwon	2014-06-05	1	-1/+1
\|/ / /
* \| \|	Merge pull request #8891 from owncloud/design-emptycontent	jbtbnl	2014-06-05	1	-2/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	fix size and unbold empty content message	Jan-Christoph Borchardt	2014-06-05	1	-2/+1
* \| \|	Merge pull request #8897 from owncloud/fix-multiselect	Jörn Friedrich Dreyer	2014-06-05	1	-1/+1
\|\ \ \
\| * \| \|	fix files multiselect bar now that the app list is gone	Jan-Christoph Borchardt	2014-06-05	1	-1/+1
* \| \| \|	Merge pull request #8529 from owncloud/remove-legacy-routing	Thomas Müller	2014-06-05	6	-62/+35
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Move authentication to it's own call	Lukas Reschke	2014-06-05	3	-3/+6
\| * \| \|	Remove legacy routing code	Lukas Reschke	2014-06-05	6	-62/+32
* \| \| \|	Merge pull request #8889 from owncloud/mtime-reuse	Thomas Müller	2014-06-05	2	-2/+3
\|\ \ \ \
\| * \| \| \|	Fix uit tests	Robin Appelman	2014-06-05	1	-2/+2
\| * \| \| \|	Don't update the mtime if the storage mtime hasn't changed	Robin Appelman	2014-06-05	1	-0/+1
* \| \| \| \|	Merge pull request #8866 from owncloud/flock-quotafix	Vincent Petry	2014-06-05	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fixed quota wrapper to return the value from flock()	Vincent Petry	2014-06-04	1	-1/+1
* \| \| \| \| \|	Merge pull request #8894 from owncloud/public-share-js-overwrite	Thomas Müller	2014-06-05	1	-1/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Dont overwrite OCA.Sharing	Robin Appelman	2014-06-05	1	-1/+3
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master	Thomas Müller	2014-06-05	2	-33/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	table files_trashsizes was still used in some locations -> removed	Thomas Müller	2014-06-05	2	-33/+2
* \| \| \| \| \|	Merge pull request #8880 from owncloud/webdav-read-permissions	Thomas Müller	2014-06-05	1	-0/+24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use the permissions exposed by ownCloud for webdav external storages	Robin Appelman	2014-06-04	1	-0/+24
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #8883 from owncloud/files-slide-toggle	Jan-Christoph Borchardt	2014-06-05	2	-8/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	use slide toggle for files app	Bernhard Posselt	2014-06-05	2	-8/+2
* \| \| \| \| \|	Merge pull request #7878 from owncloud/quota-extstorageswitch	icewind1991	2014-06-05	4	-24/+180
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Added experimental switch to count external storage data in quota	Vincent Petry	2014-06-04	4	-24/+180
\| \|/ / / /
* \| \| \| \|	Merge pull request #8861 from owncloud/share-overview-linklist	Vincent Petry	2014-06-05	4	-2/+146
\|\ \ \ \ \
\| * \| \| \| \|	Fixed wording to "Shared by link"	Vincent Petry	2014-06-04	2	-3/+3
\| * \| \| \| \|	Added "Shared with link" sidebar section in files app	Vincent Petry	2014-06-04	4	-2/+146
* \| \| \| \| \|	Merge pull request #8884 from owncloud/move-flock-to-app	Jörn Friedrich Dreyer	2014-06-05	4	-564/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove file locking - code will continue to live in it's own app	Thomas Müller	2014-06-04	4	-564/+0
* \| \| \| \| \| \|	Merge pull request #8620 from owncloud/design-navigation-two	Thomas Müller	2014-06-05	13	-418/+397
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	fix leading decimal Scrutinizer coding style issue	Jan-Christoph Borchardt	2014-06-05	1	-3/+3
\| * \| \| \| \| \|	fix unit test template	Morris Jobke	2014-06-05	1	-1/+1
\| * \| \| \| \| \|	fix first failing test	Morris Jobke	2014-06-05	1	-2/+1
\| * \| \| \| \| \|	add to app navigation after enabling	Morris Jobke	2014-06-04	1	-8/+10
\| * \| \| \| \| \|	hover effect for app switcher label	Jan-Christoph Borchardt	2014-06-04	1	-6/+18
\| * \| \| \| \| \|	fix related layout issues in user management	Jan-Christoph Borchardt	2014-06-04	3	-2/+6
\| * \| \| \| \| \|	add a bit of whitespace to the bottom of the app list	Jan-Christoph Borchardt	2014-06-04	1	-0/+1
\| * \| \| \| \| \|	reduce opacity of app icon when loading	Jan-Christoph Borchardt	2014-06-04	1	-5/+3