b70d67d49a
Merge pull request #5237 from owncloud/coverage-on-windows-master
...
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
cdaa1db0d1
re-enable test in SecurityMiddlewareTest
2013-10-16 16:33:56 +02:00
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
e2cc7e7bf9
Fix avatar unittest
2013-10-15 17:23:47 +02:00
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
0b8273c768
test should work now
2013-10-15 11:53:32 +02:00
7caf011b9a
fixing syntax for openssl config
2013-10-15 00:44:55 +02:00
bf99d9233c
on windows we supply an openssl.cnf file in order to execute the unit tests properly
2013-10-15 00:29:47 +02:00
86f6f0ca92
Merge branch 'master' into coverage-on-windows-master
2013-10-15 00:09:00 +02:00
6df5c7ebd5
streamCopy() should return proper structure.
...
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +02:00
26c0007a5f
Merge pull request #5263 from owncloud/fixing-5255-master
...
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
bc6e352ccd
the path need to be normalized before putting it into resolvePath()
...
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
2013-10-10 16:06:26 +02:00
1378af838c
merge master into hooks-view-same-start
2013-10-10 11:34:30 +02:00
7f8eeb0474
ensure the view's root is a subfolder of the the default root, not only starting the same
2013-10-09 20:46:43 +02:00
38c563dcdc
don't trigger the create hooks when if the file already exists for file_put_contents
2013-10-09 20:34:18 +02:00
44ece73c23
win32-phpunit.php is no longer required
2013-10-09 16:54:41 +02:00
fe64f7b900
Merge pull request #5032 from owncloud/fixing-5006-master
...
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
* owncloud/fixing-5006-master:
Use strict comparison === instead of ==.
Adjust return value tests for checkPassword() to what OC_User_Example says.
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
Use parent:: in Test_User_Database::getUser().
Test_User_Backend::getUser() does not return an array, it returns a string.
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
24e99016a9
Merge pull request #5188 from owncloud/master-delete-user
...
User::delete should return bool
2013-10-08 13:28:19 -07:00
114e9d4403
Adjust return value tests for checkPassword() to what OC_User_Example says.
2013-10-08 19:57:37 +02:00
1f11dc7200
Use parent:: in Test_User_Database::getUser().
2013-10-08 19:36:37 +02:00
46cd3082b0
Test_User_Backend::getUser() does not return an array, it returns a string.
2013-10-08 19:36:37 +02:00
00a0588807
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 19:36:37 +02:00
176c2f1502
Add unit tests
2013-10-08 16:33:56 +03:00
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +02:00
c77f74e1de
adding check isDeletable() on $sourcePath
2013-10-08 11:43:44 +02:00
1e47468c53
Merge pull request #4974 from owncloud/fixing-4011-master
...
error handling added in case file_put_contents is failing
2013-10-07 02:58:00 -07:00
3ea2dfa5f9
remove getTrans() from API class
2013-10-07 11:36:38 +02:00
1e5012fc1d
fixing all appframework unit tests
2013-10-07 11:25:50 +02:00
c85621a897
Make abstract Middleware class public
...
It doesn't make sense for subclasses to have to implement
all methods.
2013-10-05 16:59:06 +02:00
a82211220c
Merge pull request #5125 from owncloud/fixing-5122-master
...
upload abortion detection only for PUT
2013-10-05 02:25:45 -07:00
414b2eb4b6
upload abortion detection only for PUT
...
e.g. LOCK would break with this approach
2013-10-04 20:20:33 +02:00
bae121b16d
Merge pull request #5068 from owncloud/improved_request
...
Improved request
2013-10-04 09:05:20 -07:00
2cdf54b77d
Merge pull request #4877 from owncloud/ocs_share_api
...
OCS Share API
2013-10-04 07:10:21 -07:00
aebc330f26
Merge branch 'master' into fixing-4011-master
2013-10-04 14:06:42 +02:00
b0bb64c3ee
Added unit tests for relative_modified_date, changed method signature
...
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.
Added unit test for date and time cases.
2013-10-03 13:55:05 +02:00
aedc427ffd
Fix fix of POST :P
2013-10-03 03:56:37 +02:00
965ce5719f
Modified PUT behaviour
...
Now only non-parable PUT requests return a stream resource.
2013-10-02 22:13:40 +02:00
ceeb22aa5f
fix unit tests
2013-10-02 11:25:44 +02:00
7cd8088845
Add assertions for ->params and array access with json
2013-10-01 20:15:03 +02:00
973bcccd7c
Implement PUT an PATCH support
2013-10-01 20:13:13 +02:00
bdad7697ac
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
8603f956ab
Get urlParams registered before Request is instantiated
2013-10-01 19:03:34 +02:00
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
c62dc4fa80
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 11:36:08 +02:00
fdc87eaeb3
adding test testSimplePutFailsOnRename()
2013-09-30 11:30:34 +02:00
e3dee63339
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
2013-09-30 10:46:50 +02:00
629faf6d34
Merge branch 'master' into appframework-master
2013-09-30 10:42:05 +02:00
Thomas Müller
kondou
Bjoern Schiessle
Thomas Tanghus
VicDeo
Robin Appelman
Andreas Fischer
Victor Dubiniuk
Frank Karlitschek
Bart Visscher
Björn Schießle
Vincent Petry
Morris Jobke