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 #4624 from owncloud/convert-oc_appconfig	Thomas Müller	2014-02-13	7	-91/+342
\|\
\| *	sort expected result in tests	Robin Appelman	2014-02-13	1	-0/+2
\| *	Add explicit sorting	Robin Appelman	2014-02-11	1	-2/+4
\| *	Merge branch 'master' into convert-oc_appconfig	Robin Appelman	2014-02-11	33	-58/+266
\| \|\
\| * \|	Remove the Test_AppConfig_Object tests as they no longer make sense with caching	Robin Appelman	2014-02-07	1	-180/+0
\| * \|	Add caching to appconfig	Robin Appelman	2014-02-07	2	-16/+48
\| * \|	use the 'new' server container for appconfig	Robin Appelman	2014-02-07	2224	-76883/+172118
\| \|\ \
\| * \| \|	Move legacy file to correct location	Bart Visscher	2013-10-02	1	-0/+0
\| * \| \|	Merge branch 'master' into convert-oc_appconfig	Bart Visscher	2013-10-02	1012	-10067/+30755
\| \|\ \ \
\| * \| \| \|	Enable appconfig asserts	Bart Visscher	2013-09-19	1	-4/+4
\| * \| \| \|	Style fixes	Bart Visscher	2013-09-19	1	-21/+25
\| * \| \| \|	check for valid appinfo in installer	Bart Visscher	2013-09-19	1	-0/+3
\| * \| \| \|	Convert OC_Appconfig to object interface	Bart Visscher	2013-09-19	3	-67/+382
* \| \| \| \|	Merge pull request #7178 from owncloud/issue/6277	Thomas Müller	2014-02-12	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	External FTP Storage should request hostname instead of URL	Joas Schilling	2014-02-12	1	-1/+1
* \| \| \| \| \|	Merge pull request #6964 from owncloud/storagestatistics-reuse	icewind1991	2014-02-12	3	-13/+18
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into storagestatistics-reuse	Robin Appelman	2014-02-10	41	-192/+737
\| \|\ \ \ \ \
\| * \ \ \ \ \	merge master into storagestatistics-reuse	Robin Appelman	2014-02-05	77	-587/+1513
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Reuse the calculated free_space in buildFileStorageStatistics	Robin Appelman	2014-01-27	3	-10/+14
* \| \| \| \| \| \| \|	Merge pull request #7085 from owncloud/quick-fix-7019-master	Thomas Müller	2014-02-11	1	-0/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Load authentication apps to get users from all backends - fixes #7019	Thomas Müller	2014-02-05	1	-0/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #7075 from owncloud/quota-storagexsendfile	Vincent Petry	2014-02-11	5	-1/+36
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added isLocal() method to storage, used for xsendfile	Vincent Petry	2014-02-06	5	-1/+36
* \| \| \| \| \| \| \|	intendation	Arthur Schiwon	2014-02-11	1	-5/+5
* \| \| \| \| \| \| \|	fix DI	Arthur Schiwon	2014-02-11	2	-5/+8
* \| \| \| \| \| \| \|	Inject logger	Arthur Schiwon	2014-02-11	2	-3/+13
* \| \| \| \| \| \| \|	wrong tld	Arthur Schiwon	2014-02-11	1	-1/+1
* \| \| \| \| \| \| \|	test for share dialoge sorter	Arthur Schiwon	2014-02-11	1	-0/+40
* \| \| \| \| \| \| \|	sort following entries in alphabetical order	Arthur Schiwon	2014-02-11	1	-3/+4
* \| \| \| \| \| \| \|	move sorter into a class	Arthur Schiwon	2014-02-11	2	-24/+56
* \| \| \| \| \| \| \|	respect coding guidelines	Arthur Schiwon	2014-02-11	1	-1/+1
* \| \| \| \| \| \| \|	on filtering the share box users and groups whose name begins with the search...	Arthur Schiwon	2014-02-11	1	-0/+24
* \| \| \| \| \| \| \|	Merge pull request #6881 from owncloud/remove-user-storage-entry	Vincent Petry	2014-02-10	2	-0/+22
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into remove-user-storage-entry	Robin Appelman	2014-02-10	160	-5729/+17301
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Also clean up the filecache table when deleting a storage entry	Robin Appelman	2014-02-03	1	-0/+6
\| * \| \| \| \| \| \| \|	Revert "Use Cache->clear to cleanup the filecache for removed users"	Robin Appelman	2014-02-03	1	-10/+5
\| * \| \| \| \| \| \| \|	Use Cache->clear to cleanup the filecache for removed users	Robin Appelman	2014-01-22	1	-5/+10
\| * \| \| \| \| \| \| \|	Also remove the user's home storage from the storage table when deleting a user	Robin Appelman	2014-01-21	2	-0/+16
* \| \| \| \| \| \| \| \|	LDAP: improve debug message	Arthur Schiwon	2014-02-10	1	-1/+2
* \| \| \| \| \| \| \| \|	LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image	Arthur Schiwon	2014-02-10	1	-6/+24
* \| \| \| \| \| \| \| \|	Merge pull request #6988 from owncloud/oc_api_fix_warinigs	Tom Needham	2014-02-10	1	-6/+12
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	getData() always needs to return an array	Bjoern Schiessle	2014-02-07	1	-6/+12
* \| \| \| \| \| \| \| \| \|	Merge pull request #7134 from owncloud/issue/5794	Morris Jobke	2014-02-10	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make google drive client secret and dropbox api secret a password field	Joas Schilling	2014-02-07	1	-2/+2
* \| \| \| \| \| \| \| \| \|	Merge pull request #7140 from owncloud/enc_dont_login_during_encryption	Morris Jobke	2014-02-10	1	-1/+8
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	refuse login as long as the initial encryption is running	Bjoern Schiessle	2014-02-10	1	-1/+8
* \| \| \| \| \| \| \| \| \| \|	LDAP: add documentation info in info.xml	Arthur Schiwon	2014-02-10	1	-0/+3
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #7126 from nickvergessen/issue/6683	Vincent Petry	2014-02-10	2	-4/+6
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Only add files to file list when uploading to current directory	Joas Schilling	2014-02-07	2	-4/+6
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Rephrase and clarify log message	Arthur Schiwon	2014-02-10	1	-1/+1