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

426 Commits

Author SHA1 Message Date
Lukas Reschke 980c197fbf Merge pull request #1594 from hkjolhede/master 
Corrected namespace path for files_external SFTP backend
 2013-02-10 06:47:22 -08:00
hkjolhede 513bf0b999 Update apps/files_external/lib/config.php 
Corrected minor error
 2013-02-10 15:37:05 +01:00
Lukas Reschke 6f785e211b Merge pull request #1030 from hkjolhede/master 
SFTP support in files_external app
 2013-02-10 05:06:00 -08:00
Henrik Kjölhede 421bacc33a Final changes from icewind1991 2013-02-10 13:11:29 +01:00
Henrik Kjölhede 1df8a5a774 Updated phpseclib from git + requested style changes 2013-02-10 12:35:49 +01:00
Robin Appelman b44c18d164 Don't run external storage tests on default 2013-02-10 11:39:32 +01:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Henrik Kjölhede c6622301e5 Security bug 2013-02-09 23:49:21 +01:00
Henrik Kjölhede bcf98879cb Just a little cleaner in touch 2013-02-09 23:33:01 +01:00
Henrik Kjölhede 9e42a36fd8 Update to touch 2013-02-09 23:29:58 +01:00
Henrik Kjölhede 674955d1b6 Spelling mistake 2013-02-09 20:35:48 +01:00
Henrik Kjölhede 71d3903cfd Added unittest 2013-02-09 20:34:21 +01:00
Henrik Kjölhede 96cfe37587 Update to conform to API changes 2013-02-09 19:08:39 +01:00
Henrik Kjölhede 3b029d551c corrected namespace 2013-02-09 15:57:33 +01:00
Henrik Kjölhede 81a281a140 Modified to new class structure 2013-02-09 14:12:17 +01:00
Henrik Kjölhede 2b4823d62d Deleted phpseclib/tests 2013-02-09 14:07:18 +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
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Müller 04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on 
replace live() with on() in core js
 2013-02-03 21:55:54 -08:00
Jenkins for ownCloud da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on 
Conflicts:
	apps/files_external/js/google.js
 2013-01-31 23:34:12 +01:00
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Robin Appelman 54d46fe43c remove outdated line 2013-01-31 15:00:48 +01:00
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Jörn Friedrich Dreyer 22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Robin Appelman 7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Robin Appelman c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Robin Appelman bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +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
hkjolhede a26d50640f Update apps/files_external/lib/sftp.php 
Added cleaning the root path
 2013-01-26 19:46:23 +01:00
Robin Appelman 930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Thomas Mueller ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Michael Gapczynski e666ce3622 Fix external storage UI for new storage namespaces 2013-01-21 23:57:26 -05: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
Bart Visscher a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Thomas Mueller 388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Michael Gapczynski 464dafd7d2 Make Google Drive storage id unique, before it was anonymousanonymous 2013-01-09 22:17:39 -05:00
Michael Gapczynski fbcf62389c Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/lib/webdav.php
 2013-01-09 21:49:21 -05:00
Michael Gapczynski 78043d73e8 Set status to waiting for Dropbox and Google Drive while authenticating 2013-01-09 21:47:24 -05:00
Jenkins for ownCloud 912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Björn Schießle 43415386a8 Upstream merged my patch to add additional ssl root certificates to the webdav client. 
This means that OC_Connector_Sabre_Client is no longer needed
 2013-01-08 17:44:28 +01:00
Jenkins for ownCloud b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Thomas Mueller 4a345fd911 removing undefined $response 2013-01-06 23:28:58 +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
Robin Appelman e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Jenkins for ownCloud 3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Michael Gapczynski 7f218c4dc0 Remove accidentally included file 2013-01-02 13:20:44 -05:00
Michael Gapczynski db90f2c296 Listen to checkbox changes as well 2013-01-02 12:13:59 -05:00
Michael Gapczynski d65cb7ae09 Fix 'Grant Access' button for multiple Google Drive mount points and prevent multiple scripts being added 2013-01-02 11:59:17 -05:00
Michael Gapczynski a69de3a8f1 Turn off async for saving mount points, improve input detection for Google and Dropbox 'Grant Access' buttons 2013-01-01 16:19:40 -05:00
Jenkins for ownCloud c6064a542c [tx-robot] updated from transifex 2013-01-01 00:04:42 +01:00
Jenkins for ownCloud 329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Michael Gapczynski d275725e23 No longer need to create folders locally for external storage mount points 2012-12-29 13:43:44 -05:00
Jenkins for ownCloud 9aefbea074 [tx-robot] updated from transifex 2012-12-29 00:08:28 +01:00
Michael Gapczynski 442a045ef6 Fix problems with chosen multiselect 2012-12-28 17:38:24 -05:00
hkjolhede ab4d52e980 Update apps/files_external/lib/sftp.php 
Created test() function as per @pull/1031
 2012-12-28 22:22:04 +01:00
