wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16432 commits 157 branches 562 tags 714 MiB
Commit graph

657 commits

Author SHA1 Message Date
Jörn Friedrich Dreyer
e1700c28fa pretty print json 2013-02-16 12:10:54 +01:00
Robin Appelman
d96146a017 Give storage backends the option to define having no known free space 
When this is the case only the configured max upload size is taking into account for uploading
 2013-02-16 03:27:50 +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
Jenkins for ownCloud
b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Bart Visscher
9058d398a7 Merge pull request #1662 from owncloud/style-cleanup 
Style cleanup
 2013-02-14 12:54:36 -08:00
Thomas Mueller
6a250c877f fixing javascript errors IE8 in personal settings 2013-02-14 16:10:52 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Thomas Mueller
037c3ee4ec fixing issues with UTF8 characters in translatable strings 2013-02-13 00:23:37 +01:00
Thomas Mueller
010c4c2891 adding spinner while talking to the backend 2013-02-12 23:27:31 +01:00
Thomas Mueller
a814361ca7 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 23:01:54 +01:00
Thomas Mueller
318c0b3408 user name and password need to be encoded as well 
fixes #1652
 2013-02-12 15:56:31 +01:00
Jenkins for ownCloud
8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Lukas Reschke
a9c77ebaf8 Check requesttoken 2013-02-12 11:35:16 +01:00
Thomas Mueller
6b594c1eb8 fixing namespace 2013-02-12 11:05:12 +01:00
Thomas Mueller
a953786d79 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 11:01:14 +01:00
Thomas Mueller
646d60ee83 fixing namespace 2013-02-12 11:00:38 +01:00
Frank Karlitschek
2507e0da1d Merge pull request #1636 from owncloud/fixing-smb-master 
Fixing smb master
 2013-02-11 23:38:03 -08:00
Michael Gapczynski
ad6e133ca6 Replace another mount point placeholder 2013-02-11 20:35:40 -05: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
Michael Gapczynski
6f08b1f829 Change wordings 2013-02-11 18:04:54 -05:00
Michael Gapczynski
808a13922c Remove the leading slash from the filename for opendir 2013-02-11 17:55:44 -05:00
Thomas Mueller
0c1174770d use urlencode not rawurlencode 2013-02-11 21:25:29 +01:00
Thomas Mueller
392be78162 the path must be encoded because within the smb4pph code it's decoded again - pretty easy but still ..... 2013-02-11 20:32:44 +01:00
Thomas Mueller
7776d047b2 [files_external] fix config gui for all users 
backport of 9e05781ec2
 2013-02-11 15:49:49 +01:00
Thomas Mueller
f512dea3be [files_external] fixing some undefined index 2013-02-11 15:45:10 +01:00
Thomas Mueller
89bc26210a [files_external] removing function as it's the same in the base class - THX Robin 
Conflicts:
	apps/files_external/lib/smb.php
 2013-02-11 15:44:35 +01:00
