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
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
Lukas Reschke
5941e826b8
Merge pull request #16284 from owncloud/shared-storage-view
...
dont go trough the view when renaming/copying on shared storages
2015-05-13 10:37:04 +02:00
Lukas Reschke
e753e8cc37
Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-apps
...
Add info message for upgrade of an 3rdparty app
2015-05-13 08:32:42 +02:00
Jenkins for ownCloud
504586aec6
[tx-robot] updated from transifex
2015-05-13 01:55:14 -04:00
Lukas Reschke
b626de0b9f
Merge pull request #16289 from owncloud/fix-stupid-mistake
...
Add NoAdminRequired annotation
2015-05-12 19:30:59 +02:00
Morris Jobke
dc362823e0
Merge pull request #16269 from owncloud/master-fix-16179
...
Check if cURL supports the desired features
2015-05-12 18:27:57 +02:00
Lukas Reschke
a7a2579c89
Subadmin permissions are also not required
2015-05-12 18:08:10 +02:00
Morris Jobke
cb909cda97
Add info message for upgrade of an 3rdparty app
2015-05-12 18:02:31 +02:00
Lukas Reschke
cdeb2052bb
Add NoAdminRequired annotation
...
Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288
2015-05-12 17:49:34 +02:00
Robin Appelman
3b1dde7005
dont go trough the view when renaming/copying on shared storages
2015-05-12 17:09:37 +02:00
Morris Jobke
d4eff55342
Merge pull request #16283 from owncloud/fix-search-users
...
fix user mgmt search box position, fix #15928
2015-05-12 16:21:31 +02:00
Morris Jobke
895a1a5efa
Merge pull request #16282 from owncloud/fix-multiselect-ellipsize
...
ellipsize first item in multiselect, fix #16174
2015-05-12 16:08:13 +02:00
Jan-Christoph Borchardt
21a1995ad6
Merge pull request #16104 from owncloud/resize-filepicker
...
Resize filepicker on window size change
2015-05-12 15:57:23 +02:00
Morris Jobke
44091a1a12
Merge pull request #16277 from owncloud/fix-15971
...
remove superflous button. fixes #15971
2015-05-12 15:54:49 +02:00
Jan-Christoph Borchardt
76f6f6b6bc
fix user mgmt search box position, fix #15928
2015-05-12 15:48:45 +02:00
Jan-Christoph Borchardt
58bce49037
ellipsize first item in multiselect, fix #16174
2015-05-12 15:39:18 +02:00
Jan-Christoph Borchardt
46e4d8818c
Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view
...
Enable file icons & previews in "Shared ..." categories
2015-05-12 15:17:43 +02:00
Arthur Schiwon
acafc8ca46
remove superflous button. fixes #15971
2015-05-12 14:54:05 +02:00
Robin Appelman
11e1acd8ec
fix webdav quota check for the root of the dav endpoint
2015-05-12 14:02:27 +02:00
Jan-Christoph Borchardt
127b0d9edf
Merge pull request #16271 from owncloud/use-active
...
Use active instead of non existing pressed
2015-05-12 13:16:50 +02:00
Björn Schießle
fbe4b77c49
Merge pull request #16228 from owncloud/enc_fix_restore
...
use hooks to update encryption keys
2015-05-12 13:10:16 +02:00
Lukas Reschke
0a3bf3f963
Use active instead of non existing pressed
...
Fixes https://github.com/owncloud/core/issues/16083
2015-05-12 12:20:28 +02:00
Lukas Reschke
4613456a8a
Check if cURL supports the desired features
...
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.
Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
2015-05-12 12:00:56 +02:00
Vincent Petry
beb6a38d85
Added rmdir to trashbin storage wrapper
...
This makes sure that folders are moved to trash when deleted with
rmdir() instead of unlink().
This happens for example when deleting a folder over WebDAV.
The web UI uses unlink() so it wasn't affected.
2015-05-12 11:09:02 +02:00
Morris Jobke
b11c0c533e
Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded
...
fix check if a file is excluded from encryption
2015-05-12 09:12:38 +02:00
Jenkins for ownCloud
deeeca69fe
[tx-robot] updated from transifex
2015-05-12 01:55:10 -04:00
Vincent Petry
20d2d8d3dd
Merge pull request #15881 from owncloud/share-moveversionsproperly
...
Fix version rename with files and folders
2015-05-11 18:24:34 +02:00
Morris Jobke
afcec88c6f
Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-insert
...
Issue 16206 fix app config parallel insert
2015-05-11 16:05:30 +02:00