Michael Gapczynski 595e72ade8 Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ownCloud / WebDAV 2012-12-28 15:56:48 -05:00
Michael Gapczynski ad902a9848 Move storage backend tests from constructor to test function 2012-12-28 12:00:48 -05:00
Jenkins for ownCloud e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
hkjolhede ab31c3ef4e Update apps/files_external/lib/sftp.php 
Updated to using local 3rdparty + added a few missed braces.
 2012-12-27 21:00:20 +01:00
Henrik Kjölhede 8598d18529 Added phpseclib to files_external as 3rdparty 2012-12-27 20:23:56 +01:00
hkjolhede be197d52b1 Update apps/files_external/lib/sftp.php 
Added copyright notice
 2012-12-27 19:47:46 +01:00
hkjolhede 00bfcd94ec Update apps/files_external/lib/sftp.php 
Added a little better exception handling, hopefully making it a little more robust
 2012-12-26 23:49:53 +01:00
hkjolhede 3375253e1d Update apps/files_external/lib/sftp.php 
Added checks for host keys and added exceptions thrown if constructor fails.
 2012-12-26 23:38:17 +01:00
Michael Gapczynski d9ff3b6860 Fix last commit's variable 2012-12-26 14:18:51 -05:00
Michael Gapczynski 48a3966ea9 Listen to paste events for dropbox configuration 2012-12-26 14:04:02 -05:00
Michael Gapczynski 5d68e04e5a Change callback url for dropbox as well 2012-12-26 13:45:22 -05:00
Michael Gapczynski 30a07e9573 Save configuration after paste events and 2 seconds after typing 2012-12-26 13:35:22 -05:00
hkjolhede 6aded84f10 Update apps/files_external/lib/config.php 
Adding support for SFTP mounts
 2012-12-26 18:03:16 +01:00
hkjolhede 180ab42c06 Update apps/files_external/appinfo/app.php 
Adding support for SFTP
 2012-12-26 18:00:04 +01:00
hkjolhede 08156cc57f Create sftp.php 
Adapter for SFTP using the pure php SSH library phpseclib
 2012-12-26 08:59:08 -08:00
Jenkins for ownCloud b7257b2524 [tx-robot] updated from transifex 2012-12-26 00:12:10 +01:00
Robin Appelman 7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Michael Gapczynski a0e47a2c67 Prevent javascript error if no value is set for the multiselect 2012-12-24 13:55:37 -05:00
Michael Gapczynski 3c08d2ba23 Change callback url to path only in case oauth parameters are still in url 2012-12-24 13:48:18 -05:00
Michael Gapczynski 0dbf1d0260 Show status icons for mount points in external storage UI 2012-12-24 13:45:52 -05:00
Jenkins for ownCloud 7d52c39419 [tx-robot] updated from transifex 2012-12-24 00:12:16 +01:00
Jenkins for ownCloud 0656b41747 [tx-robot] updated from transifex 2012-12-23 00:10:23 +01:00
Jenkins for ownCloud 05fda76776 [tx-robot] updated from transifex 2012-12-22 00:26:25 +01:00
Jenkins for ownCloud 3e39c39d6a [tx-robot] updated from transifex 2012-12-21 00:11:31 +01:00
Frank Karlitschek 7c5150ce32 Merge pull request #913 from owncloud/fix_settings 
cleaning up the settings
 2012-12-18 15:27:52 -08:00
Jenkins for ownCloud 982e46cd29 [tx-robot] updated from transifex 2012-12-19 00:04:14 +01:00
Thomas Müller b0532c6343 Merge pull request #905 from owncloud/fix_mountpointescaping 
proper escape the mountpoints.
 2012-12-18 04:01:07 -08:00
