Jan-Christoph Borchardt 241e397326 Merge branch 'master' into contactsmenu ... Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>		2017-04-26 00:50:38 +02:00
..
Core	Merge branch 'master' into contactsmenu	2017-04-26 00:50:38 +02:00
Settings	Add installed category in AppSettingsControlerTest	2017-04-25 00:22:57 +02:00
acceptance	Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link	2017-04-25 14:12:44 +02:00
apps	[App Code Check] add check for version and mandatory fields	2015-09-24 11:58:12 +02:00
data	Fix translations	2017-04-18 16:40:53 -05:00
docker	Namespace and array syntax fixes	2017-03-19 14:52:54 -06:00
lib	Merge branch 'master' into contactsmenu	2017-04-26 00:50:38 +02:00
objectstore	make object prefix configurable	2016-11-14 15:10:56 +01:00
travis	Changed name of default logfile from owncloud.log to nextcloud.log.	2016-07-04 11:50:32 +02:00
apps.php	Fix the tests again	2016-05-25 16:51:02 +02:00
bootstrap.php	unit test adjustment	2017-04-07 18:06:50 +08:00
enable_all.php	Fix tests	2016-10-31 17:17:45 +01:00
karma.config.js	JS tests for upload only function	2017-04-18 20:43:25 +05:45
phpunit-autotest-external.xml	Adjust the phpunit config	2016-05-25 15:14:37 +02:00
phpunit-autotest.xml	Fix tests	2017-04-04 10:29:12 +02:00
preseed-config.php	add ci support for s3 object store	2017-01-02 14:17:19 +01:00
startsessionlistener.php	Make compatible with PHPUnit 5.1	2015-12-10 09:22:41 +01:00