Jenkins for ownCloud
39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
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
Jenkins for ownCloud
bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Robin Appelman
33cabcf590 postpone the cost of setting up some of the external storage backends untill we actually need it 2012-10-21 22:04:45 +02:00
Robin Appelman
5217ca219a Merge branch 'master' into filesystem 2012-10-21 15:16:23 +02:00
Jenkins for ownCloud
16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Robin Appelman
cfa036eaa9 drop filectime from the filesystem api's 2012-10-20 23:58:07 +02:00
Robin Appelman
f7722abcb0 Merge branch 'master' into filesystem 2012-10-20 23:50:14 +02:00
Jenkins for ownCloud
cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Robin Appelman
9712a78559 merge master into filesystem 2012-10-18 23:24:28 +02:00
Jenkins for ownCloud
519a0ae4ab [tx-robot] updated from transifex 2012-10-18 02:09:32 +02:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Jenkins for ownCloud
fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Jenkins for ownCloud
c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Robin Appelman
11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Jenkins for ownCloud
d386bc8737 [tx-robot] updated from transifex 2012-10-13 02:08:50 +02:00
Robin Appelman
c099545b6d don't throw errors if certificate folder doesn't exist 2012-10-12 14:52:22 +02:00
Jenkins for ownCloud
b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Robin Appelman
141ff806c6 fix namespace problems for external storage backends 2012-10-11 23:17:59 +02:00
Robin Appelman
542869114a implement getId for the external storage providers 2012-10-11 23:06:57 +02:00
Robin Appelman
fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Robin Appelman
92ddefe5a6 fix filetype for smb storage backend 2012-10-11 22:18:34 +02:00
Robin Appelman
5698c8519a fix webdav storage backend when trying to open a non existing file for reading 2012-10-11 22:18:34 +02:00
Robin Appelman
5256301a53 skip the files_external test cases the correct way 2012-10-11 22:18:34 +02:00
Benjamin Liles
8336b3287e Various bug fixes for swift 2012-10-11 08:52:21 -05:00
Jenkins for ownCloud
673e3dae3f [tx-robot] updated from transifex 2012-10-11 02:07:32 +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
Jenkins for ownCloud
fce6ce9bc6 [tx-robot] updated from transifex 2012-10-10 02:09:28 +02:00
Björn Schießle
293484d1ee add directory while creating mount point 2012-10-09 15:18:21 +02:00
Robin Appelman
c815fd5a5c fix files_external test cases 2012-10-08 14:31:13 +02:00
Robin Appelman
e7899e17de merge phpunit into filesystem 2012-10-08 13:53:53 +02:00
Jenkins for ownCloud
e36317c21a [tx-robot] updated from transifex 2012-10-07 02:08:12 +02:00
Robin Appelman
a203a4a1c7 add support to mount a specific folder from dropbox 2012-10-06 13:44:53 +02:00
Robin Appelman
54695b11eb test case for dropbox storage 2012-10-06 13:43:34 +02:00
Jenkins for ownCloud
35c5f71989 [tx-robot] updated from transifex 2012-10-06 02:06:49 +02:00
Jenkins for ownCloud
4fd53eca06 [tx-robot] updated from transifex 2012-10-05 02:06:09 +02:00
Jenkins for ownCloud
5c042d88ad [tx-robot] updated from transifex 2012-10-04 02:07:35 +02:00
Jenkins for ownCloud
6fada7a4c0 [tx-robot] updated from transifex 2012-10-03 02:05:14 +02:00
Robin Appelman
ac44506b40 Merge branch 'master' into filesystem 2012-10-02 23:29:13 +02:00
Jenkins for ownCloud
32a6b3b862 [tx-robot] updated from transifex 2012-10-02 23:18:26 +02:00
Thomas Mueller
7abe1360b2 l18n support added to files_external/js 2012-10-02 23:09:28 +02:00
Frank Karlitschek
3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number. 
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
 2012-10-02 12:10:45 +02:00
