7f7d674c2a
Merge pull request #7335 from owncloud/fix-7333
...
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
539ea0882b
Fixed mount config path
2014-02-24 10:35:24 +01:00
f1475671ab
Merge branch 'master' into extstorage-configclass
2014-02-21 15:51:41 +01:00
6cb64a4fce
Fix code to search for mount.json in custom data folders
2014-02-20 18:34:27 +01:00
c869e0116b
Merge pull request #6999 from kofemann/mount-config
...
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
b060a17b59
Added extra checks for ext storage class
2014-02-20 10:40:10 +01:00
49f2014e0c
Revert "Added extra checks for ext storage class"
...
This reverts commit 9e9a5b9ea1
2014-02-20 10:01:49 +01:00
9e9a5b9ea1
Added extra checks for ext storage class
2014-02-19 19:08:28 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
658af627ce
External FTP Storage should request hostname instead of URL
...
Fix issue #6277
2014-02-12 18:20:10 +01:00
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
828985dc60
Make google drive client secret and dropbox api secret a password field
...
Fix issue #5794
2014-02-07 18:12:01 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
8cc9727520
mount: make location of mount.json configurable
...
do not share users data with config files
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
5e04b7f284
Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
...
Fixing Issue #6301 on master branch
2014-01-13 07:09:01 -08:00
a8d20e0919
Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
...
Added ownCloud backend for external storage
2014-01-08 01:49:15 -08:00
f52a9e5e42
Silence output of 'which' command used in smbclient detection
2013-12-27 18:10:47 +01:00
c06844c374
Fix ```createCertificateBundle``` and ```getCertificates``` methods
...
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
2013-12-17 10:13:14 +01:00
76b1fcbf27
Fixed Amazon S3 ext storage config UI
...
Optional parameters are now really optional
Fixes #5861
2013-12-03 12:26:08 +01:00
2d947835b9
Now also preventing the user of "Shared" as mountpoint
2013-11-22 18:36:27 +01:00
0b2c9b823c
Prevent using root as mount point for external storage
...
Fixes #5981
2013-11-21 17:22:12 +01:00
70276ca520
settings tags for optional parameters
2013-10-29 10:21:50 +01:00
235bf5269d
extended parameter descriptions for Swift
2013-10-29 09:19:43 +01:00
dd82481f59
add configuration parameter to manually set the timeout of HTTP requests
2013-10-24 16:19:17 +02:00
f0d04f3ac6
adjustment of the configuration parameters
2013-10-22 13:34:24 +02:00
b1f1357957
Added ownCloud backend for external storage
...
To make it possible to use the short ownCloud URL (without specifying
webdav.php or remote.php), a new backend is available for ownCloud.
The user must specify the host + context path in the "Url" field (which
is mapped to the "host" parameter) and the subdir to mount in the "Root"
field.
This is to prevent confusion because some users forget to append
webdav.php or remote.php to the WebDAV URL.
Fixes #4923
2013-10-09 17:30:22 +02:00
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
05549884c6
no files external for SMB on windows
2013-08-15 12:00:02 +02:00
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
...
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
7b28f5a82c
Merge branch 'master' into ext-fs-irods-master
2013-07-22 11:40:28 +02:00
32597c380a
adding several new parameters
2013-07-03 17:58:44 +02:00
d8c660c6d5
Switch to using Google Drive SDK, closes #2047
2013-05-16 20:09:32 -04:00
331ad15d9b
adding auth mode to ui and the url
2013-04-26 17:37:41 +02:00
17ff5d486e
Merge branch 'master' into ext-fs-irods-master
2013-04-26 13:29:48 +02:00
6141b24d96
External Storage: Check for curl in PHP
...
If no curl is found, disable the storage that needs it.
2013-04-23 12:36:30 +02:00
cfbf81f978
checkbox in settings ui
2013-04-18 22:20:52 +02:00
7dd3391117
initial integration with iRODS www.irods.org
...
The used PHP API is hosted at https://code.renci.org/gf/project/irodsphp/
2013-04-12 15:51:58 +02:00
6552996734
Set file perms to 0640 of mount.json - fixes #2718
2013-04-06 13:21:21 +03:00
be4806d031
Store the global mount configuration file in the datadir
2013-03-10 02:25:03 +01:00
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
702c27b0e6
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
2013-02-19 19:12:14 -05:00
0e9b9f4f5f
no pretty print
2013-02-19 00:48:38 +01:00
3bf9aa408e
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
2013-02-18 15:13:25 +01:00
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
cad65915a7
look where you are typing ...
2013-02-16 12:55:36 +01:00
e1700c28fa
pretty print json
2013-02-16 12:10:54 +01:00
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
Vincent Petry
Robin Appelman
Lukas Reschke
Thomas Müller
Joas Schilling
Jörn Friedrich Dreyer
Tigran Mkrtchyan
Michael Monreal
Carlos Cerrillo
Christian Berendt
Arthur Schiwon
Bart Visscher
Michael Gapczynski
Markus Goetz