Commit Graph

408 Commits

Author SHA1 Message Date
icewind1991 98858e6f00 Merge pull request #3995 from owncloud/groups
Refactoring of group management code
2013-07-24 06:13:05 -07:00
Morris Jobke 2622839fcf Merge pull request #4171 from owncloud/fix-config
Fix config
2013-07-24 00:48:43 -07:00
Thomas Müller 60ce492fac Merge branch 'master' into groups 2013-07-24 01:11:12 +02:00
Thomas Müller 5fc0535f1b Merge pull request #4090 from owncloud/cleanup-some-template-functions
Cleanup some template functions
2013-07-23 15:53:43 -07:00
Robin Appelman fb40d9e1e6 Merge branch 'master' into groups 2013-07-23 22:06:03 +02:00
Bart Visscher 5caa7576d4 Revert "fix failing master branch - Test_Config::testWriteData"
This reverts commit 8f93490ac4.
2013-07-23 17:36:08 +02:00
Thomas Müller a2cdf8b91e Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
reworking of \OC\Files\Storage\AmazonS3
2013-07-22 02:19:27 -07:00
Bart Visscher 5965f3ecea Split locating JS and CSS files to their own class 2013-07-21 21:36:15 +02:00
Morris Jobke 8f93490ac4 fix failing master branch - Test_Config::testWriteData 2013-07-21 11:13:29 +02:00
Bart Visscher 084cf0c202 Merge pull request #2221 from owncloud/doctrine
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
Robin Appelman e3ea3ed3c5 group: only pass backends that hold that specific group to the group constructor 2013-07-18 12:15:34 +02:00
Thomas Müller a3ff771567 Merge pull request #4067 from owncloud/fixing-tests-win32-master
<<<EOL seems not to use proper end of lines on windows
2013-07-17 00:37:02 -07:00
Robin Appelman b2bcc9774b memcache: make base testcase abstract 2013-07-16 23:11:22 +02:00
icewind1991 e09ffb6f57 Merge pull request #2395 from owncloud/cache
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
Bart Visscher 285f288cf3 Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
Robin Appelman 504089940d mamcache: implement the ArrayAccess interface 2013-07-16 16:06:00 +02:00
Robin Appelman 8ad148feaf memcache: some additional unit tests 2013-07-16 15:46:27 +02:00
Robin Appelman 0ae8eb4f5e Merge branch 'master' into cache 2013-07-16 15:22:47 +02:00
Thomas Mueller 7ba4269c26 <<<EOL seems not to use proper end of lines on windows 2013-07-15 10:28:14 +02:00
Bart Visscher 5549c77ec5 Merge branch 'master' into doctrine
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
icewind1991 3abe68176f Merge pull request #3270 from owncloud/convert-oc_config
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
icewind1991 d134ba9a82 Merge pull request #3978 from owncloud/forwarding-emitter
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
Robin Appelman 065bc96b02 more consistent naming 2013-07-10 02:17:24 +02:00
Robin Appelman 2d9be541ea add test case for getting group after deleting it 2013-07-10 02:00:14 +02:00
Robin Appelman 912b151561 use new group api as backend for the old api 2013-07-10 00:07:46 +02:00
Robin Appelman a735105a22 update group management 2013-07-10 00:06:22 +02:00
Victor Dubiniuk c0b210f0d5 Add unit test 2013-07-09 17:46:11 +03:00
Bart Visscher 52553c64ed Merge branch 'master' into convert-oc_config
Conflicts:
	lib/config.php
2013-07-08 17:59:50 +02:00
Robin Appelman 4a4e139c83 forward previously registerd hooks 2013-07-08 16:54:26 +02:00
Robin Appelman 925d09cb0e add forwarding emitter for agregating multiple emitters 2013-07-08 16:45:19 +02:00
Thomas Müller 02d2e41e04 Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
fix insertIfNotExist return value, update doc and corresponding test
2013-07-08 07:17:45 -07:00
Christian Berendt 8c9e6db1b1 increasing allowed time difference 2013-07-08 15:03:55 +02:00
Bart Visscher 22c29eb64b Fix renaming using parenthesis 2013-07-05 15:38:09 +02:00
Robin Appelman 492a35737c fix \OC\Config test cases when debug mode is enabled 2013-07-05 15:26:39 +02:00
Robin Appelman f29dd1c784 fix test case whitespace 2013-07-05 15:25:53 +02:00
Robin Appelman 3f5eb762b6 Scanner test: ensure mtime in the cache is the same as on the storage to prevent random failures 2013-07-05 14:51:22 +02:00
Jörn Friedrich Dreyer 00987feda1 fix insertIfNotExist return value, update doc and corresponding test 2013-07-05 14:05:42 +02:00
Bart Visscher 424ec94680 Make buildNotExistingFileName testable and write unittests 2013-07-05 13:03:01 +02:00
Christian Berendt 92e7392852 revoking additional tests 2013-07-04 09:01:36 +02:00
Christian Berendt 37254744b5 remove tests from the wrong test method 2013-07-03 18:41:14 +02:00
Christian Berendt 818e2a364a test moving and copying of subdirectories 2013-07-03 18:38:34 +02:00
Christian Berendt 407753f594 move new tests into the correct test method 2013-07-03 18:34:33 +02:00
Christian Berendt 0a5e18335e test working with files in subdirectories 2013-07-03 18:23:09 +02:00
Christian Berendt e556b7ab55 test working with subdirectories 2013-07-03 18:16:50 +02:00
Christian Berendt 81acfc9498 test copying and moving files in subdirectories 2013-07-03 18:11:54 +02:00
Christian Berendt 21601fd784 increasing difference for modifcation time tests
one second is sometimes not enough when using a slow storage connection,
three seconds is working better (at least when testing against S3)
2013-07-03 18:08:19 +02:00
Thomas Mueller 32d69f6889 Merge branch 'master' into convert-oc_config 2013-07-03 17:03:47 +02:00
Michael Gapczynski 33e1ced53c Merge pull request #3911 from owncloud/fixing-unittests-master
rename can cause mtime change - invalid assert
2013-07-03 06:19:56 -07:00
Thomas Müller e789e05675 on unit test use @expectedException
some phpdoc added
2013-07-02 00:15:42 +02:00
Thomas Müller bb07dde988 Merge branch 'master' into convert-oc_config 2013-07-01 23:43:00 +02:00