mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,651 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

616 Commits

Author SHA1 Message Date
Thomas Müller 72e1a8d83b fixing require to Pimple 2013-08-20 12:47:23 +02:00
icewind1991 d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota 
Move quota logic from filesystem proxy to storage wrapper
 2013-08-19 03:38:55 -07:00
Georg Ehrke f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Robin Appelman d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Thomas Müller fde9cabe97 initial import of appframework 2013-08-17 11:16:48 +02:00
kondou 9c5416fe4a Clean up \OC\Util 
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
 2013-08-15 15:57:32 +02:00
Georg Ehrke 4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Robin Appelman 1877a42a0d Scanner: additional tests for reusing etags during scanning 2013-08-12 15:37:15 +02:00
Thomas Müller 0e3dea7111 adding test case for a numeric value 2013-08-09 23:36:23 +02:00
Andreas Fischer b6b1bc5d09 Add datetime test for numeric string. 2013-08-09 22:32:38 +02:00
Owen Winkler a2ac5e0163 Merge pull request #4271 from owncloud/plural_translations 
Plural translations
 2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer e38025ba67 Merge pull request #4151 from owncloud/doctrine-object 
Move dbtype depending logic into object per type
 2013-08-08 08:46:30 -07:00
Thomas Müller fed1792510 adding unit tests for quota checks 2013-08-08 13:33:00 +02:00
Thomas Müller d3a69bf4c6 adding unit tests to determine length 2013-08-08 11:04:40 +02:00
kondou 6c78152564 Proper WHERE – the table is called userid not user 2013-08-06 17:31:50 +02:00
kondou d70a4a960d Use setUpBeforeClass() and tearDownAfterClass() 2013-08-06 17:30:58 +02:00
kondou b8bfebe51e Use setUpBeforeClass() and tearDownAfterClass() 2013-08-06 17:26:12 +02:00
kondou b560bb21f0 Clean up DB, after we're done with testing 2013-08-06 17:01:01 +02:00
Robin Appelman 3e7a86c6ec remove deleted files while scanning 2013-08-06 15:59:06 +02:00
Robin Appelman 95a959b10b merge master into doctrine-object 2013-08-06 15:43:58 +02:00
Morris Jobke 057d7aa108 Merge pull request #4321 from owncloud/add_unittests_kondou 
Add unittests
 2013-08-06 04:39:20 -07:00
kondou 87ad677151 Remove pointless unittest (search/result) 2013-08-05 19:38:52 +02:00
kondou a51af39595 Add unittests 
Unittests for:

- search/result

- util

- preferences
 2013-08-05 14:47:14 +02:00
Georg Ehrke af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Thomas Müller 19e3780ef2 remove unneeded vars from unit test 2013-08-05 10:21:51 +02:00
Thomas Müller e04bf0aaeb unit tests for plural translations added 2013-08-02 23:08:41 +02:00
kondou 56549dafce Revert "Add null and emptystring tests to check NOT NULL" 
This reverts commit c74f3d0b90.
 2013-08-02 21:27:33 +02:00
Robin Appelman ed054e67d6 DB: remove invalid asserts 2013-08-02 20:10:26 +02:00
kondou c74f3d0b90 Add null and emptystring tests to check NOT NULL 2013-08-02 15:59:33 +02:00
kondou de0dc30d89 Update skipped tests messages 2013-08-02 15:00:12 +02:00
kondou 670242c731 Add \OC_Appconfig Unittest 2013-08-02 13:22:12 +02:00
kondou 20b688d4be Optimize image and skip mimetype test 2013-08-01 20:17:43 +02:00
kondou 415e38fc50 Cover more cases 
Use file_get_contents() and base64_encode(file_get_contents()),
to load from data and base64, to cover more cases
 2013-08-01 20:17:43 +02:00
kondou 71f43c5fa1 Add OC_Image Unit Test 
data() somehow does not return, what file_get_contents() returns,
so I skipped related tests.
 2013-08-01 20:17:43 +02:00
Jörn Friedrich Dreyer eed63ae512 Merge pull request #4221 from owncloud/fix-3698 
Fix calculating size for empty folders
 2013-08-01 08:05:19 -07:00
Morris Jobke 30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans 
Fix boolean support for xml schema definitions
 2013-08-01 02:09:01 -07:00
Morris Jobke 50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid 
test lastinsertid
 2013-07-31 00:03:29 -07:00
