mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,714 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

63 Commits

Author SHA1 Message Date
Lukas Reschke 6552996734 Set file perms to 0640 of mount.json - fixes #2718 2013-04-06 13:21:21 +03:00
Robin Appelman be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Michael Gapczynski 4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Michael Gapczynski 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
Thomas Mueller 0e9b9f4f5f no pretty print 2013-02-19 00:48:38 +01:00
Robin Appelman 3bf9aa408e Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig 2013-02-18 15:13:25 +01:00
Robin Appelman 2bbb57e429 merge master into mountconfig 2013-02-18 15:12:15 +01:00
Jörn Friedrich Dreyer cad65915a7 look where you are typing ... 2013-02-16 12:55:36 +01:00
Jörn Friedrich Dreyer e1700c28fa pretty print json 2013-02-16 12:10:54 +01:00
Robin Appelman 6da2c6c83e Create new mountconfig files in json 2013-02-16 01:50:40 +01:00
Robin Appelman 46626915ef Use a parser to read custom mount configuration instead of including the php files 2013-02-16 01:30:44 +01:00
Bart Visscher 6c197227d0 Join split translated strings 2013-02-15 15:58:52 +01:00
Bart Visscher 5616690506 Style cleanup files_external 2013-02-15 15:58:52 +01:00
Bart Visscher cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Michael Gapczynski 6eba790a75 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php
 2013-02-11 20:27:05 -05:00
hkjolhede 513bf0b999 Update apps/files_external/lib/config.php 
Corrected minor error
 2013-02-10 15:37:05 +01:00
Henrik Kjölhede 41fa65e7be Merge branch 'master' of https://github.com/owncloud/core 
Conflicts:
	apps/files_external/appinfo/app.php
 2013-02-09 14:05:33 +01:00
Henrik Kjölhede b1b2eafa50 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	apps/files_external/lib/config.php
 2013-01-26 21:51:18 +01:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher 5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Michael Gapczynski 1137723b2a Remove unnecessary length parameter from last commit 2013-01-03 12:13:45 -05:00
Michael Gapczynski 38876fc98a Update old storage classes names to the new namespace during mounting 2013-01-03 12:07:04 -05:00
Michael Gapczynski d275725e23 No longer need to create folders locally for external storage mount points 2012-12-29 13:43:44 -05:00
Michael Gapczynski ad902a9848 Move storage backend tests from constructor to test function 2012-12-28 12:00:48 -05:00
hkjolhede 6aded84f10 Update apps/files_external/lib/config.php 
Adding support for SFTP mounts
 2012-12-26 18:03:16 +01:00
Robin Appelman 7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Michael Gapczynski 0dbf1d0260 Show status icons for mount points in external storage UI 2012-12-24 13:45:52 -05:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Frank Karlitschek 262fecbe39 proper escape the mountpoints. Fixes 
https://github.com/owncloud/core/issues/557
 2012-12-14 23:31:50 +01:00
Thomas Mueller e427197dce ctor of OC_L10N requires the app name 2012-12-11 14:07:01 +01:00
Frank Karlitschek e55a3637ce don't call shell_exec if safe_mode is on. 2012-12-11 13:20:20 +01:00
Frank Karlitschek ca7882a7c6 disable not available external filesystems. Restructure the configuration a bit and improve naming 2012-12-10 21:44:43 +01:00
Frank Karlitschek f3bd6d14ee add some output why some of the external filesystems might not work 2012-12-10 21:10:28 +01:00
Robin Appelman be30b1a8de merge master into filesystem 2012-12-03 18:02:22 +01:00
Jörn Friedrich Dreyer 92df70b6e5 fix checkstyle for files_external app, add whitespace for readability 2012-11-30 16:27:11 +01:00
Robin Appelman 961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Arthur Schiwon 8b3ae4309b Fix mkdir and opendir warnings when path does not exist 2012-11-05 21:37:59 +01:00
Robin Appelman 4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Robin Appelman 7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
Felix Moeller 03581ef463 Correct a first issue Checkstyle is complaining about ... 
This is BracketsNotRequired
 2012-10-22 21:40:33 +02:00
Robin Appelman 77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Robin Appelman 11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Robin Appelman c099545b6d don't throw errors if certificate folder doesn't exist 2012-10-12 14:52:22 +02:00
Robin Appelman aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Robin Appelman 13e7e82d19 merge master into filesystem 2012-10-10 11:30:44 +02:00
Björn Schießle 293484d1ee add directory while creating mount point 2012-10-09 15:18:21 +02:00
Robin Appelman 93292516d9 Merge branch 'master' into filesystem 2012-09-22 14:28:14 +02:00