Commit graph

24921 commits

Author SHA1 Message Date
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
Clark Tomlinson
a0c6c01137 fix references to legacy encryption app name 2015-05-18 09:45:41 -04: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
jknockaert
62e6c46216 correct testSeek 2015-05-18 11:55:48 +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
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
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
Joas Schilling
02912aef58 Merge pull request #16273 from owncloud/trash-fixrestoreuniquename
Fix restoring files from trash with unique name
2015-05-15 14:48:00 +02:00
Lukas Reschke
89b0bc1915 Store in array to allow paths with whitespace 2015-05-15 13:16:16 +02:00
Vincent Petry
f86699cd48 Fix restoring files from trash with unique name
When restoring a file, a unique name needs to be generated if a file
with the same name already exists.

Also fixed the restore() method to return false if the file to restore
does not exist.

Added unit tests to cover restore cases.
2015-05-15 12:42:27 +02:00
Vincent Petry
eab55aa959 Properly log out test users in unit tests 2015-05-15 12:33:17 +02:00
Vincent Petry
f8a4cc0284 Added unit tests for versions storing 2015-05-15 12:24:34 +02:00
Lukas Reschke
8b0c223d6e Add support for facade binary scripts
Fixes https://github.com/owncloud/core/issues/16296
2015-05-15 11:57:40 +02:00
Lukas Reschke
e3ac4d7b37 Lint bash script using ShellCheck
Ref http://www.shellcheck.net/about.html
2015-05-15 11:56:34 +02:00
Joas Schilling
e1923bac07 Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash
Added rmdir to trashbin storage wrapper
2015-05-15 11:16:13 +02:00
Thomas Müller
937306b416 Merge pull request #16323 from owncloud/enc_webdav_fixes
some encryption fixes
2015-05-15 10:38:22 +02:00
Lukas Reschke
54ef098867 Add unit tests for \OC\Connector\Sabre\DummyGetResponsePlugin 2015-05-15 09:08:10 +02:00
Lukas Reschke
13778893d9 Add notice that WebDAV interface is not intended for browsers
Fixes https://github.com/owncloud/core/issues/16359
2015-05-15 09:07:39 +02:00
Lukas Reschke
8ae8600b1f Merge pull request #16342 from owncloud/fix_16338
fix preview hooks, enable_previews default is true
2015-05-15 08:48:12 +02:00
Jenkins for ownCloud
49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Jenkins for ownCloud
1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Georg Ehrke
745c3c64fa fix preview hooks, enable_previews default is true 2015-05-13 19:59:41 +02:00
Bjoern Schiessle
ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Vincent Petry
033b3dac92 Use owner when expiring versions, not the logged in user 2015-05-13 18:40:35 +02:00
Vincent Petry
3cae0135ad Fire prehooks when uploading directly to storage 2015-05-13 17:47:04 +02:00
Robin Appelman
4789e87a53 Merge pull request #16276 from owncloud/dav-quota-root
fix webdav quota check for the root of the dav endpoint
2015-05-13 14:43:02 +02:00
Vincent Petry
1f7df3eba8 Added unit test to quota plugin for free_space argument 2015-05-13 13:58:01 +02:00