5fc0535f1b
Merge pull request #4090 from owncloud/cleanup-some-template-functions
...
Cleanup some template functions
2013-07-23 15:53:43 -07:00
fb40d9e1e6
Merge branch 'master' into groups
2013-07-23 22:06:03 +02:00
5caa7576d4
Revert "fix failing master branch - Test_Config::testWriteData"
...
This reverts commit 8f93490ac4
2013-07-23 17:36:08 +02:00
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
5965f3ecea
Split locating JS and CSS files to their own class
2013-07-21 21:36:15 +02:00
8f93490ac4
fix failing master branch - Test_Config::testWriteData
2013-07-21 11:13:29 +02:00
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
e3ea3ed3c5
group: only pass backends that hold that specific group to the group constructor
2013-07-18 12:15:34 +02:00
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
b2bcc9774b
memcache: make base testcase abstract
2013-07-16 23:11:22 +02:00
cfac7fcd53
Storage: remove some unneeded strict tests of mtime behaviour
2013-07-16 23:07:35 +02:00
97f0bc1c4a
Storage: remove tests for search
2013-07-16 23:05:23 +02:00
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
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
8ad148feaf
memcache: some additional unit tests
2013-07-16 15:46:27 +02:00
0ae8eb4f5e
Merge branch 'master' into cache
2013-07-16 15:22:47 +02:00
7ba4269c26
<<<EOL seems not to use proper end of lines on windows
2013-07-15 10:28:14 +02:00
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
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
7f3dbb6936
remove debug code ...
2013-07-11 13:41:09 +02:00
89554bd917
it's setValue not getValue, damn type
2013-07-11 13:39:10 +02:00
d134ba9a82
Merge pull request #3978 from owncloud/forwarding-emitter
...
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
065bc96b02
more consistent naming
2013-07-10 02:17:24 +02:00
2d9be541ea
add test case for getting group after deleting it
2013-07-10 02:00:14 +02:00
912b151561
use new group api as backend for the old api
2013-07-10 00:07:46 +02:00
a735105a22
update group management
2013-07-10 00:06:22 +02:00
c0b210f0d5
Add unit test
2013-07-09 17:46:11 +03:00
52553c64ed
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-08 17:59:50 +02:00
4a4e139c83
forward previously registerd hooks
2013-07-08 16:54:26 +02:00
925d09cb0e
add forwarding emitter for agregating multiple emitters
2013-07-08 16:45:19 +02:00
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
8c9e6db1b1
increasing allowed time difference
2013-07-08 15:03:55 +02:00
22c29eb64b
Fix renaming using parenthesis
2013-07-05 15:38:09 +02:00
492a35737c
fix \OC\Config test cases when debug mode is enabled
2013-07-05 15:26:39 +02:00
f29dd1c784
fix test case whitespace
2013-07-05 15:25:53 +02:00
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
00987feda1
fix insertIfNotExist return value, update doc and corresponding test
2013-07-05 14:05:42 +02:00
424ec94680
Make buildNotExistingFileName testable and write unittests
2013-07-05 13:03:01 +02:00
92e7392852
revoking additional tests
2013-07-04 09:01:36 +02:00
37254744b5
remove tests from the wrong test method
2013-07-03 18:41:14 +02:00
818e2a364a
test moving and copying of subdirectories
2013-07-03 18:38:34 +02:00
407753f594
move new tests into the correct test method
2013-07-03 18:34:33 +02:00
0a5e18335e
test working with files in subdirectories
2013-07-03 18:23:09 +02:00
e556b7ab55
test working with subdirectories
2013-07-03 18:16:50 +02:00
81acfc9498
test copying and moving files in subdirectories
2013-07-03 18:11:54 +02:00
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
32d69f6889
Merge branch 'master' into convert-oc_config
2013-07-03 17:03:47 +02:00
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
e789e05675
on unit test use @expectedException
...
some phpdoc added
2013-07-02 00:15:42 +02:00
bb07dde988
Merge branch 'master' into convert-oc_config
2013-07-01 23:43:00 +02:00
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
b4f7a88788
rename can cause mtime change - invalid assert
2013-07-01 22:02:21 +02:00
8beec2015a
Merge pull request #3763 from owncloud/recursive-rmdir
...
Make rmdir recursive for local storage
2013-06-30 09:16:32 -07:00
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
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
67ed48d4c9
Merge pull request #3884 from owncloud/fixing-unittests-master
...
Fixing unittests master
2013-06-28 13:38:44 -07:00
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
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
4bbdd67a22
remove wrong check here
2013-06-28 20:16:01 +02:00
7b6fcddbc5
use executeAudited, add table name to assert message, skip schema changing test on oracle
2013-06-28 20:13:48 +02:00
a0d8377109
better unit tests for static stream wrapper
2013-06-28 19:59:04 +02:00
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
de66861ef1
make phpunit happy - adding asserts
2013-06-28 15:13:57 +02:00
3abeb252d8
make PHPUnit happy and add asserts
2013-06-28 14:37:52 +02:00
42cb77b982
TimedJob: make PhpUnit happy with asserts
2013-06-28 13:24:24 +02:00
7f3ddd4341
Skip Test_Archive_TAR in php 5.5 for now
2013-06-28 11:30:47 +02:00
12976fb2e1
Set debugMode after reading the config file
2013-06-27 22:50:28 +02:00
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
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
121e4ca395
PHPUnit: Allow developers to use their own custom phpunit.xml file.
...
The order of precedence of configuration files for PHPUnit is:
- phpunit.xml (allowing custom user defined configuration)
- phpunit.xml.dist (configuration distributed with the software)
2013-06-27 16:31:31 +02:00
0c680b46cd
View test needs a dummy user
2013-06-26 20:48:54 +02:00
c7fdf00e84
add unit tests for preview lib to make @DeepDiver1975 happy
2013-06-26 11:18:53 +02:00
592bb01ccd
phpunit: Remove PHPUnit_Util_Log_JSON which spammed to stdout on console.
2013-06-25 21:57:00 +02:00
769212a9a0
numRows doesn't work with Oracle
2013-06-24 22:38:19 +02:00
b980987e32
Doctrine only returns false
2013-06-24 22:38:19 +02:00
eb90784074
Fix table change tests for OCI
2013-06-24 22:38:19 +02:00
23da0c7d18
Fix tableExists test function for Oracle
2013-06-24 22:38:19 +02:00
6887d7daf5
Skip Test_Archive_TAR in php 5.5 for now
2013-06-24 22:38:05 +02:00
1b97c186b4
use assertEquals number of rows in db tests
2013-06-24 16:29:59 +02:00
4ecca9e97b
graceful teardown of cache
2013-06-24 12:59:56 +02:00
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
7a7b54c4a2
skip teardown if cache has not been set up
2013-06-20 11:41:07 +02:00
5d0a3f981c
adding unit test for folder remove: testRemovedFolder()
2013-06-20 10:47:37 +02:00
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
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
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
0b74e71de8
fix updaters test cases
2013-06-19 00:26:47 +02:00
2ed0e6e915
add tests for reusing existing data in scanner
2013-06-17 18:03:57 +02:00
63c898c064
Make rmdir recursive for local storage
2013-06-17 17:34:09 +02:00
e013e7adea
Merge pull request #3621 from owncloud/path-mimetype
...
seperate mimetype guessing from filename
2013-06-16 13:14:16 -07:00
d42f7b85f3
Basic tests for getFileNameMimeType
2013-06-16 20:19:37 +02:00
0ac7c5712a
Merge pull request #3721 from owncloud/oracle_setup_fixes
...
Oracle setup fixes
2013-06-14 11:21:02 -07:00
22d419b74f
No coverage for tests
2013-06-14 15:42:54 +02:00
9d576de0bd
No coverage for settings/l10n
2013-06-14 15:17:02 +02:00
08f81f3f92
No coverage for lib/l10n and core/l10n
2013-06-14 14:24:58 +02:00
fc309caf16
fix oci dbschema test
2013-06-14 12:12:32 +02:00
54f3174665
Merge pull request #3640 from infoneo/master
...
Folders with multiple periods problem fix
2013-06-13 03:34:36 -07:00
2a3887a5d7
Add tests for the updater with mount points
2013-06-12 15:32:00 -04:00
a2d3c030fb
every test now has 15min to execute
...
we don't want to check performance just yet. we just want to make jenkins end more reliably.
2013-06-12 13:58:25 +03:00
48b5e3d498
allow autotest to run 10x times longer
2013-06-11 15:57:00 +02:00
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
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
969e43c87b
Can't determine if debug mode is defined until we read the config
2013-06-10 12:07:25 -04:00
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02:00
b66559247a
Merge pull request #3653 from owncloud/shorten_identifiers_in_tests
...
shorten table identifiers in tests
2013-06-10 08:38:54 -07:00
fc27052887
shorten table identifiers in tests
2013-06-10 11:44:04 +02:00
b6f8d2b859
raise failed tests from first commit to size @medium
2013-06-10 10:17:47 +02:00
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
73fb722a9e
add timeouts 3/30/90 to phpunit tests
2013-06-10 09:31:22 +02:00
199207253e
Update mapper.php
2013-06-08 19:44:58 +03:00
31693d3937
add test cases for Mount
2013-06-07 17:40:38 +02:00
f35578ec54
merge master into storage-wrapper
2013-06-07 17:12:16 +02:00
db1ca90319
exclude 3rdparty folder within files_external and files_encryption from code coverage
2013-06-04 22:41:52 +02:00
1c61732193
Merge branch 'master' into convert-oc_config
2013-06-03 18:06:13 -04:00
d921004a6e
ignore l10n folder within remaining apps
2013-06-04 00:04:17 +02:00
61dadb05a6
Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location
2013-06-03 22:37:14 +02:00
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
df5f02bed0
Exclude apps/files/l10n from coverage reports
2013-06-03 14:50:36 +02:00
c4ba4b771c
fixing code coverage
2013-06-03 01:01:28 +02:00
17d83cc17f
Fixing code coverage analysis
2013-06-03 01:01:28 +02:00
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
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
955bda1842
New user management classes
2013-05-29 00:31:55 +02:00
fa6bfe8837
didn't mean to commit this yet
2013-05-28 17:21:44 +02:00
57f712f8a9
implement ArrayInterface with Session
2013-05-28 16:52:40 +02:00
76d13120ea
Abstract the session away in a class
2013-05-28 00:50:00 +02:00
adcafbde34
Merge branch 'master' into fix_for_2377
2013-05-25 20:37:28 +02:00
4eddef1556
improved tests to check if database layer normalize folder names
2013-05-25 20:36:51 +02:00
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
946e9ccc0a
Merge branch 'master' into fix_for_2377
2013-05-24 20:54:13 +02:00
5076c0d392
changed tests for using new normalizer
2013-05-24 20:37:11 +02:00
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
d4b700ef4e
revert previous fix and added normalizer to cache class
2013-05-23 20:29:46 +02:00
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
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
28d72b822d
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
e2444ec9c5
Merge pull request #3266 from owncloud/hooks
...
New hook system
2013-05-21 15:21:25 -07:00
81fd1badc3
merge master into filecache_mtime
2013-05-21 23:35:19 +02:00
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
946740a71f
Add test for renaming non-existing category.
2013-05-20 13:57:18 +02:00
b1bb899867
Add rename() method to OC_VCategories.
2013-05-20 10:16:07 +02:00
31037241e1
Merge branch 'master' into files_encryption
2013-05-20 02:25:56 +02:00
fc5bce1f76
Fix undefined variable for copying empty folders
2013-05-19 15:04:41 -04:00
e9b71eed69
Add tests for copying/moving between storages
2013-05-19 14:20:46 -04:00
195f6143a3
Merge branch 'master' into convert-oc_config
2013-05-15 23:51:13 +02:00
3c779b0632
Merge branch 'master' into hooks
2013-05-15 23:49:41 +02:00
cb41a30b00
Add Compound property to avoid double escaping values.
2013-05-15 18:56:54 +02:00
9b7f02f267
removed FileProxy from test
2013-05-15 10:20:52 +02:00
01f1153b08
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
...
Conflicts:
apps/files/l10n/ar.php
apps/files/l10n/bn_BD.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/el.php
apps/files/l10n/es.php
apps/files/l10n/fa.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/id.php
apps/files/l10n/ko.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sl.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files_encryption/l10n/ca.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/sharedstorage.php
apps/user_ldap/l10n/tr.php
core/l10n/cs_CZ.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/ru.php
core/l10n/sk_SK.php
core/l10n/tr.php
core/l10n/vi.php
core/l10n/zh_CN.php
l10n/af_ZA/files.po
l10n/ar/files.po
l10n/be/files.po
l10n/bg_BG/files.po
l10n/bn_BD/files.po
l10n/ca/files.po
l10n/ca/files_encryption.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_encryption.po
l10n/de/files_external.po
l10n/de/files_sharing.po
l10n/de/files_trashbin.po
l10n/de/files_versions.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de/user_ldap.po
l10n/de_DE/files.po
l10n/de_DE/files_encryption.po
l10n/de_DE/files_external.po
l10n/de_DE/files_sharing.po
l10n/de_DE/files_trashbin.po
l10n/de_DE/lib.po
l10n/de_DE/settings.po
l10n/de_DE/user_ldap.po
l10n/el/files.po
l10n/eo/files.po
l10n/es/files.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/files.po
l10n/eu/files.po
l10n/fa/files.po
l10n/fi/files.po
l10n/fi_FI/files.po
l10n/fr/core.po
l10n/fr/files.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/core.po
l10n/he/files.po
l10n/he/user_ldap.po
l10n/hi/files.po
l10n/hr/files.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/hy/files.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_trashbin.po
l10n/ia/settings.po
l10n/id/files.po
l10n/is/files.po
l10n/it/files.po
l10n/ja_JP/files.po
l10n/ja_JP/user_ldap.po
l10n/ka/files.po
l10n/ka_GE/files.po
l10n/kn/files.po
l10n/ko/files.po
l10n/ko/files_trashbin.po
l10n/ko/settings.po
l10n/ku_IQ/files.po
l10n/lb/files.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lv/files.po
l10n/mk/files.po
l10n/ms_MY/files.po
l10n/my_MM/files.po
l10n/nb_NO/files.po
l10n/ne/files.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nn_NO/files.po
l10n/oc/files.po
l10n/pl/files.po
l10n/pl_PL/files.po
l10n/pt_BR/files.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ru/core.po
l10n/ru/files.po
l10n/si_LK/files.po
l10n/sk/files.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sq/files.po
l10n/sr/files.po
l10n/sr@latin/files.po
l10n/sv/files.po
l10n/sw_KE/files.po
l10n/ta_LK/files.po
l10n/te/files.po
l10n/th_TH/files.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/tr/user_ldap.po
l10n/uk/files.po
l10n/ur_PK/files.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/settings.po
l10n/zh_HK/files.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_versions.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
lib/base.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
settings/l10n/es.php
settings/l10n/pt_PT.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
2013-05-15 10:18:25 +02:00
0d852dce3b
Use new autoloader class
2013-05-11 22:44:45 +02:00
990f23c024
fix typo
2013-05-09 22:52:44 +02:00
ba9db19640
Add wrapper storage backend
2013-05-08 16:53:05 +02:00
71fc4a2cf4
Autoloader: fix loading app clases located in lib/
2013-05-08 00:50:33 +02:00
e21a3a1a23
Autoloader: test cases
2013-05-07 23:08:36 +02:00
07df94def6
Convert OC_Config to object interface
2013-05-07 19:59:46 +02:00
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
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
b8a421a86d
New hook system
2013-05-07 16:34:09 +02:00
3c100af132
revert changes to fbbc76f281 because master is very unstable right now
2013-05-01 01:38:06 +02:00
b2da07fe95
Merge branch 'master' into files_encryption to get the latest files_trashbin app
...
Conflicts:
apps/files/l10n/bn_BD.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/hr.php
apps/files/l10n/ms_MY.php
apps/files/l10n/ro.php
apps/files/l10n/si_LK.php
apps/files/l10n/sl.php
apps/files/l10n/ta_LK.php
apps/files_external/l10n/de_DE.php
apps/files_external/l10n/et_EE.php
apps/user_ldap/l10n/tr.php
core/l10n/bg_BG.php
l10n/af_ZA/files.po
l10n/af_ZA/files_external.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_external.po
l10n/be/files.po
l10n/be/files_external.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/files_external.po
l10n/bg_BG/files_trashbin.po
l10n/bg_BG/files_versions.po
l10n/bg_BG/settings.po
l10n/bn_BD/core.po
l10n/bn_BD/files.po
l10n/bn_BD/files_external.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/files_external.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/lib.po
l10n/cy_GB/core.po
l10n/cy_GB/files.po
l10n/cy_GB/files_external.po
l10n/cy_GB/settings.po
l10n/da/core.po
l10n/da/files.po
l10n/da/files_external.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_external.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/files_external.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/files_external.po
l10n/es/core.po
l10n/es/files.po
l10n/es/files_external.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/files_external.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_external.po
l10n/fi/files.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/files_external.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/files_external.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/files_external.po
l10n/he/core.po
l10n/he/files.po
l10n/he/files_external.po
l10n/hi/files.po
l10n/hi/files_external.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/files_external.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hy/files.po
l10n/hy/files_external.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_external.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_external.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_external.po
l10n/it/core.po
l10n/it/files.po
l10n/it/files_external.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_external.po
l10n/ka/files.po
l10n/ka/files_external.po
l10n/ka_GE/core.po
l10n/ka_GE/files.po
l10n/ka_GE/files_external.po
l10n/kn/files.po
l10n/kn/files_external.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/files_external.po
l10n/ku_IQ/files.po
l10n/ku_IQ/files_external.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/files_external.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/files_external.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/files_external.po
l10n/my_MM/files.po
l10n/my_MM/files_external.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/ne/files.po
l10n/ne/files_external.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nn_NO/files.po
l10n/nn_NO/files_external.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/files_external.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/files_external.po
l10n/pl_PL/files.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/files_external.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_external.po
l10n/sk/files.po
l10n/sk/files_external.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_external.po
l10n/sq/core.po
l10n/sq/files.po
l10n/sq/files_external.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/files_external.po
l10n/sr@latin/files.po
l10n/sr@latin/files_external.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/files_external.po
l10n/sw_KE/files.po
l10n/sw_KE/files_external.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/files_external.po
l10n/te/files.po
l10n/te/files_external.po
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_trashbin.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/user_ldap.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_external.po
l10n/ur_PK/files.po
l10n/ur_PK/files_external.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_HK/core.po
l10n/zh_HK/files.po
l10n/zh_HK/files_external.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_external.po
lib/base.php
lib/files/mount/mount.php
2013-04-30 20:53:56 +02:00
27ce7845b4
fixed tests, now tests should work via autotest.sh
...
files_encryption app is now enabled in enable_all.php
2013-04-30 01:35:46 +02:00
d22795d68b
fixed test for crypt and keymanager
...
disabled encryption file proxy in test/lib/cache/file.php
2013-04-29 23:41:49 +02:00
809b5f81f6
Further seperation of mount management logic
2013-04-26 00:01:36 +02:00
cea56df59e
Have the filecache updater testcase clean the filesystem properly
2013-04-25 16:56:48 +02:00
b31dc10c3c
Add support for the old public backgroundjob api
2013-04-24 14:40:49 +02:00
3aecfda0c0
Adjust backgroundjob test cases
2013-04-20 23:51:58 +02:00
7948341a86
Rework background job system
2013-04-20 23:27:46 +02:00
15dae6198f
Cache: add a backgroundjob to check for external changes to the filesystem
2013-04-20 16:38:03 +02:00
10be42f5b7
Cache: only look for child entires when doing a move operation when moving a folder
2013-04-19 15:06:48 +02:00
258ad38fd3
Fix touch for creating new files
2013-04-10 13:48:24 +02:00
721cbe8280
used oc version 5.0.3
2013-04-09 10:47:02 +02:00
11dfc7d141
added yet another test for the verion compare check due to mail
2013-04-09 10:41:25 +02:00
a783bdaec1
StringProperty unittest
2013-04-08 22:54:30 +02:00
93a6ed3dab
Ensure instanceid contains a letter
...
instanceid is generated by uniqid() and then used as the
session_name. Because session_name requires at least one letter
and uniqid() does not guarantee to provide that, in the case that
uniqid() generates a string of only digits, the user will be stuck
in an infinite login loop because every request will generate a
new PHP session.
2013-03-26 21:49:32 +00:00
d49e8ffb5e
Merge pull request #2568 from itheiss/master
...
Implement setting custom domainname for getDefaultEmailAddress
2013-03-26 02:50:11 -07:00
410b991221
Move testcase to own test function
...
Move testcase for getDefaultEmailAddress with mail_domain set in config.php to own test function.
2013-03-26 09:40:27 +01:00
bbeb657c03
Merge pull request #2454 from owncloud/fixing-file-mapper-ext-master
...
Fixing file mapper ext master
2013-03-23 05:34:25 -07:00
d00b2f610e
Extend test case for getDefaultEmailAddress()
...
see #2499
2013-03-22 10:08:53 +01:00
a0ec2d23ef
Fixing author and copyright
2013-03-20 11:28:18 +01:00
5750dc9833
some basic unit test for loading classes
2013-03-19 18:00:15 +01:00
268d4a525d
some more test cases & fix on file name generation with index
2013-03-19 16:57:54 +01:00
0fff3c9698
adding extension to slugified physical path
2013-03-19 16:53:37 +01:00
5418c98a81
Add memcached backend
2013-03-17 16:01:10 +01:00
80a3f8d066
Seperate memory based cache from OC_Cache
2013-03-17 16:00:39 +01:00
7f1ff3e9e1
Merge pull request #2204 from owncloud/chache_updater_rename
...
Cache: better rename hook for cache updater
2013-03-17 05:03:18 -07:00
a05820c659
fixing various filesystem/storage unit tests on windows
...
fixing copy operation on mapper
2013-03-12 15:30:10 +01:00
818c24bd45
skip archive tests for now
2013-03-12 10:33:40 +01:00
d7beac6d6f
Merge branch 'master' into filecache_mtime
...
Conflicts:
lib/files/view.php
lib/util.php
tests/lib/files/cache/cache.php
2013-03-08 15:28:45 -05:00
1d3beffacf
Cache: better rename hook for cache updater
2013-03-08 19:08:07 +01:00
ef2eb10ea4
Change findById to findByStorageId in mount test
2013-03-07 11:47:24 -05:00
a5cab28bea
Fix fetching source path of shared files
2013-03-07 11:12:59 -05:00
6019cdd5bd
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 21:10:18 +01:00
9a2ca0ae64
Check resharing setting
2013-02-26 13:31:15 -05:00
5b250afafc
Merge pull request #1903 from owncloud/fix_version_check
...
return true once one owncloud version number is bigger at any position
2013-02-26 00:37:11 -08:00
f415f3e03e
return true once one owncloud version number is bigger at any position
2013-02-25 23:06:26 +01:00
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
8068051ca4
more tests to fail the version check
2013-02-25 12:47:34 +01:00
5bf3d286f0
created unittests and factored out version test into seperate method
2013-02-25 12:38:00 +01:00
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
f554347db5
Merge pull request #1724 from owncloud/long-storage-id
...
Cache: hash long storage ids to ensure they fit in the database
2013-02-18 07:17:27 -08:00
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
0c1ec758e8
Cache: hash long storage ids to ensure they fit in the database
2013-02-15 22:11:39 +01:00
2ed850e05b
merge master into filecache_mtime
2013-02-15 21:04:48 +01:00
191da024fa
new test cases added to search in sub folders
2013-02-15 17:40:52 +01:00
c0f3d8578a
folder should be created :-(
2013-02-15 17:40:07 +01:00
e3ba0c3082
adding a new test class for mapped local using a dot in the datadir - reflects the issue described in #1659
2013-02-15 14:46:09 +01:00
4b80466880
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
2013-02-14 22:54:48 +01:00
78a3625ddf
final adoptions for mssql connectivity
2013-02-14 21:59:24 +01:00
ad360296b9
Update tests and apps to the new \OC\Files\Filesystem::init signature
2013-02-11 11:06:09 +01:00
9738fae3cf
Emulate touch() for backends that don't support it
2013-02-10 12:44:27 +01:00
3e70d563a6
Cache: bookkeeping of storage_mtime
2013-02-10 12:27:35 +01:00
06bba59249
Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-master
...
Mapped storage unit testing linux master
2013-02-12 22:58:37 -08:00
251b676a06
Merge pull request #1616 from owncloud/cache_fixes_rebase
...
Cache: reuse known folder sizes when doing a shallow scan - rebase
2013-02-12 08:07:49 -08:00
299649b40e
Cache: reuse known folder sizes when doing a shallow scan
2013-02-11 13:33:41 +01:00
8174e5faf1
make MappedLocal available and testable within Linux as well
2013-02-09 19:03:03 +01:00
fd8cb9974b
initial version of a local storage implementation which will use unique slugified filename on the local filesystem.
...
This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.
2013-02-06 23:41:52 +01:00
2dfe67423d
Merge pull request #1509 from owncloud/correct-public-contacts-tests
...
Correct lib/public/contacts.php tests
2013-02-06 12:29:51 -08:00
7d0b4c2581
Merge pull request #1438 from owncloud/phpunit-tests-win32-master
...
PHPUnit support for Windows added
2013-02-06 08:40:53 -08:00
a4d3cc798f
Correct lib/public/contacts.php tests
2013-02-06 17:37:47 +01:00
cbf6b28f45
uncomment failing calls to \OC\Files\Filesystem::file_put_contents
2013-02-05 20:21:29 +01:00
c0263173d2
add phpunit configuration for autotest withou the json listener because this pollutes the console
2013-02-05 20:20:55 +01:00
77369d8164
disable error handler while running phpunit
2013-02-05 16:44:02 +01:00
997259df4b
reuse \OC_Helper::tmpFolder()
2013-02-04 14:11:51 +01:00
07a7478fde
PHPUnit support for Windows added
2013-02-04 10:15:00 +01:00
5d0c5c854b
Cache: use greaterEquals in tests cases to prevent failures due to race conditions
2013-01-30 23:15:45 +01:00
232cc3211b
add oc:// streamwrapper to provide access to ownCloud's virtual filesystem
2013-01-28 15:35:30 +01:00
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
577e3b11d7
Filesystem: return all matching mounts in Mount::findById
2013-01-28 00:59:43 +01:00
17bcea1585
Filesystem: add View->getPath to the cache api
2013-01-27 00:13:50 +01:00
9e2a066c7b
Cache: add function to get storage id and internal path of a file by id
2013-01-27 00:13:50 +01:00
8c42e2de8c
Test cases for new mount management
2013-01-27 00:13:49 +01:00
177537dbcc
Cache: port test cases to PHPUnit
2013-01-26 21:44:33 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
7330fcf5e8
Cache: make mounts overwrite existing folders, prevents duplicate entries
2013-01-22 20:57:15 +01:00
12e286b21c
Merge pull request #1237 from owncloud/fix-template-tests
...
Remove unnecessary ob_end_clean() from template tests
2013-01-22 11:12:40 -08:00
db2b485b96
Cache: fix test case Updater::testRename
2013-01-22 16:36:03 +01:00
465c100d8f
Add tests for mtime changes in folders - testRename is failing right now
2013-01-22 00:43:43 -05:00
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
d8d812a91e
enable unittesting on appframework and apptemplateadvanced
2013-01-21 23:19:17 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
68272fa253
Remove unnecessary ob_end_clean() from template tests
2013-01-19 20:28:45 -05:00
bc8957a195
Add listener for VisualPHPUnit
2013-01-18 23:03:53 -05:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
42678096bb
remove php closing tag
2013-01-14 23:51:58 +01:00
6801f82d09
Merge branch 'filesystem' into filesystem-etags
...
Conflicts:
lib/files/cache/cache.php
2013-01-07 10:28:37 -05:00
Thomas Müller
Robin Appelman
Bart Visscher
Morris Jobke
icewind1991
Georg Ehrke
Victor Dubiniuk
Christian Berendt
Jörn Friedrich Dreyer
Michael Gapczynski
Andreas Fischer
Georg Ehrke
infoneo
Arthur Schiwon
Florin Peter
Roland Hager
Björn Schießle
Thomas Tanghus
Bernhard Posselt
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
itheiss
Frank Karlitschek
Lukas Reschke