5ea06f31b9
Merge pull request #16746 from owncloud/fix-phpdoc
...
Fix typo in PHPDoc
2015-06-04 15:36:15 +01:00
ab5ecb3d22
Fix typo in PHPDoc
2015-06-04 15:19:04 +02:00
66a24ff479
[tx-robot] updated from transifex
2015-06-04 01:56:24 -04:00
bb0cb0aaec
Merge pull request #15895 from owncloud/dav-getremoteetag
...
Get etag from remote OC server
2015-06-03 17:20:25 +02:00
8d860e564a
Merge pull request #16730 from owncloud/LukasReschke-patch-1
...
Fix unit tests
2015-06-03 17:18:06 +02:00
bf07eb45e2
Fix unit tests
...
Regression caused by https://github.com/owncloud/core/pull/16721
Failed the unit tests as per https://ci.owncloud.org/job/server-master-linux/database=sqlite,label=SLAVE/1994/testReport/junit/(root)/Test_Encryption_ManagerTest/testGetEncryptionModuleUnknown/ :
```
Test\Encryption\ManagerTest::testGetEncryptionModuleUnknown
Failed asserting that exception message 'Module with id: unknown does not exist.' contains 'Module with id: unknown does not exists.'
```
2015-06-03 17:07:30 +02:00
5b52670a95
Merge pull request #16703 from owncloud/fix-ie8-ie9
...
Fix IE8 & IE9 - setup page
2015-06-03 16:15:03 +02:00
a90a84b0a7
Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
...
Keep versions when deleting as recipient
2015-06-03 16:03:31 +02:00
00742a9d68
Merge pull request #16721 from owncloud/fix-grammar-enc-module
...
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t …
2015-06-03 09:54:50 -04:00
5dc5b7f86d
Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user.
2015-06-03 15:00:56 +02:00
259b6ac2c1
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746
2015-06-03 14:56:18 +02:00
3d289a58cd
Merge pull request #16719 from owncloud/fix-encryption-tests
...
use not deprecated method in tests
2015-06-03 14:36:10 +02:00
2edcce7e2a
use not deprecated method in tests
2015-06-03 14:33:56 +02:00
739c3f01aa
Merge pull request #16434 from owncloud/persist-maintenance-state
...
Persist the state of the maintenance after an upgrade
2015-06-03 13:56:17 +02:00
69d1e7aaf4
Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version
...
Check for redis to be 2.2.5+
2015-06-03 13:55:26 +02:00
3a233b8698
Merge pull request #16714 from owncloud/fix-cors-test
...
Fix #16713
2015-06-03 13:52:14 +02:00
e3440863bc
Merge pull request #16708 from owncloud/enc_fix_move_to_trash
...
make sure that we always use the correct owner for both source and target
2015-06-03 13:49:46 +02:00
9ba5081d47
Merge pull request #16710 from owncloud/move-invoke-private-to-base-class
...
Move the helpful invokePrivate method to the TestCase class
2015-06-03 13:41:32 +02:00
7de2940b42
Merge pull request #16711 from owncloud/files-invalidchar400
...
Translate invalid path exception to sabre exception for files
2015-06-03 13:40:31 +02:00
21ce5d034b
fix #16713
2015-06-03 12:56:50 +02:00
d3e3a84cae
Move the helpful method to the TestCase class
2015-06-03 12:33:29 +02:00
6ab38be40e
Translate invalid path exception to sabre exception for files
2015-06-03 12:22:31 +02:00
7eb2b31e34
make sure that we always use the correct owner for both source and target
2015-06-03 11:59:06 +02:00
500748725c
Merge pull request #16698 from owncloud/use-proper-quoting
...
Properly quote memcache.locking
2015-06-03 10:45:14 +02:00
49d6186714
Add min-height to login page for IE8 and IE9
2015-06-03 10:22:57 +02:00
99c6f96c69
Revert "fix theme in IE8 and IE9"
...
This reverts commit a4c9688711
2015-06-03 10:20:29 +02:00
410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
b806502cdb
Properly quote memcache.locking
2015-06-02 21:46:57 +02:00
61356b5560
Keep versions when deleting as recipient
...
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.
This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
2015-06-02 17:13:00 +02:00
1cccb227c3
Merge pull request #16686 from owncloud/show_cloud_id
...
show federated cloud id in the personal settings
2015-06-02 17:05:33 +02:00
259937680b
Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares
...
Add tests for the storage wrapper and fix the wrapping
2015-06-02 16:42:32 +02:00
bdc82dcfb9
Check for redis to be 2.2.5+
2015-06-02 15:42:48 +02:00
70f0cf67a5
L10n for federated cloud ID and rtrim '/' on ID
2015-06-02 15:16:21 +02:00
120588dd7a
Disable update check test when testing wrappers
...
The checkUpdate test is intended for testing real storages, not
wrappers.
2015-06-02 15:14:37 +02:00
6e5ed81064
show federated cloud id in the personal settings
2015-06-02 14:09:53 +02:00
3ebc8f0564
Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
...
Fix get local file encryption master
2015-06-02 13:47:37 +02:00
be1f319511
Correctly ignore remote shares aswell
2015-06-02 12:33:51 +02:00
50a31fa8f9
Add unit tests for wrapStorage
2015-06-02 12:33:17 +02:00
9a4040c7ca
Move the storage wrapping into a testable method
2015-06-02 12:29:06 +02:00
c4cb93e644
Added storage backend test for checkUpdate
...
This helps testing whether checkUpdate properly returns false when no
change exists
2015-06-02 11:42:03 +02:00
30d7f92763
Get etag from remote OC server
2015-06-02 11:42:03 +02:00
d2f3710ede
Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview
...
Get a 96x96 preview for file conflict resolution
2015-06-02 09:36:51 +02:00
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
1acdef5e34
Merge pull request #16672 from owncloud/tests-xmlupdate
...
Fix phpunit xml
2015-06-01 21:31:39 +02:00
ac98480028
Fix phpunit xml
...
Rename/remove obsolete paths
2015-06-01 20:42:32 +02:00
1c47b14651
Merge pull request #16663 from owncloud/no-sense-to-check-for-cli
...
Remove check for RAW_POPULATE_POST_DATA for unit tests
2015-06-01 17:35:30 +02:00
73875da4b0
Clean application identifier before processing
2015-06-01 17:03:51 +02:00
418f4e1a90
Bump Dropbox library to newest upstream version
2015-06-01 17:03:46 +02:00
2f8296875f
Merge pull request #16237 from owncloud/file-locking
...
High level file locking
2015-06-01 16:37:38 +02:00
Robin McCorkell
Morris Jobke
Jenkins for ownCloud
Joas Schilling
Thomas Müller
Lukas Reschke
Clark Tomlinson
Bernhard Posselt
Joas Schilling
Vincent Petry
Bjoern Schiessle