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 #18082 from owncloud/share-group-conflict	Vincent Petry	2015-08-06	4	-23/+50
\|\
\| *	just pass the share instead of searching for it	Robin Appelman	2015-08-05	3	-23/+11
\| *	add unit tests for share target conflict with group shares	Robin Appelman	2015-08-05	1	-0/+39
* \|	Merge pull request #16961 from owncloud/hardening-ldap	Jörn Friedrich Dreyer	2015-08-06	3	-1/+191
\|\ \
\| * \|	integration tests for hardening user home retrieval	Arthur Schiwon	2015-08-06	1	-0/+159
\| * \|	Only throw exception if on new LDAP setups	Morris Jobke	2015-07-29	2	-2/+30
\| * \|	Hardening home folder retrieval in user_ldap	Morris Jobke	2015-07-29	1	-1/+4
* \| \|	Merge pull request #17810 from owncloud/better-enc-warnings	Bernhard Posselt	2015-08-06	2	-3/+16
\|\ \ \
\| * \| \|	condense doc warnings into small section that gets showed to the user before ...	Bernhard Posselt	2015-07-22	2	-3/+16
* \| \| \|	Merge pull request #18084 from owncloud/ocs-anything-other-then-100-means-fai...	Thomas Müller	2015-08-05	2	-6/+2
\|\ \ \ \
\| * \| \| \|	Following the spec:	Thomas Müller	2015-08-05	2	-6/+2
* \| \| \| \|	Merge pull request #18077 from owncloud/fix_18055	Morris Jobke	2015-08-05	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Set proper mimetype for directories	Roeland Jago Douma	2015-08-05	1	-1/+1
* \| \| \| \|	Merge pull request #18035 from owncloud/ocs-2.0	Bernhard Posselt	2015-08-05	10	-203/+211
\|\ \ \ \ \
\| * \| \| \| \|	Return 200 not null - we should return consistent types	Thomas Müller	2015-08-05	2	-1/+4
\| * \| \| \| \|	Fix unit test within OCSController	Thomas Müller	2015-08-03	2	-6/+9
\| * \| \| \| \|	Remove duplicate and unused code	Thomas Müller	2015-08-03	5	-175/+42
\| * \| \| \| \|	Fix authors	Thomas Müller	2015-08-03	1	-7/+1
\| * \| \| \| \|	Reduce duplicate code	Thomas Müller	2015-08-03	3	-15/+46
\| * \| \| \| \|	Adding ocs/v2.php with status code mapper	Thomas Müller	2015-08-03	3	-8/+118
* \| \| \| \| \|	Merge pull request #18057 from owncloud/import_root_certificates	Thomas Müller	2015-08-05	5	-10/+72
\|\ \ \ \ \ \
\| * \| \| \| \| \|	also block certificate management in the back-end if external storages are di...	Bjoern Schiessle	2015-08-04	3	-9/+53
\| * \| \| \| \| \|	only add the possibility to import ssl root certificates to the personal	Bjoern Schiessle	2015-08-04	2	-1/+19
* \| \| \| \| \| \|	Merge pull request #18068 from owncloud/update-pear	Thomas Müller	2015-08-05	1	-0/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Update submodule after merge in 3rdparty	Thomas Müller	2015-08-05	1	-0/+0
\| * \| \| \| \| \|	remove old pear classes	Thomas Müller	2015-08-05	1	-0/+0
\| * \| \| \| \| \|	"pear/pear-core-minimal": "v1.10.0alpha2"	Thomas Müller	2015-08-05	1	-0/+0
* \| \| \| \| \| \|	Merge pull request #17961 from owncloud/make_knowledgebase_configurable	Thomas Müller	2015-08-05	3	-1/+27
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	make knowledge base url configurable	Bjoern Schiessle	2015-07-29	3	-1/+27
* \| \| \| \| \| \| \|	Merge pull request #18062 from owncloud/use-full-namespace	Thomas Müller	2015-08-05	2	-7/+7
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use absolute namespace	Lukas Reschke	2015-08-05	2	-7/+7
* \| \| \| \| \| \| \|	Merge pull request #18059 from owncloud/use-hash-comparison-on-the-requesttoken	Thomas Müller	2015-08-05	3	-7/+103
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove "use" statement	Lukas Reschke	2015-08-05	2	-4/+6
\| * \| \| \| \| \| \|	Use StringUtils::equals on CSRF token and add unit tests	Lukas Reschke	2015-08-04	2	-5/+99
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #18024 from owncloud/phpseclib-2.0	Thomas Müller	2015-08-04	6	-25/+28
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Rebase upon newest master	Lukas Reschke	2015-08-04	1	-0/+0
\| * \| \| \| \| \| \|	Update phpseclib to 2.0	Andreas Fischer	2015-08-03	6	-25/+28
* \| \| \| \| \| \| \|	Merge pull request #18050 from owncloud/php7-catch-type-error	Morris Jobke	2015-08-04	1	-2/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	[PHP 7] Change type hint to also accept Errors	Lukas Reschke	2015-08-04	1	-2/+2
* \| \| \| \| \| \| \| \|	Merge pull request #18052 from owncloud/fix-php7-SearchResultSorter-2	Thomas Müller	2015-08-04	1	-7/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove pointless unit test	Thomas Müller	2015-08-04	1	-7/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #18037 from owncloud/shared-propagate-check-recipient	Thomas Müller	2015-08-03	2	-7/+16
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	fix infinite loops with propagating etags on reshares	Robin Appelman	2015-08-03	2	-7/+16
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #17820 from owncloud/dav-exception-log-class	Morris Jobke	2015-08-03	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	also log the class for dav exceptions	Robin Appelman	2015-07-24	1	-0/+1
* \| \| \| \| \| \| \|	Merge pull request #18009 from owncloud/enc_always_update_file_cache	Thomas Müller	2015-08-03	2	-8/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	always update file cache, the cache can handle partial data correctly if the ...	Bjoern Schiessle	2015-07-31	2	-8/+9
* \| \| \| \| \| \| \|	Merge pull request #17989 from owncloud/enc_only_update_file_cache_once	Björn Schießle	2015-08-03	2	-7/+22
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	only update database on the first run (first run = we have a version number f...	Bjoern Schiessle	2015-07-31	2	-7/+22
* \| \| \| \| \| \| \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-08-03	2	-2/+2
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|