10 commits

Author	SHA1	Message	Date
Joas Schilling	0215b004da	Update with robin	2016-07-21 18:13:58 +02:00
Joas Schilling	813f0a0f40	Fix apps/	2016-07-21 18:13:57 +02:00
Morris Jobke	c2d88a08b7	Remove unneeded checks if it runs on a Windows machine ... * the setup check is still there	2016-07-08 15:55:17 +02:00
Lukas Reschke	6670d37658	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-27 18:23:00 +02:00
Vincent Petry	0d3de20b02	Quickfix: do not lazy load auth mechanisms for ext storages ... Some auth mechanisms like SessionCredentials need to register hooks early, so they cannot be lazy loaded.	2016-06-27 10:50:10 +02:00
Lukas Reschke	d5dd30c3a0	Add "Login credentials" and "User Provided" ... This adds the "Login Credentials" and "User Provided" option to the external storage implementation, it is basically done by reverting 176fb191b7 from https://github.com/owncloud/core/pull/22432. This was taken from owncloud/core which is AGPL licensed.	2016-06-21 14:58:35 +02:00
Robin Appelman	6affbdc6e7	Add "Global Auth" option to external storage ... This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93 from https://github.com/owncloud/core/pull/22468. This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync. 	2016-06-21 14:16:45 +02:00
Robin McCorkell	4ea7a349d2	Fix SMB backend registration	2016-05-30 21:25:10 +01:00
Lukas Reschke	aba539703c	Update license headers	2016-05-26 19:57:24 +02:00
Joas Schilling	328b3c47d7	Move stuff from outside lib/ to PSR-4	2016-05-24 08:41:20 +02:00