Thomas Müller 409268f322 adding test case with no / 2013-07-30 08:54:39 +02:00
Thomas Müller f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Thomas Müller 085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
Robin Appelman a4df982dc3 add tests for MDB2SchemaReader 2013-07-29 16:33:27 +02:00
Michael Gapczynski afff750011 Add test for calculating size of newly empty folder 2013-07-29 10:23:14 -04:00
Jörn Friedrich Dreyer b8bd1e5a81 check type, assertgreaterthan 2013-07-29 02:17:09 +02:00
Jörn Friedrich Dreyer 7e5ae8d780 test lastinsertid 2013-07-29 01:57:30 +02:00
Bart Visscher e4132a61c9 Merge pull request #4093 from owncloud/storage-test-cleanup 
Remove outdated unit tests for storage backend
 2013-07-26 03:18:39 -07:00
Robin Appelman cd8f0c21ce add quota storage wrapper 2013-07-25 00:31:51 +02:00
Robin Appelman a853968f7d move storage wrapper test to new namespace 2013-07-25 00:31:51 +02:00
Robin Appelman 10d3e63ce5 add quota streamwrapper that limits the amount of data that can be written to a stream 2013-07-25 00:31:51 +02:00
Bart Visscher 25003fb213 Add ACPu memory cache 2013-07-24 21:50:15 +02:00
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 c517c845f6 Merge branch 'master' into storage-test-cleanup 
Conflicts:
	tests/lib/files/storage/storage.php
 2013-07-24 01:01:36 +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
Robin Appelman cfac7fcd53 Storage: remove some unneeded strict tests of mtime behaviour 2013-07-16 23:07:35 +02:00
Robin Appelman 97f0bc1c4a Storage: remove tests for search 2013-07-16 23:05:23 +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
Georg Ehrke 7f3dbb6936 remove debug code ... 2013-07-11 13:41:09 +02:00
Georg Ehrke 89554bd917 it's setValue not getValue, damn type 2013-07-11 13:39:10 +02: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
Georg Ehrke a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02: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
Thomas Müller c777026506 Merge pull request #3775 from owncloud/test_fixes_for_dbschema 
use executeAudited, add table name to assert message, skip schema changi...
 2013-07-01 14:38:28 -07:00
Thomas Müller b4f7a88788 rename can cause mtime change - invalid assert 2013-07-01 22:02:21 +02:00
Thomas Müller 8beec2015a Merge pull request #3763 from owncloud/recursive-rmdir 
Make rmdir recursive for local storage
 2013-06-30 09:16:32 -07:00
Bart Visscher d699ee9845 Merge pull request #3635 from owncloud/storage-wrapper 
Give apps the option to wrap storage backends
 2013-06-29 04:00:03 -07:00
Morris Jobke c2ac0fb4df Merge pull request #3881 from owncloud/archive_tar_php5.5 
Skip Test_Archive_TAR in php 5.5 for now
 2013-06-28 13:41:18 -07:00
Morris Jobke 67ed48d4c9 Merge pull request #3884 from owncloud/fixing-unittests-master 
Fixing unittests master
 2013-06-28 13:38:44 -07:00
icewind1991 30a403e327 Merge pull request #3892 from owncloud/static-streamwrapper 
Improvements for the static:// streamwrapper
 2013-06-28 12:24:33 -07:00
Bart Visscher c80e76720f Going from text to clob is not something we do. 
Also Oracle DB has problems with this, see
http://abhijitbashetti.blogspot.de/2011/10/converting-varchar2-to-clob-and-clob-to.html
 2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer 4bbdd67a22 remove wrong check here 2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer 7b6fcddbc5 use executeAudited, add table name to assert message, skip schema changing test on oracle 2013-06-28 20:13:48 +02:00
Robin Appelman a0d8377109 better unit tests for static stream wrapper 2013-06-28 19:59:04 +02:00
Robin Appelman a7c70915d5 fix storage wrapper namespaces 2013-06-28 18:18:12 +02:00
Thomas Mueller de66861ef1 make phpunit happy - adding asserts 2013-06-28 15:13:57 +02:00
Thomas Mueller 3abeb252d8 make PHPUnit happy and add asserts 2013-06-28 14:37:52 +02:00
Thomas Mueller 42cb77b982 TimedJob: make PhpUnit happy with asserts 2013-06-28 13:24:24 +02:00
Bart Visscher 7f3ddd4341 Skip Test_Archive_TAR in php 5.5 for now 2013-06-28 11:30:47 +02:00
Bart Visscher 12976fb2e1 Set debugMode after reading the config file 2013-06-27 22:50:28 +02:00
Bart Visscher 194b61b4c5 Revert "Can't determine if debug mode is defined until we read the config" 
This reverts commit 969e43c87b.
 2013-06-27 22:24:17 +02:00
Bart Visscher c6bbccc776 Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
	lib/setup.php
 2013-06-27 17:54:17 +02:00
