d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
7575186fa6
moving Dropbox and smb4php 3rdparty code over to the apps
2013-08-17 18:20:20 +02:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
05549884c6
no files external for SMB on windows
2013-08-15 12:00:02 +02:00
de89c31f5a
Merge pull request #4302 from synchrone/master
...
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
72ad843203
Fixing owncloud/core#4301
...
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
2013-08-02 23:18:29 +04:00
77dad7070d
Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
...
added @var tags
2013-08-01 07:40:01 -07:00
43c6d82825
Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging
...
write all catched exception messages to the log
2013-08-01 07:38:45 -07:00
5a4c39207e
write all catched exception messages to the log
2013-08-01 10:08:41 +02:00
3e53e25cd1
added @var tags
2013-08-01 10:05:01 +02:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02:00
79832e9382
use output buffering when including the irods libraries
2013-07-24 16:10:14 +02:00
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
...
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
c904504365
Remove root option from Google Drive storage, because it is only used for testing and we have our own empty Google account for testing
2013-07-23 10:50:14 -04:00
7b28f5a82c
Merge branch 'master' into ext-fs-irods-master
2013-07-22 11:40:28 +02:00
a2cdf8b91e
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
...
reworking of \OC\Files\Storage\AmazonS3
2013-07-22 02:19:27 -07:00
da892d69ab
if the file doesn't exists; create a new one. We use this to create new text files in the web interface
2013-07-22 09:15:19 +02:00
100eb2b611
replace external storage status images with CSS, also use form to distinguish, fix #3910
2013-07-18 23:00:04 +02:00
210006c4a6
[tx-robot] updated from transifex
2013-07-17 02:28:02 -04:00
5cba09e931
fixing / adding comments
2013-07-16 11:35:48 +02:00
00e2b46017
Fix 'most' Google Drive tests
2013-07-13 11:02:07 -04:00
ca16c08ba1
update copy right
2013-07-12 15:28:01 +02:00
01378e1907
incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp
2013-07-12 15:08:13 +02:00
481bb831bb
Merge branch 'master' into ext-fs-irods-master
2013-07-12 09:54:39 +02:00
24b4806af4
Merge branch 'master' into googledrive
2013-07-12 09:43:04 +02:00
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
c772a6479d
stripping services from AWS SDK
2013-07-10 16:38:34 +02:00
9965eb0295
fixing style issues
2013-07-10 16:12:48 +02:00
4fdf279395
use === instead of ==
2013-07-10 16:09:22 +02:00
a8b2aa34a4
remove uneeded calls to touch
2013-07-10 16:07:41 +02:00
203df66c00
rewrote initialisation, added testing workaround
2013-07-10 07:47:15 +02:00
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
020803aa7e
minimize waiting time
2013-07-08 16:06:08 +02:00
deda583fad
wait methods are probably not working, just wait
2013-07-08 15:56:56 +02:00
83a1fce1a3
make tests workable with Amazon S3
2013-07-08 15:25:49 +02:00
882d5ad728
added exception messages
2013-07-08 15:10:10 +02:00
fdeb21ba5b
wait until bucket exists after the creation
2013-07-08 15:00:07 +02:00
911e947fd7
check if used bucket name is valid
2013-07-08 14:59:09 +02:00
dc8ca00f1e
fixed syntax error
2013-07-08 13:26:41 +02:00
d59291a8e7
remove needless check
2013-07-08 11:16:58 +02:00
0bc28dcb95
replaced substr with trim
2013-07-08 11:14:47 +02:00
adf0fe880c
removed aws.phar and added extracted zip instead
2013-07-08 11:11:07 +02:00
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
51cfacd789
[tx-robot] updated from transifex
2013-07-04 09:33:58 +02:00
b3d6517c62
use us-west-1 as default region for Amazon S3
2013-07-03 18:56:51 +02:00
839ab7f2e6
fixing rmdir in \OC\Files\Storage\AmazonS3
2013-07-03 18:33:15 +02:00
5a5a0e82f5
added commented new parameters
2013-07-03 18:06:27 +02:00
71ef30ea30
reworking testclass for \OC\Files\Storage\AmazonS3
2013-07-03 18:03:23 +02:00
8e5474394e
reworking and extending \OC\Files\Storage\AmazonS3
2013-07-03 18:01:14 +02:00
32597c380a
adding several new parameters
2013-07-03 17:58:44 +02:00
6653c2e9cb
adding AWS SDK for PHP 2.4.0
2013-07-03 17:54:17 +02:00
cec8384b1a
[tx-robot] updated from transifex
2013-07-02 15:35:55 +02:00
e7d50617d7
Merge branch 'master' into ext-fs-irods-master
2013-06-28 09:22:48 +02:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
0f32c5ec34
Merge branch 'master' into ext-fs-irods-master
2013-06-19 22:14:58 +02:00
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +02:00
519508736d
disable proxys during ssl root cert upload to avoid encryption
2013-06-12 10:37:09 +02:00
506c9de5cd
backport of 1fa76e53dc
2013-06-12 10:30:54 +02:00
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
058c15a9f4
Read configuratons for external filesystem test from a private place.
...
This will help not to accidentially push private data and enable testing on our ci server.
2013-06-07 00:04:46 +02:00
2772b1dd95
update to latest master
2013-06-06 23:28:08 +02:00
3170e3511b
- implement touch() to at least create a file which doesn't exist
...
- implement a work around for folder mtimes - irods doesn't provide updated mtimes
2013-06-06 23:23:53 +02:00
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
8793acfb4e
substr storage id to prevent problems with storing the change id in appconfig
2013-06-04 18:07:14 -04:00
9392d2d58e
Merge pull request #3567 from owncloud/fixing-3466
...
In cases where smb4php returns false of an empty array stat/( has to ret...
2013-06-02 14:04:55 -07:00
1d7d5d2894
In cases where smb4php returns false of an empty array stat/( has to return false.
...
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.
Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33
2013-06-01 00:06:23 +02:00
8be23efa73
Implement hasUpdated() to watch for changes on Google Drive side
2013-05-30 21:45:16 -04:00
a730a72dcb
[tx-robot] updated from transifex
2013-05-31 02:04:40 +02:00
16925672e8
Merge branch 'master' into googledrive
2013-05-27 11:35:57 -04:00
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
d590064fdf
[tx-robot] updated from transifex
2013-05-22 02:19:52 +02:00
6609de28d8
[tx-robot] updated from transifex
2013-05-20 02:10:11 +02:00
c41305d467
Fix require_once for 3rdparty in google ajax frontend
2013-05-18 14:51:25 -04:00
b4bf6a8d3a
Include 3rdparty Google Drive SDK 0.6.2
2013-05-17 14:33:37 -04:00
4bb9c4a42e
Fix constant in last commit
2013-05-17 14:03:25 -04:00
5368c8dafa
Prepare for #2013 fix
2013-05-17 11:42:14 -04:00
ee398ccbc2
Setting Redirect URI is not required here
2013-05-16 20:35:07 -04:00
d8c660c6d5
Switch to using Google Drive SDK, closes #2047
2013-05-16 20:09:32 -04:00
31d8258d6c
Merge branch 'master' into ext-fs-irods-master
2013-05-15 23:56:42 +02:00
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
ee53e7b3d2
[tx-robot] updated from transifex
2013-05-02 02:19:04 +02:00
657ff34c6c
Merge pull request #3147 from owncloud/storage-mkdir-root
...
Dont task external storages with creating their own root
2013-05-01 16:35:44 -07:00
db49b0aff8
Merge pull request #3202 from owncloud/swift_id
...
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
6163a85668
[tx-robot] updated from transifex
2013-05-01 02:02:59 +02:00
4c980b1a14
Set storage id for openstack swift backend
2013-05-01 00:24:34 +02:00
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
2b36ad292d
[tx-robot] updated from transifex
2013-04-29 02:00:26 +02:00
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
c05195a46d
Dont task external storages with creating their own root
2013-04-26 17:40:31 +02:00
331ad15d9b
adding auth mode to ui and the url
2013-04-26 17:37:41 +02:00
884635557a
adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS
2013-04-26 17:05:10 +02:00
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
Robin Appelman
kondou
Thomas Müller
Bart Visscher
Morris Jobke
Alexander Bogdanov
Jörn Friedrich Dreyer
Christian Berendt
Michael Gapczynski
Björn Schießle
Jan-Christoph Borchardt
Frank Karlitschek
Markus Goetz
Lukas Reschke
Arthur Schiwon
sherbrecher
Bernhard Posselt
j-ed
hkjolhede
Diederik de Haas
Felix Moeller