Robin Appelman
b7eb3f3dff merge master into filesystem 2012-10-01 14:21:49 +02:00
Björn Schießle
aa9ffd119a check if file really exist before add/remove it 2012-09-27 12:37:23 +02:00
Björn Schießle
a56f2ec183 only upload valid ssl root certificates 2012-09-27 11:21:29 +02:00
Jenkins for ownCloud
09aa95586a [tx-robot] updated from transifex 2012-09-27 02:03:09 +02:00
Björn Schießle
21c6cc45e6 take '\' on windows systems into account to prevent file deletion above upload direectory 2012-09-26 23:08:40 +02:00
Björn Schießle
9ab887fed5 fix security issue, don't allow to go back in the path 2012-09-26 21:35:14 +02:00
Robin Appelman
88bca9bc49 Merge branch 'master' into filesystem 2012-09-26 17:52:28 +02:00
Jenkins for ownCloud
5855355faa [tx-robot] updated from transifex 2012-09-26 02:06:37 +02:00
Björn Schießle
25499644e3 Merge branch 'master' of github.com:owncloud/core 2012-09-25 12:02:02 +02:00
Björn Schießle
90a1bd5721 seperate the form to set up the mount points and the form to upload ssl certificates 2012-09-25 12:01:09 +02:00
Jenkins for ownCloud
e5487376da [tx-robot] updated from transifex 2012-09-25 02:05:18 +02:00
Jenkins for ownCloud
ecb90d72f3 [tx-robot] updated from transifex 2012-09-24 02:04:10 +02:00
Robin Appelman
96b798a59f move storage backend test cases to their own namespace 2012-09-22 14:51:15 +02:00
Robin Appelman
93292516d9 Merge branch 'master' into filesystem 2012-09-22 14:28:14 +02:00
Björn Schießle
3d2cd64a48 add a line break after every certificate 2012-09-21 16:54:08 +02:00
Jenkins for ownCloud
7c42e88676 [tx-robot] updated from transifex 2012-09-20 02:09:31 +02:00
Jenkins for ownCloud
b0e645fe13 [tx-robot] updated from transifex 2012-09-19 02:07:26 +02:00
Björn Schießle
842cd57fa7 use more oc file operations instead of plain PHP functions 2012-09-18 17:04:22 +02:00
Jenkins for ownCloud
06e963c54f [tx-robot] updated from transifex 2012-09-18 02:04:26 +02:00
Michael Gapczynski
89fb5d47a4 Add chosen script and style, bug fix for oc-1745 2012-09-16 13:27:27 -04:00
Michael Gapczynski
f8d907df71 Set configured to true after configuring Dropbox storage 2012-09-12 21:30:04 -04:00
Jenkins for ownCloud
6a29bbda7a [tx-robot] updated from transifex 2012-09-11 02:03:53 +02:00
Jenkins for ownCloud
bd720bdf4c [tx-robot] updated from transifex 2012-09-10 02:04:59 +02:00
Jenkins for ownCloud
5e790368bc [tx-robot] updated from transifex 2012-09-09 02:03:35 +02:00
Jenkins for ownCloud
d5d2e89622 [tx-robot] updated from transifex 2012-09-08 02:05:41 +02:00
Robin Appelman
bd83422095 put filestorages in a namespace 2012-09-07 18:30:48 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher
285c198c36 EOL fixes 
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
 2012-09-07 14:10:00 +02:00