Bart Visscher 0c680b46cd View test needs a dummy user 2013-06-26 20:48:54 +02:00
Georg Ehrke c7fdf00e84 add unit tests for preview lib to make @DeepDiver1975 happy 2013-06-26 11:18:53 +02:00
Bart Visscher 769212a9a0 numRows doesn't work with Oracle 2013-06-24 22:38:19 +02:00
Bart Visscher b980987e32 Doctrine only returns false 2013-06-24 22:38:19 +02:00
Bart Visscher 23da0c7d18 Fix tableExists test function for Oracle 2013-06-24 22:38:19 +02:00
Bart Visscher 6887d7daf5 Skip Test_Archive_TAR in php 5.5 for now 2013-06-24 22:38:05 +02:00
Jörn Friedrich Dreyer 1b97c186b4 use assertEquals number of rows in db tests 2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer 4ecca9e97b graceful teardown of cache 2013-06-24 12:59:56 +02:00
Thomas Müller 59d3c5a575 Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test 
skip teardown if cache has not been set up
 2013-06-20 04:07:33 -07:00
Jörn Friedrich Dreyer 7a7b54c4a2 skip teardown if cache has not been set up 2013-06-20 11:41:07 +02:00
Thomas Mueller 5d0a3f981c adding unit test for folder remove: testRemovedFolder() 2013-06-20 10:47:37 +02:00
Robin Appelman ff7e903f82 remove deleted files when re-scanning a folder 2013-06-20 00:42:34 +02:00
icewind1991 cb41b88520 Merge pull request #3764 from owncloud/scanfolder-existing 
Improve re-using existing data in the filescanner
 2013-06-19 04:30:55 -07:00
Jörn Friedrich Dreyer 904227a0e4 Merge pull request #3661 from owncloud/fixing-windows-server-master 
Fixing windows server master
 2013-06-19 02:42:18 -07:00
Robin Appelman 0b74e71de8 fix updaters test cases 2013-06-19 00:26:47 +02:00
Robin Appelman 2ed0e6e915 add tests for reusing existing data in scanner 2013-06-17 18:03:57 +02:00
Robin Appelman 63c898c064 Make rmdir recursive for local storage 2013-06-17 17:34:09 +02:00
Thomas Müller e013e7adea Merge pull request #3621 from owncloud/path-mimetype 
seperate mimetype guessing from filename
 2013-06-16 13:14:16 -07:00
Robin Appelman d42f7b85f3 Basic tests for getFileNameMimeType 2013-06-16 20:19:37 +02:00
Jörn Friedrich Dreyer fc309caf16 fix oci dbschema test 2013-06-14 12:12:32 +02:00
Thomas Müller 54f3174665 Merge pull request #3640 from infoneo/master 
Folders with multiple periods problem fix
 2013-06-13 03:34:36 -07:00
Michael Gapczynski 2a3887a5d7 Add tests for the updater with mount points 2013-06-12 15:32:00 -04:00
Jörn Friedrich Dreyer 0eed1c980d Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2 
fix fetchRow checks to also work with MDB2
 2013-06-11 06:20:27 -07:00
Thomas Müller 74b1f7d448 Merge pull request #3646 from owncloud/introduce_phpunit_timeouts 
add timeouts 3/30/90 to phpunit tests
 2013-06-11 01:52:10 -07:00
Michael Gapczynski 969e43c87b Can't determine if debug mode is defined until we read the config 2013-06-10 12:07:25 -04:00
Jörn Friedrich Dreyer 875c18b115 fix fetchRow checks to also work with MDB2 2013-06-10 17:43:09 +02:00
Thomas Müller b66559247a Merge pull request #3653 from owncloud/shorten_identifiers_in_tests 
shorten table identifiers in tests
 2013-06-10 08:38:54 -07:00
Jörn Friedrich Dreyer fc27052887 shorten table identifiers in tests 2013-06-10 11:44:04 +02:00
Jörn Friedrich Dreyer b6f8d2b859 raise failed tests from first commit to size @medium 2013-06-10 10:17:47 +02:00
Jörn Friedrich Dreyer 124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
Jörn Friedrich Dreyer 73fb722a9e add timeouts 3/30/90 to phpunit tests 2013-06-10 09:31:22 +02:00
infoneo 199207253e Update mapper.php 2013-06-08 19:44:58 +03:00
Robin Appelman 31693d3937 add test cases for Mount 2013-06-07 17:40:38 +02:00
Robin Appelman f35578ec54 merge master into storage-wrapper 2013-06-07 17:12:16 +02:00
Michael Gapczynski 1c61732193 Merge branch 'master' into convert-oc_config 2013-06-03 18:06:13 -04:00
Arthur Schiwon 61dadb05a6 Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location 2013-06-03 22:37:14 +02:00
icewind1991 8c991d97aa Merge pull request #3561 from owncloud/user 
Refactor of user management
 2013-06-03 08:13:40 -07:00
