Commit Graph

1729 Commits

Author SHA1 Message Date
Thomas Müller 4d86466aec Use default timeout on connection test 2015-12-09 12:18:51 +01:00
Thomas Müller 51b5498be8 Merge pull request #21003 from owncloud/personal-mount-mountid
Dont set the string storage id to the numeric storage id for personal mounts
2015-12-09 10:05:36 +01:00
Lukas Reschke 025f021fd4 Remove dead code
Silences two other security warnings, also I cleaned up the PHPDoc a little bit.
2015-12-09 08:18:47 +01:00
Jenkins for ownCloud dda9525c4b [tx-robot] updated from transifex 2015-12-09 01:55:14 -05:00
Robin Appelman 8c1afb8fb9 Add tests 2015-12-08 18:01:44 +01:00
Lukas Reschke f55a56ff6c Use proper PHPDoc reference 2015-12-08 09:45:20 +01:00
Jenkins for ownCloud 736e133c04 [tx-robot] updated from transifex 2015-12-08 01:56:19 -05:00
Thomas Müller bec34f1275 Merge pull request #21006 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-12-07 17:49:43 +01:00
Thomas Müller 7dd1874188 Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen
Improving fopen behaviour for Swift backend
2015-12-07 16:50:07 +01:00
Scrutinizer Auto-Fixer 453e1bf66e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 15:43:36 +00:00
Robin Appelman eec4f82cf0 Dont set the string storage id to the numeric storage id for personal mounts 2015-12-07 16:15:37 +01:00
Scrutinizer Auto-Fixer 97f9213da9 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 12:05:27 +00:00
Thomas Müller e44b164f40 Merge pull request #20569 from owncloud/issue_20427
Show external storage status in file list + prompt credentials if different
2015-12-07 10:27:35 +01:00
Tim Dettrick 35ab7f0e64 Improving fopen behaviour for Swift backend 2015-12-07 10:20:09 +01:00
Jenkins for ownCloud d14f128329 [tx-robot] updated from transifex 2015-12-06 01:54:33 -05:00
Jenkins for ownCloud f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 -05:00
Robin Appelman a1898dc2bf db config backend for files_external 2015-12-04 13:48:21 +01:00
Jenkins for ownCloud a2848af625 [tx-robot] updated from transifex 2015-12-04 01:56:31 -05:00
Jesus Macias Portela dcfbbe4737 Merge branch 'master' into issue_20427 2015-12-03 12:35:49 +01:00
Jesús Macias f4f53e328d Fix duplicate use in storage controller 2015-12-03 10:00:01 +01:00
Jesús Macias 98f5c50aa4 Migrate storate status code to storagenotavailablexception 2015-12-03 09:59:45 +01:00
Jesús Macias 4ead2bc861 Fix code from PR comments 2015-12-03 09:58:55 +01:00
Jesús Macias 9d1ec02c5a Change exception catch order 2015-12-03 09:58:30 +01:00
Jesús Macias 332c6748f9 Delete unnecessary storage status constans 2015-12-03 09:58:10 +01:00
Jesús Macias 7cd13f462a Add new external storage exceptions for different errors 2015-12-03 09:57:59 +01:00
Jesús Macias b17f26834d Add different storage status codes managed by StoragedNotAvailableException 2015-12-03 09:57:54 +01:00
Thomas Müller 8d218bf3ef Merge pull request #20875 from owncloud/remove-changepropagator
remove old propagation logic
2015-12-02 13:03:31 +01:00
Jenkins for ownCloud 4f4b91a9ec [tx-robot] updated from transifex 2015-12-02 02:00:28 -05:00
Robin Appelman 62cc316c6a remove old propagation logic 2015-12-01 16:50:20 +01:00
Robin Appelman 1347e3332b return non 0 status code in case of missing mount 2015-12-01 13:47:56 +01:00
Robin Appelman 2dd0066b0e Add command to set mount options for external storages 2015-12-01 13:47:32 +01:00
Robin Appelman d5ffbc9401 Add command to get and set config for external mounts 2015-12-01 13:47:32 +01:00
Jesús Macias a79ae4ae08 Delete js unit test. Another issue has been created to create js test 2015-12-01 12:58:01 +01:00
Thomas Müller d6da0396d0 Adjust patches 2015-11-30 23:00:51 +01:00
Scrutinizer Auto-Fixer dcbd603514 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-30 22:50:09 +01:00
Thomas Müller b9faba8857 Merge pull request #20837 from owncloud/fix-mountoptions-dropdown
Fix ext storage mount options dropdown
2015-11-30 16:53:26 +01:00
Vincent Petry dc962a1203 Fix ext storage mount options dropdown 2015-11-30 14:59:06 +01:00
Thomas Müller f9fc254672 Add DB group to some files_external tests
Adding group Db to federation tests and ldap tests

Add group DB to Test_UrlGenerator

Adding group DB to trashbin and versions tests

Adding group DB to Test_Util_CheckServer for pg
2015-11-30 10:55:10 +01:00
Thomas Müller e265e982bf External storage tests require DB as well 2015-11-30 10:55:05 +01:00
Jenkins for ownCloud 5a9b892b2e [tx-robot] updated from transifex 2015-11-30 01:55:24 -05:00
Jenkins for ownCloud 188b72a9f3 [tx-robot] updated from transifex 2015-11-29 01:55:05 -05:00
Lukas Reschke 6614ea91c3 Fix some PHPDocs
Some classes included via `use` did not even exist anymore.
2015-11-28 13:17:34 +01:00
Jenkins for ownCloud d305412a35 [tx-robot] updated from transifex 2015-11-28 01:55:16 -05:00
Jenkins for ownCloud 39fb320bae [tx-robot] updated from transifex 2015-11-27 01:55:14 -05:00
Thomas Müller ff7d1eb931 Merge pull request #20707 from owncloud/files_external_table_status
Fix status icon styling for external storages
2015-11-26 12:01:53 +01:00
Jenkins for ownCloud dd18ea611b [tx-robot] updated from transifex 2015-11-26 01:55:22 -05:00
Thomas Müller 7c68be6494 Merge pull request #20712 from owncloud/replace-netcat-php
Replace shitty netcat use with dedicated PHP script
2015-11-25 15:29:09 +01:00
Jenkins for ownCloud 6e60c0f0c4 [tx-robot] updated from transifex 2015-11-25 01:55:37 -05:00
Robin McCorkell 125b090627 Replace shitty netcat use with dedicated PHP script 2015-11-24 16:05:08 +00:00
Thomas Müller 9385eef31a Merge pull request #18999 from owncloud/ext-config-listadmin
Improvements to external storages list rendering
2015-11-24 16:03:35 +01:00
Robin Appelman d316802fcf Fix status icon styling for external storages 2015-11-24 13:57:12 +01:00
Robin Appelman 95f2e15f83 Merge pull request #20574 from owncloud/files_external_list_command
Add files_external:list command to list configured external storages
2015-11-24 13:34:59 +01:00
Jesús Macias 70071c8865 Fix css selector and bug checking personal mounts status 2015-11-24 11:55:33 +01:00
Jesús Macias 674bc8e9cb Add css to manage row status color 2015-11-24 08:52:02 +01:00
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