Jenkins for ownCloud
a94b56b57b [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
Jenkins for ownCloud
af3e767489 [tx-robot] updated from transifex 2012-09-06 02:06:37 +02:00
Thomas Mueller
ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Bart Visscher
9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Robin Appelman
aa8cee1afa I don't think this file was meant to be commited 2012-09-05 19:42:26 +02:00
Jenkins for ownCloud
e8fcc71129 [tx-robot] updated from transifex 2012-09-05 02:05:39 +02:00
Georg Ehrke
745f279fbc make use of OC_User::getHome in files_external app 2012-09-04 15:56:00 +02:00
Jenkins for ownCloud
75cd7eacf8 [tx-robot] updated from transifex 2012-08-31 02:07:19 +02:00
Bart Visscher
db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher
0365f8fd01 Remove php close at end of file 2012-08-29 20:29:43 +02:00
Bart Visscher
0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Jenkins for ownCloud
9338d093f9 [tx-robot] updated from transifex 2012-08-29 02:06:48 +02:00
Jenkins for ownCloud
8374a49cc1 [tx-robot] updated from transifex 2012-08-28 02:03:56 +02:00
Jenkins for ownCloud
c33a2ca01d [tx-robot] updated from transifex 2012-08-27 02:02:37 +02:00
Jenkins for ownCloud
f57d527a7c [tx-robot] updated from transifex 2012-08-25 02:08:36 +02:00
Jenkins for ownCloud
07a889631e [tx-robot] updated from transifex 2012-08-24 02:07:18 +02:00
Jenkins for ownCloud
082ed4ab71 [tx-robot] updated from transifex 2012-08-23 02:07:35 +02:00
Michael Gapczynski
68f5dc2a44 Remove unnecessary files 2012-08-20 21:22:23 -04:00
Jenkins for ownCloud
b819aa33f7 [tx-robot] updated from transifex 2012-08-21 02:09:12 +02:00
Michael Gapczynski
82d81e8d39 Merge branch 'share_api' 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
 2012-08-19 22:29:01 -04:00
Jenkins for ownCloud
36474e5681 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Jenkins for ownCloud
70e8a7e25c [tx-robot] updated from transifex 2012-08-17 00:45:46 +02:00
Jenkins for ownCloud
1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Jenkins for ownCloud
da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Michael Gapczynski
4c7fd8cd01 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
 2012-08-14 10:22:13 -04:00
Jenkins for ownCloud
19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Michael Gapczynski
830676b475 Improve usability for configuring Dropbox and Google Drive external storage 2012-08-13 17:10:58 -04:00
Michael Gapczynski
d3bdab286b Suggest mount point name, don't reload custom javascript file 2012-08-13 17:10:58 -04:00
Michael Gapczynski
98c7d40fcd Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct 2012-08-13 17:10:58 -04:00
Michael Gapczynski
7f12a65c24 Show access granted label immediately after granting access 2012-08-13 17:10:58 -04:00
Michael Gapczynski
0e6d22e25f Prevent editing Dropbox configuration input after access granted 2012-08-13 17:10:58 -04:00
Michael Gapczynski
b6b2f8826b Show access granted label next to Google Drive and Dropbox storage in configuration 2012-08-13 17:10:58 -04:00
Michael Gapczynski
be32625fcc Fix remove button display for external storage 2012-08-13 17:10:58 -04:00
Thomas Mueller
53f117c01a l10n directories have been missing 2012-08-13 23:10:10 +02:00
Lukas Reschke
2dfc485149 XSRF checks 2012-08-10 00:44:35 +02:00
Michael Gapczynski
94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
Michael Gapczynski
48f33be848 Only call mkdir() if the root folder does not exist for FTP external storage 2012-07-27 12:32:03 -04:00
Michael Gapczynski
30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
 2012-07-25 17:08:18 -04:00
Michael Gapczynski
f7b89f0475 Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable() 2012-07-24 20:10:28 -04:00
Robin Appelman
c9be9ab251 remove unused variables 2012-07-20 18:56:18 +02:00
Robin Appelman
3c2967074f remove unused variable from dropbox filestorage backend 2012-07-20 16:48:28 +02:00
Robin Appelman
1224d7ec01 minor fixes for the google filestorage backend 2012-07-20 16:47:26 +02:00
Robin Appelman
23c71b15a0 remove unused variables from webdav file backend 2012-07-20 16:35:51 +02:00
Bjoern Schiessle
43f00a2dc8 create uploads directory for ssl certificates if it didn't exists 2012-07-09 18:11:29 +02:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Bjoern Schiessle
77f07c672e remove hard coded path 2012-07-09 12:49:04 +02:00
Bjoern Schiessle
6bf1473f0e replace urlencoded slash 2012-07-09 11:58:16 +02:00
Bjoern Schiessle
32b476d6ec remove comments around code block 2012-07-09 10:19:19 +02:00
Bjoern Schiessle
7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Lukas Reschke
ea70ca3ce3 CSRF checks 2012-07-07 16:12:21 +02:00
Bjoern Schiessle
ca26bcc581 close file after write process 2012-07-06 17:09:20 +02:00
Bjoern Schiessle
e91b4bc2ac allow user to upload his own root certificate for secure webdav mount 2012-07-06 15:58:38 +02:00
Bjoern Schiessle
963faf6458 CURLOPT_SSL_VERIFYPEER=false shouldn't be in master 2012-07-06 12:35:29 +02:00
Bjoern Schiessle
8353517969 use OC_Connector_Sabre_Client 2012-07-06 12:24:03 +02:00
Bjoern Schiessle
378fa2bc86 check if caview really exists 2012-07-05 12:17:33 +02:00
Bjoern Schiessle
aa3b575ceb disabled user upload of root certificates until sabredav client can handle them 2012-07-05 11:31:30 +02:00
Bjoern Schiessle
f86ecb3bf7 send ca cert path to sabredav client 2012-07-05 11:28:32 +02:00
Bjoern Schiessle
e258da5c3c certificate should be only visible for users 2012-07-04 17:22:04 +02:00
Bjoern Schiessle
5d61b85a1d allow users to upload ssl root certificates for the webdav client 2012-07-04 17:18:36 +02:00
Bjoern Schiessle
ab036d4764 webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log 2012-07-02 17:52:51 +02:00
Michael Gapczynski
edc6a648d1 Fix placeholder value for optional fields in external storage UI 2012-06-29 19:35:57 -04:00
Michael Gapczynski
719c7f7f6e Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160 2012-06-29 13:01:00 -04:00
Michael Gapczynski
7e9455c382 Allow multiple Google Drive and Dropbox external storages to be configured 2012-06-29 11:22:54 -04:00
Michael Gapczynski
2d49a491fb Clear the mount point value for the new mount point row 2012-06-29 11:10:51 -04:00
Michael Gapczynski
f311c2a2ff Hide the delete button on new mount point row 2012-06-29 11:10:51 -04:00
Bjoern Schiessle
60ec46f706 - remove leading http[s] to let createBaseUri() generate secure/unsecure base URI 
- if secure is set to true add 's' to http
 2012-06-29 12:01:23 +02:00
Michael Gapczynski
31bba86e87 Fix external storage UI for Admin page 2012-06-28 17:55:22 -04:00
Michael Gapczynski
db6139fd41 Don't overwrite fake directory stream for Amazon S3 storage 2012-06-27 19:44:52 -04:00
Michael Gapczynski
9b605969f1 Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend 2012-06-27 15:23:49 -04:00
Michael Gapczynski
b7f86cf282 Add Samba Share parameter to external storage UI 2012-06-27 12:24:21 -04:00
Michael Gapczynski
19f94774fb Don't overwrite fake directory stream for Dropbox and Google Drive 2012-06-27 12:04:33 -04:00
Michael Gapczynski
79da782892 Improve error handling of Dropbox storage backend 2012-06-26 20:37:50 -04:00
Michael Gapczynski
618a3c1d94 Fix removing personal mounts 2012-06-22 12:22:42 -04:00
Michael Gapczynski
b650f46698 Fix variable checks for mounting Google Drive 2012-06-22 12:22:42 -04:00
Robin Appelman
ad4f066bac suppress error when using is_dir on non directory in smb backend 2012-06-17 03:09:49 +02:00
Robin Appelman
ed66c63c29 improve caching smb results a bit 2012-06-17 02:59:38 +02:00
Robin Appelman
769cbe9a4c improve filecache support for smb 2012-06-17 02:54:23 +02:00
Michael Gapczynski
92083aa20c Fix upload for Google Drive; Google Documents List API documentation was misleading 2012-06-14 20:57:08 -04:00
Michael Gapczynski
b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00
Michael Gapczynski
bd01e93469 Add support for mounting Google Drive in external storage UI 2012-06-13 13:54:50 -04:00
Michael Gapczynski
5f80be7664 Add support for mounting Dropbox in external storage UI 2012-06-12 11:36:43 -04:00
Lukas Reschke
6defbc7f4d Removed some unessecary sanitizations 2012-06-11 19:20:48 +02:00
Lukas Reschke
27d1c1bb94 Sanitize user input 2012-06-11 00:14:28 +02:00
Michael Gapczynski
3c57fb935b Mount personal mount points into filesystem 2012-06-10 16:34:44 -04:00
Michael Gapczynski
ab41b57f62 Add Dropbox storage backend 2012-06-09 15:02:48 -04:00
Bart Visscher
ac36512102 Don't use substr to get first char of string 2012-06-08 21:38:10 +02:00
Michael Gapczynski
8fcdccdcdc Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage 2012-06-08 13:48:38 -04:00
Michael Gapczynski
4b3ae60558 Working UI for external storage mount configuration 2012-06-08 11:42:29 -04:00
Robin Appelman
4768510923 split share and root config for smb backend, also sanitize config a bit more 2012-06-08 01:29:55 +02:00
Michael Gapczynski
d334f33eba Initial support for Amazon S3 storage backend 
Conflicts:

	apps/files_external/tests/config.php
 2012-05-29 12:19:29 -04:00
Robin Appelman
a1539dace7 share code between smb and ftp filestorage backends 2012-05-24 19:41:32 +02:00
Robin Appelman
2f40f11c87 smb filestorage backend 2012-05-24 18:23:59 +02:00
Michael Gapczynski
bee724c53e Initial work on UI for mounting external storage 2012-05-24 11:06:03 -04:00
Frank Karlitschek
9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Thomas Mueller
583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Robin Appelman
6779f28af4 cache app types during install or update 2012-05-14 22:49:31 +02:00
Robin Appelman
0b51c53443 run none of the extranal storage tests on default 2012-05-02 23:44:00 +02:00
Michael Gapczynski
6d37b8567b Refactoring and upload support for Google Drive backend 2012-05-02 14:41:57 -04:00
Frank Karlitschek
8c7f854671 move all the files stuff into a files class 2012-05-02 12:54:31 +02:00