Jenkins for ownCloud a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Frank Karlitschek c4ecbad009 check if admin 2012-12-17 14:46:57 +01:00
Jenkins for ownCloud 0c87f666ad [tx-robot] updated from transifex 2012-12-16 00:12:10 +01:00
Frank Karlitschek 30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher 8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +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
Jenkins for ownCloud 6d7ae463df [tx-robot] updated from transifex 2012-12-14 00:17:42 +01:00
Jenkins for ownCloud 8686a448c7 [tx-robot] updated from transifex 2012-12-13 00:18:20 +01:00
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +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
Jenkins for ownCloud a444999a8c [tx-robot] updated from transifex 2012-12-10 00:12:32 +01:00
Robin Appelman be30b1a8de merge master into filesystem 2012-12-03 18:02:22 +01:00
Thomas Müller 475fe281a4 Merge pull request #654 from butonic/checkstyle_fixes 
fix checkstyle for files_encryption & files_encryption app, add whitespace for readability
 2012-12-02 03:14:30 -08:00
Robin Appelman 72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Jenkins for ownCloud 401c56ce7b [tx-robot] updated from transifex 2012-12-02 00:03:12 +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 d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Jenkins for ownCloud 16a630024c [tx-robot] updated from transifex 2012-11-30 00:05:16 +01:00
Jenkins for ownCloud 1d4d4fd678 [tx-robot] updated from transifex 2012-11-28 00:11:21 +01:00
Jenkins for ownCloud d251f04b98 [tx-robot] updated from transifex 2012-11-27 00:10:47 +01:00
Jenkins for ownCloud 7892204077 [tx-robot] updated from transifex 2012-11-26 00:02:04 +01:00
Robin Appelman 97380f3485 merge master into filesystem 2012-11-21 22:37:14 +01:00
Jenkins for ownCloud 9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Jenkins for ownCloud 568def2b61 [tx-robot] updated from transifex 2012-11-20 00:02:08 +01:00
Robin Appelman 54240140b1 fix incorectly merged smb.php 2012-11-16 12:14:29 +01:00
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Diederik de Haas 6e6df6e410 Fixed new checkstyle issues in ftp.php from build #1341. 2012-11-10 00:46:50 +01:00
Diederik de Haas 3cc6df489f Fixed new checkstyle issues in swift.php from build #1341. 2012-11-10 00:45:49 +01:00
Diederik de Haas 051635412d Fixed new checkstyle issues from build #1341. 2012-11-10 00:40:32 +01:00
Jenkins for ownCloud 7ec0efe5c2 [tx-robot] updated from transifex 2012-11-10 00:02:29 +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 972243d564 support string values ('true' and 'false') for configuring the secure parameter on external storage backends 
fixes #78
 2012-11-05 16:39:03 +01:00
Robin Appelman 4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller 0e70ea9d8b Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
Felix Moeller 1205749f8c Checkstyle: Fix the last two SpaceBeforeOpenBrace 2012-11-04 18:18:03 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Jenkins for ownCloud 2f0fd84477 [tx-robot] updated from transifex 2012-11-03 00:02:24 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Robin Appelman 51ba12890d Merge branch 'master' into filesystem 2012-11-01 16:16:02 +01:00
Jenkins for ownCloud a327087c8b [tx-robot] updated from transifex 2012-11-01 00:02:14 +01:00
Robin Appelman 6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +01:00
Felix Moeller dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +01:00
Robin Appelman c4a793913c Merge branch 'master' into filesystem 2012-10-28 10:28:25 +01:00
Jenkins for ownCloud 1a08ef6a06 [tx-robot] updated from transifex 2012-10-28 00:02:29 +02:00
Robin Appelman cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Jenkins for ownCloud 3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Robin Appelman 7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Jenkins for ownCloud 43bae1b473 [tx-robot] updated from transifex 2012-10-25 02:11:53 +02:00
Lukas Reschke 515e1b467e Merge pull request #81 from fmms/master 
Codestyle add some needed spaces.
 2012-10-24 10:16:32 -07:00
Robin Appelman 7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Jenkins for ownCloud f33af71eb0 [tx-robot] updated from transifex 2012-10-24 02:08:34 +02:00
Felix Moeller 561cbb2de6 NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02: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