Commit Graph

1675 Commits

Author SHA1 Message Date
Jesús Macias e4a2da6c3d Merge branch 'issue_20427' of github.com:owncloud/core into issue_20427 2015-11-24 08:16:49 +01:00
Jesús Macias 5580b562a3 Fix code from PR comments 2015-11-24 08:16:14 +01:00
Jenkins for ownCloud cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Morris Jobke 4608e7134c webdav docker tests - wait at least 5 seconds after the full startup 2015-11-23 14:49:01 +01:00
Robin Appelman 74dfc604d1 language fixes 2015-11-23 13:08:53 +01:00
Robin Appelman ff72eac927 truncate long values on default 2015-11-23 12:29:20 +01:00
Robin Appelman 0795f7d71b hide passwords and secrets on default 2015-11-23 12:24:24 +01:00
Robin Appelman 909b31ea58 use common --output option 2015-11-23 11:36:20 +01:00
Robin Appelman f5cdd27b22 Add files_external:list command to list configured external storages 2015-11-23 11:31:40 +01:00
Thomas Müller 79bbda994b Merge pull request #16902 from owncloud/jsocclient
Web UI uses Webdav instead of ajax/* calls
2015-11-23 09:38:01 +01:00
Jenkins for ownCloud 56e05a90af [tx-robot] updated from transifex 2015-11-23 01:54:53 -05:00
Robin McCorkell 08839ce77d Defer initialisation of data until after complete construction 2015-11-22 17:25:32 +00:00
Vincent Petry ec3166742b Properly join path sections
This prevents double slashes that can mess up path comparisons in some
cases.
2015-11-22 16:05:51 +01:00
Jenkins for ownCloud 2321cc4854 [tx-robot] updated from transifex 2015-11-22 01:54:53 -05:00
Robin McCorkell ee7128b435 Clear highlight on RSA public key generation 2015-11-21 22:54:21 +00:00
Robin McCorkell c5966ed21b Only set value if it exists in the StorageConfig 2015-11-21 22:54:21 +00:00
Robin McCorkell be8afc2c12 Reset mountpoint input field when creating new mount 2015-11-21 22:54:21 +00:00
Robin McCorkell 6a2e7632d1 Fix JS unit tests 2015-11-21 22:54:21 +00:00
Robin McCorkell 8f4b780a90 Fix external storage priority logic 2015-11-21 22:54:21 +00:00
Robin McCorkell 2efffb810d Load applicable users/groups correctly 2015-11-21 22:54:21 +00:00
Robin McCorkell 28876bf463 Display applicable global storages in personal mount list 2015-11-21 22:54:21 +00:00
Robin McCorkell a1704c8623 Render external storages list in JS 2015-11-21 22:54:21 +00:00
Jenkins for ownCloud eb42340fa3 [tx-robot] updated from transifex 2015-11-21 01:54:59 -05:00
Vincent Petry 5b9a693fbc Added some unit tests for the status manager 2015-11-20 16:00:16 +01:00
Robin Appelman 90ff4641e7 dont die if the external storage backend doesn't exist 2015-11-20 15:23:09 +01:00
Thomas Müller 308aaf89cd Merge pull request #14077 from owncloud/autotest-external-swift
[files_external] swift tests
2015-11-20 13:57:54 +01:00
Jesús Macias 31cfd43e8a Adding logic to show custom icon for current backends, waiting for icon files 2015-11-20 08:42:31 +01:00
Jenkins for ownCloud 764504de19 [tx-robot] updated from transifex 2015-11-20 01:55:32 -05:00
Jesús Macias ae061bcbed Fix code from PR comments 2015-11-18 18:34:26 +01:00
Jesús Macias fab13b7ca5 Add method to show custom icon and icon-error for each storage backend 2015-11-18 12:12:32 +01:00
Robin Appelman d49fc9a5fc fix ip detection for swift-ceph 2015-11-16 21:52:31 +01:00
Robin Appelman 67710e62fa Fix parsing of sftp hosts when using ipv6 2015-11-16 14:56:03 +01:00
Jesús Macias a413f8eccc Add icon management capabilities (error icon) 2015-11-13 12:57:33 +01:00
Jesús Macias 394d3eb0cd First working approach to show mount status 2015-11-12 13:40:28 +01:00
Jenkins for ownCloud 5dd59b4bd2 [tx-robot] updated from transifex 2015-11-11 01:55:47 -05:00
Jenkins for ownCloud f09db6451e [tx-robot] updated from transifex 2015-11-10 01:55:11 -05:00
Thomas Müller 77335ca403 Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval
Force approval in GDrive oauth to get refresh_token
2015-11-09 11:11:13 +01:00
Jenkins for ownCloud 113f9f80f3 [tx-robot] updated from transifex 2015-11-09 01:55:05 -05:00
Jenkins for ownCloud f8637b6082 [tx-robot] updated from transifex 2015-11-08 01:55:13 -05:00
Jenkins for ownCloud 49122e66dd [tx-robot] updated from transifex 2015-11-07 01:55:11 -05:00
Vincent Petry 26b01c7fff Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.

In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
2015-11-06 13:56:37 +01:00
Vincent Petry 51d7527595 Properly throw exception in OC_Mount_Config::getBackendStatus 2015-11-06 12:29:24 +01:00
Jenkins for ownCloud f2b19333b9 [tx-robot] updated from transifex 2015-11-06 01:55:09 -05:00
Thomas Müller 8bffc84766 Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting
[files_external] fix empty user mounts setting
2015-11-05 11:36:36 +01:00
Jenkins for ownCloud 2f4fa5b49c [tx-robot] updated from transifex 2015-11-05 01:55:14 -05:00
Morris Jobke 2a35ecb9ba [files_external] fix empty user mounts setting
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
2015-11-04 15:47:03 +01:00
Jenkins for ownCloud 7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05:00
Jan-Christoph Borchardt fa5a15be2b fix external storage wording detail, ref #19858 2015-11-03 08:56:15 +01:00
Jenkins for ownCloud 82f3590fd0 [tx-robot] updated from transifex 2015-11-03 01:58:43 -05:00
Jenkins for ownCloud 2afc14e195 [tx-robot] updated from transifex 2015-11-02 01:55:05 -05:00
Jenkins for ownCloud 2374a0df5d [tx-robot] updated from transifex 2015-11-01 01:54:58 -04:00
Jenkins for ownCloud d7ed353814 [tx-robot] updated from transifex 2015-10-31 01:55:07 -04:00
Morris Jobke a91572b7f3 Use proper statement to retrieve the IP of an docker instance 2015-10-30 09:28:33 +01:00
Jenkins for ownCloud 91b2cdc62b [tx-robot] updated from transifex 2015-10-30 01:55:52 -04:00
Thomas Müller 7d96f82659 Merge pull request #19000 from UoM-ResPlat-DevOps/swift-squelch-expected-404-errors
Don't log expected Swift 404 responses in files_external
2015-10-29 11:26:24 +01:00
Thomas Müller 911613f711 Merge pull request #19100 from owncloud/ext-tooltip-unavailable
Display external storage status as tooltip
2015-10-29 11:25:52 +01:00
Thomas Müller 5bf476efd0 Merge pull request #20079 from owncloud/filelist-invalidpath
Fix file list reload callback result
2015-10-29 09:21:30 +01:00
Jenkins for ownCloud 527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Thomas Müller 92e63a802c Merge pull request #19758 from owncloud/ext-fallback-getmimetype
Fallback to default mimetype detection mechanism
2015-10-28 14:50:19 +01:00
Jenkins for ownCloud d74811fcc8 [tx-robot] updated from transifex 2015-10-28 01:55:29 -04:00
Vincent Petry f24386c491 Fix file list reload callback result
All reloadCallback must return either true for success or false in case
of failure / non-existing folder.

Some file lists only have a root folder (favorite, shares), so restrict
the path to that to avoid having a wrong path in the breadcrumbs.
2015-10-27 11:51:54 +01:00
Jenkins for ownCloud 0875a4a18f [tx-robot] updated from transifex 2015-10-27 01:55:44 -04:00
Lukas Reschke 8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Thomas Müller 1f32a3e485 Merge pull request #20030 from owncloud/autoload-files-external-optimize
Use optimized autoloader for files_external
2015-10-26 08:42:28 +01:00
Jenkins for ownCloud e6d64783a0 [tx-robot] updated from transifex 2015-10-26 01:55:04 -04:00
Lukas Reschke b678eadc43 Use optimized autoloader for files_external 2015-10-25 23:34:30 +01:00
Jenkins for ownCloud eb10e3abc2 [tx-robot] updated from transifex 2015-10-25 01:55:04 -04:00
Jenkins for ownCloud ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Robin McCorkell 9a4d37f626 Display storage status as tooltip 2015-10-23 15:25:07 +02:00
Robin McCorkell 4ac33ab26b Remove status indicator on modification 2015-10-23 15:25:07 +02:00
Jenkins for ownCloud a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Jenkins for ownCloud c50bbb8cde [tx-robot] updated from transifex 2015-10-22 01:55:47 -04:00
Jenkins for ownCloud 74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Thomas Müller 122f8d831b Merge pull request #19863 from owncloud/external-storage-wording
fix wording on external storage checkbox, ref #19858
2015-10-20 15:21:26 +02:00
Thomas Müller 257ccfa698 Merge pull request #19877 from owncloud/dropbox-fixmetadatacachepaths
Fix Dropbox metadata cache with trimmed paths
2015-10-20 15:17:28 +02:00
Robin McCorkell c98b303a5e Skip Swift stat test 2015-10-20 14:45:16 +02:00
Robin McCorkell ad028c555d Don't attempt to run tests unless start file is successful 2015-10-20 14:45:16 +02:00
Robin McCorkell 8467dbfa91 Detect Docker initialization properly
Use netcat to check when the port opens, rather than an arbitrary
timeout. Hard limit of 60 seconds in case something breaks
2015-10-20 14:45:16 +02:00
Robin McCorkell 70f4e9413f Make Swift test robust if container didn't exist 2015-10-20 14:45:16 +02:00
Robin McCorkell 0de9819da3 Replace Swift Docker test with Ceph image 2015-10-20 14:45:16 +02:00
Morris Jobke 2577a624c0 [files_external] swift tests 2015-10-20 14:45:16 +02:00
Thomas Müller 50cb8106dc Merge pull request #19859 from owncloud/fix-long-groupnames
ellipsize long group names in select2 dropdown, fix #16977
2015-10-20 11:06:18 +02:00
Jenkins for ownCloud dfd44942c6 [tx-robot] updated from transifex 2015-10-20 01:55:03 -04:00
Vincent Petry d795643ef9 Fix Dropbox metadata cache with trimmed paths
Makes sure that the paths are trimmed to avoid duplicate entries like
"/test" and "test". This should make this storage slightly faster by
reducing the cache misses.
2015-10-19 20:52:15 +02:00
Jan-Christoph Borchardt acc906c4d8 fix wording on external storage checkbox, ref #19858 2015-10-19 21:26:47 +13:00
Jenkins for ownCloud 008082ebad [tx-robot] updated from transifex 2015-10-19 01:55:02 -04:00
Jan-Christoph Borchardt 3875ca2d19 ellipsize long group names in select2 dropdown, fix #16977 2015-10-19 16:11:53 +13:00
Jenkins for ownCloud 8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Joas Schilling 0d3d75b3b3 Increase the 2nd digit of shipped apps 2015-10-17 08:47:11 +02:00
Vincent Petry 796179af00 Remove Dropbox metadata from cache after upload
This will make sure that the next calls that read the mtime will get the
correct value.
2015-10-16 13:47:00 +02:00
Jenkins for ownCloud 7224e99ccd [tx-robot] updated from transifex 2015-10-16 01:55:03 -04:00
Hendrik Leppelsack bf722d93df apply new checkbox style to admin settings 2015-10-14 12:14:49 +02:00
Jenkins for ownCloud f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04:00
Vincent Petry 915d37f226 Fallback to default mimetype detection mechanism 2015-10-13 16:44:01 +02:00
Vincent Petry f89e7769dc Fix testDeleteStorage signature to match the one from the base class
Prevents Strict warning when running autotest-external.sh
2015-10-13 11:56:11 +02:00
Jenkins for ownCloud 1f146d678c [tx-robot] updated from transifex 2015-10-13 01:55:06 -04:00
Jenkins for ownCloud e16ac12f5a [tx-robot] updated from transifex 2015-10-12 01:54:59 -04:00
Jenkins for ownCloud 188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00
Jenkins for ownCloud 5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Jenkins for ownCloud c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Jenkins for ownCloud cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Vincent Petry bbebffb60c Remove oc_storages entries after removing ext storages
When removing external storages, either system-wide or user-wide,
automatically remove the matching oc_storages and oc_filecache entries.

This can only work if the backend configuration doesn't contain any
substitution variable $user in which case the storage id cannot be
computed, so this case is ignored for now.
2015-10-06 17:33:16 +02:00
Thomas Müller 0385a62363 Merge pull request #19597 from owncloud/update-license-headers
update licence headers via script
2015-10-06 11:18:35 +02:00
Morris Jobke 8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Jenkins for ownCloud 3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Morris Jobke b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Jenkins for ownCloud 2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Jenkins for ownCloud e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Bjoern Schiessle 0ce28a574a if mountpoint is applicable to all users the old API expects a array with 'all' 2015-10-02 16:17:28 +02:00
Jenkins for ownCloud 3b4592718a [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
Jenkins for ownCloud 50874de1ca [tx-robot] updated from transifex 2015-10-01 01:54:55 -04:00
Jenkins for ownCloud aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04:00
Jenkins for ownCloud 60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04:00
Olivier Paroz ff4227bbfc Use a universal shebang
Fixes #15037
2015-09-27 13:03:31 +02:00
Robin McCorkell 97c4691c05 Unit tests for storage validation in service 2015-09-23 16:00:21 +01:00
Robin McCorkell 2404333300 Perform visibility checks on storages
StoragesService::getStorages() will check the visibility of the backend
and auth mechanism for the storage, and if either are not visible to the
user (aka disabled by admin) then the storage will be filtered out. The
original method StoragesService::getAllStorages() still exists in case
such storages need to be detected, but its use is discouraged.
2015-09-23 16:00:11 +01:00
Robin McCorkell 634c1c497c Mark SMB_OC and SFTP_Key as deprecated backends 2015-09-23 12:10:02 +02:00
Robin McCorkell 2bef3ef34b Hide deprecated backends in external storage GUI
Selecting/deselecting the deprecate-to backends in the user mountable
storages selection will also change the corresponding deprecated
backend.
2015-09-23 12:10:02 +02:00
Robin McCorkell 060d169615 Add deprecation mechanic to IdentifierTrait
Deprecation allows a backend/auth mechanism to designate an object that
it deprecates to, allowing clean transitions to updated codebases.
2015-09-23 12:10:02 +02:00
Robin McCorkell 38a260e963 Revert "Implement more fine-grained external storage permissions model"
This reverts commit 0b97a05e7b.
This reverts commit d2e3c17c00.
This reverts commit cc88c5f4b8.
2015-09-23 12:10:02 +02:00
Martin 491250320a Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. 2015-09-22 17:53:15 +02:00
Thomas Müller d7d3e8d802 Merge pull request #19176 from owncloud/fix-19118
Fix checkboxes in files_external
2015-09-21 11:22:22 +02:00
Jenkins for ownCloud bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Hendrik Leppelsack 624f5de67a fix checkboxes in files_external 2015-09-19 10:36:38 +02:00
Jenkins for ownCloud c433d48d8e [tx-robot] updated from transifex 2015-09-19 01:55:22 -04:00
Thomas Müller e37ee9a814 Merge pull request #19069 from owncloud/ext-s3-ceph
AmazonS3 automatic tests
2015-09-18 11:11:05 +02:00
Jenkins for ownCloud 2b21c80335 [tx-robot] updated from transifex 2015-09-18 01:54:55 -04:00
Thomas Müller 9803d68e55 Merge pull request #19090 from owncloud/ext-priority-logic
Properly implement external mount priorities
2015-09-17 18:11:53 +02:00
Thomas Müller a377b332aa Merge pull request #19108 from owncloud/ext-smb-storageconfig
Correct manipulateStorageConfig parameter
2015-09-17 08:57:23 +02:00
Jenkins for ownCloud 91365a8969 [tx-robot] updated from transifex 2015-09-17 01:57:20 -04:00
Jenkins for ownCloud 0155bcf278 [tx-robot] updated from transifex 2015-09-17 01:55:25 -04:00
Robin McCorkell b8cded6755 Correct manipulateStorageConfig parameter 2015-09-17 00:24:01 +01:00
Robin McCorkell 373e2f890f Unit tests for UserGlobalStoragesService::getUniqueStorages() 2015-09-16 13:13:01 +01:00
Robin McCorkell ca7b4a42f9 Fix external storage priority logic 2015-09-16 13:12:47 +01:00
Robin McCorkell 7fc545470c Make AmazonS3 path style actually work 2015-09-16 02:02:59 +01:00
Robin McCorkell 17d1358aee AmazonS3 Ceph tests 2015-09-16 01:56:49 +01:00
Robin McCorkell 0667c4363d Merge branch 'master' into smb-workgroup 2015-09-15 19:36:43 +01:00
Jenkins for ownCloud 24d2cbf3de [tx-robot] updated from transifex 2015-09-15 01:54:50 -04:00
Lukas Reschke 4a777d686b Merge pull request #18966 from owncloud/ext-remove-numeric-id
Remove storing storage_id in mount.json
2015-09-14 15:04:23 +02:00
Jenkins for ownCloud 211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Tim Dettrick 1b582ba66b Don't log expected Swift 404 responses
File existence checks are expected in some cases to be false, so passing
404 Not Found errors through to the logs just causes noise.
2015-09-14 11:12:52 +10:00
Robin McCorkell 522619f90e Fix dependency check for Swift and SMB_OC
Mistake caused during merging, where the API had changed
2015-09-13 21:41:02 +01:00
Robin McCorkell 0dc7181335 Merge pull request #18441 from owncloud/ext-backends.advanced
Migrate advanced external storage backends to new registration API [part 3]
2015-09-13 19:38:22 +01:00
Jenkins for ownCloud 9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Robin McCorkell 57e49d2005 Merge pull request #18733 from owncloud/ext-dependencycheck
Make checkDependencies a real method
2015-09-11 09:46:40 +01:00
Robin McCorkell e99988b9c7 Merge pull request #18676 from owncloud/ext-eventdispatcher
files_external event dispatcher
2015-09-11 09:34:05 +01:00
Robin McCorkell d67251fe4c Remove storing storage_id in mount.json
One mount configuration does not necessarily map to a single storage,
due to `$user` substitution or special auth mechanisms.
2015-09-10 22:09:42 +01:00
Jenkins for ownCloud 0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Jenkins for ownCloud d044884cfa [tx-robot] updated from transifex 2015-09-08 01:55:56 -04:00
Jenkins for ownCloud 4100b151cc [tx-robot] updated from transifex 2015-09-04 01:55:31 -04:00