Robin Appelman
b70e1ffc6d
dont go trough the view when moving to trash
2015-05-18 17:16:12 +02:00
Joas Schilling
b085f58553
Merge pull request #16405 from owncloud/enc_add_missing_parameter
...
add missing parameter to constructor
2015-05-18 17:12:48 +02:00
Clark Tomlinson
f9b6ee86cd
Merge pull request #16399 from owncloud/enc_rmdir_fix
...
[encryption] only try to delete file keys if it is a valid path
2015-05-18 11:09:36 -04:00
Bjoern Schiessle
1c500487ba
add a unit test to make sure that we don't try to read a file during a write operation
2015-05-18 17:00:54 +02:00
Joas Schilling
8efc8c0a96
Reduce the complexity of the search queries in the backends to a minimum
2015-05-18 16:39:21 +02:00
Thomas Müller
c28cd03770
Merge pull request #16403 from owncloud/fix-command-loading
...
Only load commands of enabled apps
2015-05-18 16:16:04 +02:00
Morris Jobke
a4c9688711
fix theme in IE8 and IE9
2015-05-18 16:04:33 +02:00
Clark Tomlinson
7d2666699b
removing encryption preview check
2015-05-18 09:47:46 -04:00
Clark Tomlinson
d557519746
removing deletion of encryption keys
...
this will be handled in the wrapper now
2015-05-18 09:47:46 -04:00
Joas Schilling
30d165ebf2
Add missing import for the exception
2015-05-18 15:45:47 +02:00
Clark Tomlinson
a0c6c01137
fix references to legacy encryption app name
2015-05-18 09:45:41 -04:00
Joas Schilling
4444db61b7
Add a unit test for the decrypt method
2015-05-18 15:45:11 +02:00
Bjoern Schiessle
7676166254
add l10n to constructor
2015-05-18 15:43:53 +02:00
jknockaert
2834971a77
fix #16356
2015-05-18 15:06:55 +02:00
Björn Schießle
a1e60e7882
Merge pull request #15980 from owncloud/jknockaert-patch-1
...
fix bug #15973
2015-05-18 15:01:16 +02:00
Vincent Petry
86cf8e1f68
Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
...
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Bjoern Schiessle
7d492fefae
also encrypt files in trash bin
2015-05-18 12:51:47 +02:00
Joas Schilling
85f500f070
Merge pull request #16398 from owncloud/fix-php-doc
...
Fix PHPDoc of public interface ILockingProvider
2015-05-18 12:43:07 +02:00
Morris Jobke
ad3a32edf6
Only load commands of enabled apps
2015-05-18 12:33:56 +02:00
Vincent Petry
5899b7b6ea
Fix provisioning API unit tests for login
...
Properly login the user every time to make sure their FS is properly
setup.
2015-05-18 12:28:54 +02:00
Robin Appelman
724f88d9ff
fix tests
2015-05-18 12:11:32 +02:00
Robin Appelman
a5d652a6b8
fix tests
2015-05-18 12:11:31 +02:00
Robin Appelman
415f16eb24
fix tests
2015-05-18 12:11:31 +02:00
Robin Appelman
077d41a9ce
wait with copying the skeleton untill login and setupfs are done
2015-05-18 12:11:31 +02:00
jknockaert
62e6c46216
correct testSeek
2015-05-18 11:55:48 +02:00
Bjoern Schiessle
efa674f10d
only try to delete file keys if it is a valid path
2015-05-18 11:54:51 +02:00
Vincent Petry
7e271012b2
Merge pull request #16243 from owncloud/error_if_download_failed
...
redirect to error page if download failed
2015-05-18 11:42:55 +02:00
Morris Jobke
fc2c9e8f5f
Fix PHPDoc of public interface ILockingProvider
2015-05-18 11:37:16 +02:00
jknockaert
9a71eddaf9
work on tests
...
Tests reorganised and extended
2015-05-18 11:32:29 +02:00
Morris Jobke
7ee3f99a4a
Merge pull request #16364 from owncloud/add-warning-webdav
...
Add notice that WebDAV interface is not intended for browsers
2015-05-18 11:28:47 +02:00
Vincent Petry
d15471abd4
Merge pull request #15738 from rullzer/fix_15611
...
Fix to make sure expiration date is properly set
2015-05-18 11:26:12 +02:00
Morris Jobke
8543b21d18
Merge pull request #15870 from rullzer/fix_15812
...
Reset share dialog values - more
2015-05-18 11:24:42 +02:00
Bjoern Schiessle
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
Roeland Jago Douma
b090a32d23
Reset share dialog values so we start out clean
...
* Unit test
2015-05-18 10:08:09 +02:00
Roeland Jago Douma
efd6fec57d
Fix to make sure expiration date is properly set
...
This did not happen correctly when the password was enforced since a
different code path was taken.
* moved generation of the default date string to separate function
* added unit test
2015-05-18 09:35:47 +02:00
Jenkins for ownCloud
73a3086945
[tx-robot] updated from transifex
2015-05-18 01:54:58 -04:00
Frank Karlitschek
3abc6e6c44
8.1 beta 2
2015-05-17 14:25:56 -04:00
Jenkins for ownCloud
16c320df26
[tx-robot] updated from transifex
2015-05-17 01:55:56 -04:00
Jenkins for ownCloud
744a9f2c78
[tx-robot] updated from transifex
2015-05-16 01:54:47 -04:00
Thomas Müller
257ee205bb
Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips
...
[enc2]fixing recovery tooltip
2015-05-15 22:39:17 +02:00
Victor Dubiniuk
4c9734f630
Test overriding channel
2015-05-15 22:37:14 +03:00
Thomas Müller
2cafbc803a
Merge pull request #16242 from owncloud/use-oc-webroot
...
Use OC.webroot instead of calculating the URL
2015-05-15 18:10:18 +02:00
Vincent Petry
246000f799
Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota
...
Validate the quota value to be a correct value
2015-05-15 18:07:13 +02:00
Lukas Reschke
4c60b13d1e
Merge pull request #16265 from owncloud/update-bundle
...
Update CA bundle
2015-05-15 18:05:42 +02:00
Craig Morrissey
ca341a8d59
add support for limit request parameter to getShareWith
2015-05-15 18:03:18 +02:00
Thomas Müller
8e61ad0872
Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection
...
throw exception when LDAP Connection was lost
2015-05-15 17:32:07 +02:00
Thomas Müller
18661ceb63
do not execute integration tests when executing autotest.sh
2015-05-15 16:38:21 +02:00
Thomas Müller
c3e066c5eb
Merge pull request #16367 from owncloud/fix-facade-autotest
...
Fix facade autotest
2015-05-15 15:40:34 +02:00
Joas Schilling
0991c0cc02
Merge pull request #16292 from owncloud/webdav-storage-fireprehooks
...
Fire prehooks when uploading directly to storage
2015-05-15 15:08:27 +02:00
Joas Schilling
03e26a0fbe
Merge pull request #16337 from owncloud/versions-expireforowner
...
Use owner when expiring versions, not the logged in user
2015-05-15 15:02:26 +02:00