 Bart Visscher
|
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
|
11 jaren geleden |
 Thomas Müller
|
7b28f5a82c
Merge branch 'master' into ext-fs-irods-master
|
11 jaren geleden |
 Christian Berendt
|
32597c380a
adding several new parameters
|
11 jaren geleden |
 Michael Gapczynski
|
d8c660c6d5
Switch to using Google Drive SDK, closes #2047
|
11 jaren geleden |
|
Thomas Mueller
|
331ad15d9b
adding auth mode to ui and the url
|
11 jaren geleden |
|
Thomas Mueller
|
17ff5d486e
Merge branch 'master' into ext-fs-irods-master
|
11 jaren geleden |
 Markus Goetz
|
6141b24d96
External Storage: Check for curl in PHP
|
11 jaren geleden |
|
Thomas Mueller
|
cfbf81f978
checkbox in settings ui
|
11 jaren geleden |
|
Thomas Mueller
|
7dd3391117
initial integration with iRODS www.irods.org
|
11 jaren geleden |
 Lukas Reschke
|
6552996734
Set file perms to 0640 of mount.json - fixes #2718
|
11 jaren geleden |
 Robin Appelman
|
be4806d031
Store the global mount configuration file in the datadir
|
11 jaren geleden |
|
Michael Gapczynski
|
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
|
11 jaren geleden |
|
Bart Visscher
|
bb75dfc021
Whitespace fixes
|
11 jaren geleden |
|
Michael Gapczynski
|
702c27b0e6
Merge branch 'master' into external_storage_ui_feedback
|
11 jaren geleden |
|
Thomas Mueller
|
0e9b9f4f5f
no pretty print
|
11 jaren geleden |
|
Robin Appelman
|
3bf9aa408e
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
|
11 jaren geleden |
|
Robin Appelman
|
2bbb57e429
merge master into mountconfig
|
11 jaren geleden |
 Jörn Friedrich Dreyer
|
cad65915a7
look where you are typing ...
|
11 jaren geleden |
|
Jörn Friedrich Dreyer
|
e1700c28fa
pretty print json
|
11 jaren geleden |
|
Robin Appelman
|
6da2c6c83e
Create new mountconfig files in json
|
11 jaren geleden |
|
Robin Appelman
|
46626915ef
Use a parser to read custom mount configuration instead of including the php files
|
11 jaren geleden |
|
Bart Visscher
|
6c197227d0
Join split translated strings
|
11 jaren geleden |
|
Bart Visscher
|
5616690506
Style cleanup files_external
|
11 jaren geleden |
|
Bart Visscher
|
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
|
11 jaren geleden |
|
Michael Gapczynski
|
6eba790a75
Merge branch 'master' into external_storage_ui_feedback
|
11 jaren geleden |
 hkjolhede
|
513bf0b999
Update apps/files_external/lib/config.php
|
11 jaren geleden |
|
Henrik Kjölhede
|
41fa65e7be
Merge branch 'master' of https://github.com/owncloud/core
|
11 jaren geleden |
|
Henrik Kjölhede
|
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
|
12 jaren geleden |
|
Robin Appelman
|
5445b94416
merge master into filesystem
|
12 jaren geleden |
|
Bart Visscher
|
5bfe4adbaa
Whitespace cleanup
|
12 jaren geleden |
