17ff5d486e
Merge branch 'master' into ext-fs-irods-master
2013-04-26 13:29:48 +02:00
7ea2f785f4
[tx-robot] updated from transifex
2013-04-26 01:58:21 +02:00
a0df5903b0
[tx-robot] updated from transifex
2013-04-25 01:55:56 +02:00
88fd3b088d
[tx-robot] updated from transifex
2013-04-24 17:46:20 +02:00
a7b4469b2e
[tx-robot] updated from transifex
2013-04-24 02:01:20 +02:00
c5d3f09262
test case for iRODS storage added
2013-04-23 23:19:11 +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
05ab9d2de7
[tx-robot] updated from transifex
2013-04-23 02:00:31 +02:00
cfbf81f978
checkbox in settings ui
2013-04-18 22:20:52 +02:00
e1f5f00ec3
in order to use the ownCloud login credentials we use a login hook to grab uid and password and store it in the session.
...
The stored credentials will be used for and interactions with the iRODS server.
Within the config UI a check box can be used to enable the credential reuse.
2013-04-18 22:12:53 +02:00
fbd3445d22
Merge branch 'master' into ext-fs-irods-master
2013-04-18 09:27:43 +02:00
cbd8b792d9
[tx-robot] updated from transifex
2013-04-18 02:09:28 +02:00
37868818ff
[tx-robot] updated from transifex
2013-04-17 02:29:17 +02:00
19afc216cf
[tx-robot] updated from transifex
2013-04-13 02:15:54 +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
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
6552996734
Set file perms to 0640 of mount.json - fixes #2718
2013-04-06 13:21:21 +03:00
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
10e37e1553
[tx-robot] updated from transifex
2013-04-03 00:04:02 +02:00
cfd8b911b6
[tx-robot] updated from transifex
2013-03-31 00:03:46 +01:00
5e74ec26a8
[tx-robot] updated from transifex
2013-03-30 00:06:29 +01:00
599778b153
Files External: show display names instead of internal user names in Settings UI
2013-03-27 19:07:33 +01:00
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
63e3f978ab
[tx-robot] updated from transifex
2013-03-20 00:02:44 +01:00
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
ec45a8433d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/templates/settings.php
2013-03-15 17:50:02 +01:00
d2b3a9fb3b
Update settings.php
...
fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
2013-03-15 15:09:55 +01:00
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
f3a2daaa9d
[tx-robot] updated from transifex
2013-03-13 00:06:21 +01:00
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
be4806d031
Store the global mount configuration file in the datadir
2013-03-10 02:25:03 +01:00
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
97222b1de5
[tx-robot] updated from transifex
2013-03-07 00:16:59 +01:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
10b108ed8a
Merge pull request #2030 from j-ed/master
...
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
d3e88e6a8c
Remove uneeded sanitizeHTML
2013-03-02 12:44:53 +01:00
2aaf38b5d3
Update app.php
...
suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
2013-03-02 12:12:33 +01:00
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
236507a19f
[files_external] From echo to p
2013-02-27 21:31:27 +01:00
766a301a6b
Merge pull request #1031 from owncloud/external_storage_ui_feedback
...
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
f26c477433
Merge pull request #1949 from owncloud/fix-dropbox
...
Fix undefined root parameter in Dropbox storage
2013-02-26 16:14:45 -08:00
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
25cf18f614
Fix undefined root parameter in Dropbox storage
2013-02-26 17:52:06 -05:00
8c9d0d1f5b
cleanPath needs to be public
2013-02-26 12:24:52 +01:00
5b50bc8c0a
Fix Dropbox and Google ui
2013-02-25 19:45:01 -05:00
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
4e826b1673
Set required owncloud version to 4.93
2013-02-24 17:38:36 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
05a8766cbc
attach on() events to external storage table, dom events in the table will always bubble up here
2013-02-20 12:06:08 +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
3878203679
Merge pull request #1731 from owncloud/unknown-freespace
...
Give storage backends the option to define having no known free space
2013-02-19 15:18:12 -08:00
c56542c58d
Merge pull request #1771 from owncloud/mountconfig
...
JSON mount config: no pretty print
2013-02-18 22:15:56 -08:00
0e9b9f4f5f
no pretty print
2013-02-19 00:48:38 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
0ab87204ec
Merge pull request #1759 from owncloud/redirect_fix_1737
...
fix redirect, use the new routing
2013-02-18 07:13:19 -08: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
4a3374ecf8
fix redirect, use the new routing
2013-02-18 14:38:29 +01:00
79284b8e57
Sanitize HTML
2013-02-18 08:11:59 +01:00
8e76a98d2f
Merge pull request #1709 from owncloud/style-cleanup-files_external
...
Style cleanup files_external
2013-02-17 11:53:51 -08:00
325746ae45
Merge branch 'master' into fix-googledrive
2013-02-17 09:41:37 +01:00
4708d4549d
Add missing requesttoken
...
This is a trivial fix for a regression caused by #1648
2013-02-16 13:28:49 +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
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
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
6c197227d0
Join split translated strings
2013-02-15 15:58:52 +01:00
5616690506
Style cleanup files_external
2013-02-15 15:58:52 +01:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
6a250c877f
fixing javascript errors IE8 in personal settings
2013-02-14 16:10:52 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
037c3ee4ec
fixing issues with UTF8 characters in translatable strings
2013-02-13 00:23:37 +01:00
010c4c2891
adding spinner while talking to the backend
2013-02-12 23:27:31 +01:00
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
318c0b3408
user name and password need to be encoded as well
...
fixes #1652
2013-02-12 15:56:31 +01:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
a9c77ebaf8
Check requesttoken
2013-02-12 11:35:16 +01:00
6b594c1eb8
fixing namespace
2013-02-12 11:05:12 +01:00
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
646d60ee83
fixing namespace
2013-02-12 11:00:38 +01:00
2507e0da1d
Merge pull request #1636 from owncloud/fixing-smb-master
...
Fixing smb master
2013-02-11 23:38:03 -08:00
ad6e133ca6
Replace another mount point placeholder
2013-02-11 20:35:40 -05:00
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
6f08b1f829
Change wordings
2013-02-11 18:04:54 -05:00
808a13922c
Remove the leading slash from the filename for opendir
2013-02-11 17:55:44 -05:00
0c1174770d
use urlencode not rawurlencode
2013-02-11 21:25:29 +01:00
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
7776d047b2
[files_external] fix config gui for all users
...
backport of 9e05781ec2
2013-02-11 15:49:49 +01:00
f512dea3be
[files_external] fixing some undefined index
2013-02-11 15:45:10 +01:00
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
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
980c197fbf
Merge pull request #1594 from hkjolhede/master
...
Corrected namespace path for files_external SFTP backend
2013-02-10 06:47:22 -08:00
513bf0b999
Update apps/files_external/lib/config.php
...
Corrected minor error
2013-02-10 15:37:05 +01:00
6f785e211b
Merge pull request #1030 from hkjolhede/master
...
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
421bacc33a
Final changes from icewind1991
2013-02-10 13:11:29 +01:00
1df8a5a774
Updated phpseclib from git + requested style changes
2013-02-10 12:35:49 +01:00
b44c18d164
Don't run external storage tests on default
2013-02-10 11:39:32 +01:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
c6622301e5
Security bug
2013-02-09 23:49:21 +01:00
bcf98879cb
Just a little cleaner in touch
2013-02-09 23:33:01 +01:00
9e42a36fd8
Update to touch
2013-02-09 23:29:58 +01:00
674955d1b6
Spelling mistake
2013-02-09 20:35:48 +01:00
71d3903cfd
Added unittest
2013-02-09 20:34:21 +01:00
96cfe37587
Update to conform to API changes
2013-02-09 19:08:39 +01:00
3b029d551c
corrected namespace
2013-02-09 15:57:33 +01:00
81a281a140
Modified to new class structure
2013-02-09 14:12:17 +01:00
2b4823d62d
Deleted phpseclib/tests
2013-02-09 14:07:18 +01:00
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
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
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
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
54d46fe43c
remove outdated line
2013-01-31 15:00:48 +01:00
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
a26d50640f
Update apps/files_external/lib/sftp.php
...
Added cleaning the root path
2013-01-26 19:46:23 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
e666ce3622
Fix external storage UI for new storage namespaces
2013-01-21 23:57:26 -05:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
464dafd7d2
Make Google Drive storage id unique, before it was anonymousanonymous
2013-01-09 22:17:39 -05:00
fbcf62389c
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/lib/webdav.php
2013-01-09 21:49:21 -05:00
78043d73e8
Set status to waiting for Dropbox and Google Drive while authenticating
2013-01-09 21:47:24 -05:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
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
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
4a345fd911
removing undefined $response
2013-01-06 23:28:58 +01:00
1137723b2a
Remove unnecessary length parameter from last commit
2013-01-03 12:13:45 -05:00
38876fc98a
Update old storage classes names to the new namespace during mounting
2013-01-03 12:07:04 -05:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
7f218c4dc0
Remove accidentally included file
2013-01-02 13:20:44 -05:00
db90f2c296
Listen to checkbox changes as well
2013-01-02 12:13:59 -05:00
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
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
c6064a542c
[tx-robot] updated from transifex
2013-01-01 00:04:42 +01:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
d275725e23
No longer need to create folders locally for external storage mount points
2012-12-29 13:43:44 -05:00
9aefbea074
[tx-robot] updated from transifex
2012-12-29 00:08:28 +01:00
442a045ef6
Fix problems with chosen multiselect
2012-12-28 17:38:24 -05:00
ab4d52e980
Update apps/files_external/lib/sftp.php
...
Created test() function as per @pull/1031
2012-12-28 22:22:04 +01:00
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
ad902a9848
Move storage backend tests from constructor to test function
2012-12-28 12:00:48 -05:00
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
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
8598d18529
Added phpseclib to files_external as 3rdparty
2012-12-27 20:23:56 +01:00
be197d52b1
Update apps/files_external/lib/sftp.php
...
Added copyright notice
2012-12-27 19:47:46 +01:00
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
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
d9ff3b6860
Fix last commit's variable
2012-12-26 14:18:51 -05:00
48a3966ea9
Listen to paste events for dropbox configuration
2012-12-26 14:04:02 -05:00
5d68e04e5a
Change callback url for dropbox as well
2012-12-26 13:45:22 -05:00
30a07e9573
Save configuration after paste events and 2 seconds after typing
2012-12-26 13:35:22 -05:00
6aded84f10
Update apps/files_external/lib/config.php
...
Adding support for SFTP mounts
2012-12-26 18:03:16 +01:00
180ab42c06
Update apps/files_external/appinfo/app.php
...
Adding support for SFTP
2012-12-26 18:00:04 +01:00
08156cc57f
Create sftp.php
...
Adapter for SFTP using the pure php SSH library phpseclib
2012-12-26 08:59:08 -08:00
b7257b2524
[tx-robot] updated from transifex
2012-12-26 00:12:10 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
a0e47a2c67
Prevent javascript error if no value is set for the multiselect
2012-12-24 13:55:37 -05:00
3c08d2ba23
Change callback url to path only in case oauth parameters are still in url
2012-12-24 13:48:18 -05:00
0dbf1d0260
Show status icons for mount points in external storage UI
2012-12-24 13:45:52 -05:00
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
05fda76776
[tx-robot] updated from transifex
2012-12-22 00:26:25 +01:00
3e39c39d6a
[tx-robot] updated from transifex
2012-12-21 00:11:31 +01:00
7c5150ce32
Merge pull request #913 from owncloud/fix_settings
...
cleaning up the settings
2012-12-18 15:27:52 -08:00
982e46cd29
[tx-robot] updated from transifex
2012-12-19 00:04:14 +01:00
b0532c6343
Merge pull request #905 from owncloud/fix_mountpointescaping
...
proper escape the mountpoints.
2012-12-18 04:01:07 -08:00
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
c4ecbad009
check if admin
2012-12-17 14:46:57 +01:00
0c87f666ad
[tx-robot] updated from transifex
2012-12-16 00:12:10 +01:00
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
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
8256650da8
Fix "No space found after comma in function call"
2012-12-15 00:43:46 +01:00
262fecbe39
proper escape the mountpoints. Fixes
...
https://github.com/owncloud/core/issues/557
2012-12-14 23:31:50 +01:00
6d7ae463df
[tx-robot] updated from transifex
2012-12-14 00:17:42 +01:00
8686a448c7
[tx-robot] updated from transifex
2012-12-13 00:18:20 +01:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
e427197dce
ctor of OC_L10N requires the app name
2012-12-11 14:07:01 +01:00
e55a3637ce
don't call shell_exec if safe_mode is on.
2012-12-11 13:20:20 +01:00
ca7882a7c6
disable not available external filesystems. Restructure the configuration a bit and improve naming
2012-12-10 21:44:43 +01:00
f3bd6d14ee
add some output why some of the external filesystems might not work
2012-12-10 21:10:28 +01:00
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +01:00
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
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
92df70b6e5
fix checkstyle for files_external app, add whitespace for readability
2012-11-30 16:27:11 +01:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
16a630024c
[tx-robot] updated from transifex
2012-11-30 00:05:16 +01:00
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
54240140b1
fix incorectly merged smb.php
2012-11-16 12:14:29 +01:00
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
6e6df6e410
Fixed new checkstyle issues in ftp.php from build #1341 .
2012-11-10 00:46:50 +01:00
3cc6df489f
Fixed new checkstyle issues in swift.php from build #1341 .
2012-11-10 00:45:49 +01:00
051635412d
Fixed new checkstyle issues from build #1341 .
2012-11-10 00:40:32 +01:00
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
8b3ae4309b
Fix mkdir and opendir warnings when path does not exist
2012-11-05 21:37:59 +01:00
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
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
1205749f8c
Checkstyle: Fix the last two SpaceBeforeOpenBrace
2012-11-04 18:18:03 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
2f0fd84477
[tx-robot] updated from transifex
2012-11-03 00:02:24 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
515e1b467e
Merge pull request #81 from fmms/master
...
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
561cbb2de6
NoSpaceAfterComma II
2012-10-23 23:01:10 +02:00
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
03581ef463
Correct a first issue Checkstyle is complaining about ...
...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
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
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
cfa036eaa9
drop filectime from the filesystem api's
2012-10-20 23:58:07 +02:00
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +02:00
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
c099545b6d
don't throw errors if certificate folder doesn't exist
2012-10-12 14:52:22 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
141ff806c6
fix namespace problems for external storage backends
2012-10-11 23:17:59 +02:00
542869114a
implement getId for the external storage providers
2012-10-11 23:06:57 +02:00
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
92ddefe5a6
fix filetype for smb storage backend
2012-10-11 22:18:34 +02:00
5698c8519a
fix webdav storage backend when trying to open a non existing file for reading
2012-10-11 22:18:34 +02:00
5256301a53
skip the files_external test cases the correct way
2012-10-11 22:18:34 +02:00
8336b3287e
Various bug fixes for swift
2012-10-11 08:52:21 -05:00
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
293484d1ee
add directory while creating mount point
2012-10-09 15:18:21 +02:00
c815fd5a5c
fix files_external test cases
2012-10-08 14:31:13 +02:00
e7899e17de
merge phpunit into filesystem
2012-10-08 13:53:53 +02:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
a203a4a1c7
add support to mount a specific folder from dropbox
2012-10-06 13:44:53 +02:00
54695b11eb
test case for dropbox storage
2012-10-06 13:43:34 +02:00
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
4fd53eca06
[tx-robot] updated from transifex
2012-10-05 02:06:09 +02:00
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
6fada7a4c0
[tx-robot] updated from transifex
2012-10-03 02:05:14 +02:00
ac44506b40
Merge branch 'master' into filesystem
2012-10-02 23:29:13 +02:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
7abe1360b2
l18n support added to files_external/js
2012-10-02 23:09:28 +02:00
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
b7eb3f3dff
merge master into filesystem
2012-10-01 14:21:49 +02:00
aa9ffd119a
check if file really exist before add/remove it
2012-09-27 12:37:23 +02:00
a56f2ec183
only upload valid ssl root certificates
2012-09-27 11:21:29 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
21c6cc45e6
take '\' on windows systems into account to prevent file deletion above upload direectory
2012-09-26 23:08:40 +02:00
9ab887fed5
fix security issue, don't allow to go back in the path
2012-09-26 21:35:14 +02:00
88bca9bc49
Merge branch 'master' into filesystem
2012-09-26 17:52:28 +02:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
25499644e3
Merge branch 'master' of github.com:owncloud/core
2012-09-25 12:02:02 +02:00
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
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
96b798a59f
move storage backend test cases to their own namespace
2012-09-22 14:51:15 +02:00
93292516d9
Merge branch 'master' into filesystem
2012-09-22 14:28:14 +02:00
3d2cd64a48
add a line break after every certificate
2012-09-21 16:54:08 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
842cd57fa7
use more oc file operations instead of plain PHP functions
2012-09-18 17:04:22 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
89fb5d47a4
Add chosen script and style, bug fix for oc-1745
2012-09-16 13:27:27 -04:00
f8d907df71
Set configured to true after configuring Dropbox storage
2012-09-12 21:30:04 -04:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
bd720bdf4c
[tx-robot] updated from transifex
2012-09-10 02:04:59 +02:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
bd83422095
put filestorages in a namespace
2012-09-07 18:30:48 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
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
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
aa8cee1afa
I don't think this file was meant to be commited
2012-09-05 19:42:26 +02:00
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
745f279fbc
make use of OC_User::getHome in files_external app
2012-09-04 15:56:00 +02:00
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
c33a2ca01d
[tx-robot] updated from transifex
2012-08-27 02:02:37 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
68f5dc2a44
Remove unnecessary files
2012-08-20 21:22:23 -04:00
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
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
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
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
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
830676b475
Improve usability for configuring Dropbox and Google Drive external storage
2012-08-13 17:10:58 -04:00
d3bdab286b
Suggest mount point name, don't reload custom javascript file
2012-08-13 17:10:58 -04:00
98c7d40fcd
Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct
2012-08-13 17:10:58 -04:00
7f12a65c24
Show access granted label immediately after granting access
2012-08-13 17:10:58 -04:00
0e6d22e25f
Prevent editing Dropbox configuration input after access granted
2012-08-13 17:10:58 -04:00
b6b2f8826b
Show access granted label next to Google Drive and Dropbox storage in configuration
2012-08-13 17:10:58 -04:00
be32625fcc
Fix remove button display for external storage
2012-08-13 17:10:58 -04:00
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
2dfc485149
XSRF checks
2012-08-10 00:44:35 +02:00
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
48f33be848
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-27 12:32:03 -04:00
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
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +02:00
3c2967074f
remove unused variable from dropbox filestorage backend
2012-07-20 16:48:28 +02:00
1224d7ec01
minor fixes for the google filestorage backend
2012-07-20 16:47:26 +02:00
23c71b15a0
remove unused variables from webdav file backend
2012-07-20 16:35:51 +02:00
43f00a2dc8
create uploads directory for ssl certificates if it didn't exists
2012-07-09 18:11:29 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
77f07c672e
remove hard coded path
2012-07-09 12:49:04 +02:00
6bf1473f0e
replace urlencoded slash
2012-07-09 11:58:16 +02:00
32b476d6ec
remove comments around code block
2012-07-09 10:19:19 +02:00
7d41d3aba8
webdav ssl cleanup
2012-07-09 09:40:33 +02:00
ea70ca3ce3
CSRF checks
2012-07-07 16:12:21 +02:00
ca26bcc581
close file after write process
2012-07-06 17:09:20 +02:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
963faf6458
CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
2012-07-06 12:35:29 +02:00
8353517969
use OC_Connector_Sabre_Client
2012-07-06 12:24:03 +02:00
378fa2bc86
check if caview really exists
2012-07-05 12:17:33 +02:00
aa3b575ceb
disabled user upload of root certificates until sabredav client can handle them
2012-07-05 11:31:30 +02:00
f86ecb3bf7
send ca cert path to sabredav client
2012-07-05 11:28:32 +02:00
e258da5c3c
certificate should be only visible for users
2012-07-04 17:22:04 +02:00
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
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
edc6a648d1
Fix placeholder value for optional fields in external storage UI
2012-06-29 19:35:57 -04:00
719c7f7f6e
Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
2012-06-29 13:01:00 -04:00
7e9455c382
Allow multiple Google Drive and Dropbox external storages to be configured
2012-06-29 11:22:54 -04:00
2d49a491fb
Clear the mount point value for the new mount point row
2012-06-29 11:10:51 -04:00
f311c2a2ff
Hide the delete button on new mount point row
2012-06-29 11:10:51 -04:00
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
31bba86e87
Fix external storage UI for Admin page
2012-06-28 17:55:22 -04:00
db6139fd41
Don't overwrite fake directory stream for Amazon S3 storage
2012-06-27 19:44:52 -04:00
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
b7f86cf282
Add Samba Share parameter to external storage UI
2012-06-27 12:24:21 -04:00
19f94774fb
Don't overwrite fake directory stream for Dropbox and Google Drive
2012-06-27 12:04:33 -04:00
79da782892
Improve error handling of Dropbox storage backend
2012-06-26 20:37:50 -04:00
618a3c1d94
Fix removing personal mounts
2012-06-22 12:22:42 -04:00
b650f46698
Fix variable checks for mounting Google Drive
2012-06-22 12:22:42 -04:00
ad4f066bac
suppress error when using is_dir on non directory in smb backend
2012-06-17 03:09:49 +02:00
ed66c63c29
improve caching smb results a bit
2012-06-17 02:59:38 +02:00
769cbe9a4c
improve filecache support for smb
2012-06-17 02:54:23 +02:00
92083aa20c
Fix upload for Google Drive; Google Documents List API documentation was misleading
2012-06-14 20:57:08 -04:00
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
bd01e93469
Add support for mounting Google Drive in external storage UI
2012-06-13 13:54:50 -04:00
5f80be7664
Add support for mounting Dropbox in external storage UI
2012-06-12 11:36:43 -04:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
27d1c1bb94
Sanitize user input
2012-06-11 00:14:28 +02:00
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
ab41b57f62
Add Dropbox storage backend
2012-06-09 15:02:48 -04:00
ac36512102
Don't use substr to get first char of string
2012-06-08 21:38:10 +02:00
8fcdccdcdc
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
2012-06-08 13:48:38 -04:00
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
4768510923
split share and root config for smb backend, also sanitize config a bit more
2012-06-08 01:29:55 +02:00
d334f33eba
Initial support for Amazon S3 storage backend
...
Conflicts:
apps/files_external/tests/config.php
2012-05-29 12:19:29 -04:00
a1539dace7
share code between smb and ftp filestorage backends
2012-05-24 19:41:32 +02:00
2f40f11c87
smb filestorage backend
2012-05-24 18:23:59 +02:00
bee724c53e
Initial work on UI for mounting external storage
2012-05-24 11:06:03 -04:00
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
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
0b51c53443
run none of the extranal storage tests on default
2012-05-02 23:44:00 +02:00
6d37b8567b
Refactoring and upload support for Google Drive backend
2012-05-02 14:41:57 -04:00
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
6066ea3170
only run tests for files_external when asked for explicitly
2012-04-13 18:49:50 +02:00
011132feb3
renaming remote storage support to External storage support to clear up naming conflict
2012-03-30 18:18:37 +02:00
Thomas Mueller
Markus Goetz
Lukas Reschke
Arthur Schiwon
sherbrecher
Robin Appelman
Bernhard Posselt
j-ed
Michael Gapczynski
Björn Schießle
Bart Visscher
Jörn Friedrich Dreyer
Frank Karlitschek
hkjolhede
Diederik de Haas
Felix Moeller
Benjamin Liles
Georg Ehrke
Michael Gapczynski
Jan-Christoph Borchardt