Robin Appelman 251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
icewind1991 94a6622bcd Merge pull request #3459 from owncloud/fix_for_2377 
fix problems with german "Umlaut" in folder name
 2013-05-31 14:00:02 -07:00
Robin Appelman 955bda1842 New user management classes 2013-05-29 00:31:55 +02:00
Robin Appelman fa6bfe8837 didn't mean to commit this yet 2013-05-28 17:21:44 +02:00
Robin Appelman 57f712f8a9 implement ArrayInterface with Session 2013-05-28 16:52:40 +02:00
Robin Appelman 76d13120ea Abstract the session away in a class 2013-05-28 00:50:00 +02:00
Florin Peter adcafbde34 Merge branch 'master' into fix_for_2377 2013-05-25 20:37:28 +02:00
Florin Peter 4eddef1556 improved tests to check if database layer normalize folder names 2013-05-25 20:36:51 +02:00
Michael Gapczynski 0fdf3a7e63 Merge pull request #3388 from roha4000/master 
Duplicate DB entries in filecache table when renaming folder in WebUI #2
 2013-05-25 11:18:20 -07:00
Florin Peter 946e9ccc0a Merge branch 'master' into fix_for_2377 2013-05-24 20:54:13 +02:00
Florin Peter 5076c0d392 changed tests for using new normalizer 2013-05-24 20:37:11 +02:00
Thomas Müller 4911305887 Merge pull request #3416 from owncloud/files_encryption 
New files encryption app
 2013-05-24 02:21:19 -07:00
Florin Peter d4b700ef4e revert previous fix and added normalizer to cache class 2013-05-23 20:29:46 +02:00
Michael Gapczynski 30330b4343 Merge branch 'master' into move-storages 
Conflicts:
	tests/lib/files/view.php
 2013-05-23 10:25:12 -04:00
Roland Hager 5c112657b2 New tests to assure that a move will not affect another users cache entries 
Added a second storage and cache Object to simulate a second user.
 2013-05-22 08:19:15 +02:00
Florin Peter 28d72b822d Merge branch 'master' into files_encryption 
Conflicts:
	lib/files/cache/cache.php
 2013-05-22 01:26:35 +02:00
Thomas Müller e2444ec9c5 Merge pull request #3266 from owncloud/hooks 
New hook system
 2013-05-21 15:21:25 -07:00
Robin Appelman 81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Björn Schießle 5cd14425f9 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
 2013-05-21 15:30:19 +02:00
Thomas Tanghus 946740a71f Add test for renaming non-existing category. 2013-05-20 13:57:18 +02:00
Thomas Tanghus b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Florin Peter 31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Michael Gapczynski fc5bce1f76 Fix undefined variable for copying empty folders 2013-05-19 15:04:41 -04:00
Michael Gapczynski e9b71eed69 Add tests for copying/moving between storages 2013-05-19 14:20:46 -04:00
Thomas Mueller 195f6143a3 Merge branch 'master' into convert-oc_config 2013-05-15 23:51:13 +02:00
Thomas Mueller 3c779b0632 Merge branch 'master' into hooks 2013-05-15 23:49:41 +02:00
Thomas Tanghus cb41a30b00 Add Compound property to avoid double escaping values. 2013-05-15 18:56:54 +02:00
Florin Peter 9b7f02f267 removed FileProxy from test 2013-05-15 10:20:52 +02:00
Thomas Tanghus 0d852dce3b Use new autoloader class 2013-05-11 22:44:45 +02:00
Robin Appelman 990f23c024 fix typo 2013-05-09 22:52:44 +02:00
Robin Appelman ba9db19640 Add wrapper storage backend 2013-05-08 16:53:05 +02:00
Robin Appelman 71fc4a2cf4 Autoloader: fix loading app clases located in lib/ 2013-05-08 00:50:33 +02:00
Robin Appelman e21a3a1a23 Autoloader: test cases 2013-05-07 23:08:36 +02:00
Bart Visscher 07df94def6 Convert OC_Config to object interface 2013-05-07 19:59:46 +02:00
icewind1991 5b61c5d478 Merge pull request #3044 from owncloud/backgroundwatcher 
Add a background job to watch for external filesystem changes
 2013-05-07 10:00:00 -07:00
Michael Gapczynski 349a533f66 Merge pull request #3025 from owncloud/move-file 
Cache: only look for child entires when doing a move operation when moving a folder
 2013-05-07 07:52:57 -07:00
Robin Appelman b8a421a86d New hook system 2013-05-07 16:34:09 +02:00