Commit Graph

811 Commits

Author SHA1 Message Date
Lennart Rosam 72ad309920 Actually test the connection 2013-10-07 01:08:38 +02:00
Lennart Rosam b9a948b597 Fixes #4129 2013-10-07 01:08:38 +02:00
raghunayyar cf84154ee0 Cleans up Core apps for relative(em) to absolute(px) styles. 2013-10-06 23:38:24 +05:30
Jan-Christoph Borchardt 2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Robin Appelman 51c34777c4 extend test case 2013-10-02 22:28:19 +02:00
Robin Appelman de43515cfa fix recursive delete for smb 2013-10-01 22:33:58 +02:00
Robin Appelman 29deef38b2 fix using touch to create a file for smb 2013-10-01 22:31:22 +02:00
Robin Appelman ea566868a8 return the correct result when doing an smb rename 2013-10-01 22:29:33 +02:00
Robin Appelman ea6115bfaa fix smb streamwrapper on non existing files 2013-10-01 22:18:03 +02:00
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Thomas Müller d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
Bart Visscher 4ab8dc9c08 Merge pull request #4788 from owncloud/fixin-irods-session-master
Fixing session handling in iRODS
2013-09-11 00:01:55 -07:00
Thomas Müller 3b835ea1b6 never hack late night 2013-09-11 01:11:57 +02:00
Thomas Müller ec255b52be fixing boolean handling 2013-09-11 00:49:45 +02:00
Thomas Müller d63ca25a94 proper test for use_logon_credentials 2013-09-10 12:35:14 +02:00
Thomas Müller 36e7a7c29b use \OC::$session instead of $_SESSION 2013-09-10 12:34:41 +02:00
Thomas Müller 21e5daa218 removing all ?> jutt in case 2013-09-10 11:25:40 +02:00
Thomas Müller c32c116957 removing ?> followed by whitespaces 2013-09-10 11:16:43 +02:00
Arthur Schiwon c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Arthur Schiwon ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
Bart Visscher ada15a2b8e Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
Clean 3rdparty mess master
2013-08-28 06:12:58 -07:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Thomas Müller 884c6b5a82 Merge pull request #4512 from owncloud/readdir-strict-equals
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
Jenkins for ownCloud e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Georg Ehrke cbeccb2fcd Merge branch 'master' into readdir-strict-equals 2013-08-19 17:30:56 +02:00
Thomas Müller 95e1b62940 Merge pull request #4510 from owncloud/f_e_webdav_urlencoding
Fix files_external webdav up and download when path contains ' '
2013-08-19 05:13:20 -07:00
icewind1991 d7dde3cfbc Merge pull request #4467 from owncloud/storage-wrapper-quota
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
Robin Appelman c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 2013-08-19 12:04:53 +02:00
Jörn Friedrich Dreyer 89c928c3be replace ' ' with '%20' in urls for curl 2013-08-19 11:09:55 +02:00
Thomas Müller 6c518797ef fixing require path 2013-08-18 19:14:14 +02:00
Kondou c7af26ec84 Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Robin Appelman d8c71ba734 merge master in storage-wrapper-quota 2013-08-18 11:34:56 +02:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Thomas Müller 7575186fa6 moving Dropbox and smb4php 3rdparty code over to the apps 2013-08-17 18:20:20 +02:00
Bart Visscher 29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Thomas Müller 05549884c6 no files external for SMB on windows 2013-08-15 12:00:02 +02:00
Morris Jobke de89c31f5a Merge pull request #4302 from synchrone/master
Fixing owncloud/core#4301
2013-08-14 17:11:30 -07:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Alexander Bogdanov 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
Jörn Friedrich Dreyer 77dad7070d Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
added @var tags
2013-08-01 07:40:01 -07:00
Jörn Friedrich Dreyer 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
Christian Berendt 5a4c39207e write all catched exception messages to the log 2013-08-01 10:08:41 +02:00
Christian Berendt 3e53e25cd1 added @var tags 2013-08-01 10:05:01 +02:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Robin Appelman 88cc2ccb3b use renamed constants 2013-07-25 16:14:46 +02:00
Robin Appelman 79832e9382 use output buffering when including the irods libraries 2013-07-24 16:10:14 +02:00
Bart Visscher 7ad38535e5 Merge pull request #3392 from owncloud/googledrive
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
Michael Gapczynski 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
Thomas Müller 7b28f5a82c Merge branch 'master' into ext-fs-irods-master 2013-07-22 11:40:28 +02:00
Thomas Müller 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
Björn Schießle 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
Jan-Christoph Borchardt 100eb2b611 replace external storage status images with CSS, also use form to distinguish, fix #3910 2013-07-18 23:00:04 +02:00
Jenkins for ownCloud 210006c4a6 [tx-robot] updated from transifex 2013-07-17 02:28:02 -04:00
Thomas Müller 5cba09e931 fixing / adding comments 2013-07-16 11:35:48 +02:00
Michael Gapczynski 00e2b46017 Fix 'most' Google Drive tests 2013-07-13 11:02:07 -04:00
Thomas Müller ca16c08ba1 update copy right 2013-07-12 15:28:01 +02:00
Thomas Müller 01378e1907 incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/irodsphp 2013-07-12 15:08:13 +02:00
Thomas Müller 481bb831bb Merge branch 'master' into ext-fs-irods-master 2013-07-12 09:54:39 +02:00
Thomas Müller 24b4806af4 Merge branch 'master' into googledrive 2013-07-12 09:43:04 +02:00
Jenkins for ownCloud 3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +02:00
Jenkins for ownCloud f74659f3f6 [tx-robot] updated from transifex 2013-07-11 02:26:22 +02:00
Christian Berendt c772a6479d stripping services from AWS SDK 2013-07-10 16:38:34 +02:00
Christian Berendt 9965eb0295 fixing style issues 2013-07-10 16:12:48 +02:00
Christian Berendt 4fdf279395 use === instead of == 2013-07-10 16:09:22 +02:00
Christian Berendt a8b2aa34a4 remove uneeded calls to touch 2013-07-10 16:07:41 +02:00
Christian Berendt 203df66c00 rewrote initialisation, added testing workaround 2013-07-10 07:47:15 +02:00
Jenkins for ownCloud 7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
Christian Berendt 020803aa7e minimize waiting time 2013-07-08 16:06:08 +02:00
Christian Berendt deda583fad wait methods are probably not working, just wait 2013-07-08 15:56:56 +02:00
Christian Berendt 83a1fce1a3 make tests workable with Amazon S3 2013-07-08 15:25:49 +02:00
Christian Berendt 882d5ad728 added exception messages 2013-07-08 15:10:10 +02:00
Christian Berendt fdeb21ba5b wait until bucket exists after the creation 2013-07-08 15:00:07 +02:00
Christian Berendt 911e947fd7 check if used bucket name is valid 2013-07-08 14:59:09 +02:00
Christian Berendt dc8ca00f1e fixed syntax error 2013-07-08 13:26:41 +02:00
Christian Berendt d59291a8e7 remove needless check 2013-07-08 11:16:58 +02:00
Christian Berendt 0bc28dcb95 replaced substr with trim 2013-07-08 11:14:47 +02:00
Christian Berendt adf0fe880c removed aws.phar and added extracted zip instead 2013-07-08 11:11:07 +02:00
Jenkins for ownCloud 3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jenkins for ownCloud 51cfacd789 [tx-robot] updated from transifex 2013-07-04 09:33:58 +02:00
Christian Berendt b3d6517c62 use us-west-1 as default region for Amazon S3 2013-07-03 18:56:51 +02:00
Christian Berendt 839ab7f2e6 fixing rmdir in \OC\Files\Storage\AmazonS3 2013-07-03 18:33:15 +02:00
Christian Berendt 5a5a0e82f5 added commented new parameters 2013-07-03 18:06:27 +02:00
Christian Berendt 71ef30ea30 reworking testclass for \OC\Files\Storage\AmazonS3 2013-07-03 18:03:23 +02:00
Christian Berendt 8e5474394e reworking and extending \OC\Files\Storage\AmazonS3 2013-07-03 18:01:14 +02:00
Christian Berendt 32597c380a adding several new parameters 2013-07-03 17:58:44 +02:00
Christian Berendt 6653c2e9cb adding AWS SDK for PHP 2.4.0 2013-07-03 17:54:17 +02:00
Jenkins for ownCloud cec8384b1a [tx-robot] updated from transifex 2013-07-02 15:35:55 +02:00
Thomas Mueller e7d50617d7 Merge branch 'master' into ext-fs-irods-master 2013-06-28 09:22:48 +02:00
Jenkins for ownCloud 01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Thomas Mueller 0f32c5ec34 Merge branch 'master' into ext-fs-irods-master 2013-06-19 22:14:58 +02:00
Jenkins for ownCloud 6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Björn Schießle 519508736d disable proxys during ssl root cert upload to avoid encryption 2013-06-12 10:37:09 +02:00
Björn Schießle 506c9de5cd backport of 1fa76e53dc 2013-06-12 10:30:54 +02:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Thomas Mueller 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
Thomas Mueller 2772b1dd95 update to latest master 2013-06-06 23:28:08 +02:00
Thomas Mueller 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
Jenkins for ownCloud 666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Michael Gapczynski 8793acfb4e substr storage id to prevent problems with storing the change id in appconfig 2013-06-04 18:07:14 -04:00
Frank Karlitschek 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
Thomas Mueller 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
Michael Gapczynski 8be23efa73 Implement hasUpdated() to watch for changes on Google Drive side 2013-05-30 21:45:16 -04:00
Jenkins for ownCloud a730a72dcb [tx-robot] updated from transifex 2013-05-31 02:04:40 +02:00
Michael Gapczynski 16925672e8 Merge branch 'master' into googledrive 2013-05-27 11:35:57 -04:00
Jenkins for ownCloud b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Jenkins for ownCloud d590064fdf [tx-robot] updated from transifex 2013-05-22 02:19:52 +02:00
Jenkins for ownCloud 6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Michael Gapczynski c41305d467 Fix require_once for 3rdparty in google ajax frontend 2013-05-18 14:51:25 -04:00
Michael Gapczynski b4bf6a8d3a Include 3rdparty Google Drive SDK 0.6.2 2013-05-17 14:33:37 -04:00
Michael Gapczynski 4bb9c4a42e Fix constant in last commit 2013-05-17 14:03:25 -04:00
Michael Gapczynski 5368c8dafa Prepare for #2013 fix 2013-05-17 11:42:14 -04:00
Michael Gapczynski ee398ccbc2 Setting Redirect URI is not required here 2013-05-16 20:35:07 -04:00
Michael Gapczynski d8c660c6d5 Switch to using Google Drive SDK, closes #2047 2013-05-16 20:09:32 -04:00
Thomas Mueller 31d8258d6c Merge branch 'master' into ext-fs-irods-master 2013-05-15 23:56:42 +02:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Jenkins for ownCloud ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +02:00
Michael Gapczynski 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
Frank Karlitschek db49b0aff8 Merge pull request #3202 from owncloud/swift_id
Set storage id for openstack swift backend
2013-05-01 05:28:37 -07:00
Jenkins for ownCloud 6163a85668 [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
Robin Appelman 4c980b1a14 Set storage id for openstack swift backend 2013-05-01 00:24:34 +02:00
Jenkins for ownCloud 5764bf088e [tx-robot] updated from transifex 2013-04-30 01:59:18 +02:00
Jenkins for ownCloud 2b36ad292d [tx-robot] updated from transifex 2013-04-29 02:00:26 +02:00
Jenkins for ownCloud 901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +02:00
Jenkins for ownCloud 7b2c64236c [tx-robot] updated from transifex 2013-04-27 02:24:29 +02:00
Robin Appelman c05195a46d Dont task external storages with creating their own root 2013-04-26 17:40:31 +02:00
Thomas Mueller 331ad15d9b adding auth mode to ui and the url 2013-04-26 17:37:41 +02:00
Thomas Mueller 884635557a adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALS 2013-04-26 17:05:10 +02:00
Thomas Mueller 17ff5d486e Merge branch 'master' into ext-fs-irods-master 2013-04-26 13:29:48 +02:00
Jenkins for ownCloud 7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +02:00
Jenkins for ownCloud a0df5903b0 [tx-robot] updated from transifex 2013-04-25 01:55:56 +02:00
Jenkins for ownCloud 88fd3b088d [tx-robot] updated from transifex 2013-04-24 17:46:20 +02:00
Jenkins for ownCloud a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +02:00
Thomas Mueller c5d3f09262 test case for iRODS storage added 2013-04-23 23:19:11 +02:00
Markus Goetz 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
Jenkins for ownCloud 05ab9d2de7 [tx-robot] updated from transifex 2013-04-23 02:00:31 +02:00
Thomas Mueller cfbf81f978 checkbox in settings ui 2013-04-18 22:20:52 +02:00
Thomas Mueller 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
Thomas Mueller fbd3445d22 Merge branch 'master' into ext-fs-irods-master 2013-04-18 09:27:43 +02:00
Jenkins for ownCloud cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Jenkins for ownCloud 37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
Jenkins for ownCloud 19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Thomas Mueller 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
Jenkins for ownCloud c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Jenkins for ownCloud 5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Jenkins for ownCloud ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
Lukas Reschke 6552996734 Set file perms to 0640 of mount.json - fixes #2718 2013-04-06 13:21:21 +03:00
Jenkins for ownCloud c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Jenkins for ownCloud 10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Jenkins for ownCloud cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
Jenkins for ownCloud 5e74ec26a8 [tx-robot] updated from transifex 2013-03-30 00:06:29 +01:00
Arthur Schiwon 599778b153 Files External: show display names instead of internal user names in Settings UI 2013-03-27 19:07:33 +01:00
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Jenkins for ownCloud 63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Jenkins for ownCloud 1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
sherbrecher ec45a8433d Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/files_external/templates/settings.php
2013-03-15 17:50:02 +01:00
sherbrecher 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
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Robin Appelman be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Jenkins for ownCloud 97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Bernhard Posselt 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
Jenkins for ownCloud 844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Lukas Reschke d3e88e6a8c Remove uneeded sanitizeHTML 2013-03-02 12:44:53 +01:00
j-ed 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
Jenkins for ownCloud c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke 5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Jenkins for ownCloud d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Jenkins for ownCloud a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke 236507a19f [files_external] From echo to p 2013-02-27 21:31:27 +01:00
Michael Gapczynski 766a301a6b Merge pull request #1031 from owncloud/external_storage_ui_feedback
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Michael Gapczynski f26c477433 Merge pull request #1949 from owncloud/fix-dropbox
Fix undefined root parameter in Dropbox storage
2013-02-26 16:14:45 -08:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Michael Gapczynski 25cf18f614 Fix undefined root parameter in Dropbox storage 2013-02-26 17:52:06 -05:00
Björn Schießle 8c9d0d1f5b cleanPath needs to be public 2013-02-26 12:24:52 +01:00
Michael Gapczynski 5b50bc8c0a Fix Dropbox and Google ui 2013-02-25 19:45:01 -05:00
Michael Gapczynski 4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Robin Appelman 4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Jenkins for ownCloud 734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Jörn Friedrich Dreyer 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
Michael Gapczynski 702c27b0e6 Merge branch 'master' into external_storage_ui_feedback
Conflicts:
	apps/files_external/js/settings.js
	apps/files_external/lib/smb.php
	apps/files_external/templates/settings.php
	lib/files/storage/common.php
2013-02-19 19:12:14 -05:00
Frank Karlitschek 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
Thomas Müller c56542c58d Merge pull request #1771 from owncloud/mountconfig
JSON mount config: no pretty print
2013-02-18 22:15:56 -08:00
Thomas Mueller 0e9b9f4f5f no pretty print 2013-02-19 00:48:38 +01:00
Jenkins for ownCloud 76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Thomas Müller d9035d4fdc Merge pull request #1728 from owncloud/mountconfig
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
Thomas Müller 0ab87204ec Merge pull request #1759 from owncloud/redirect_fix_1737
fix redirect, use the new routing
2013-02-18 07:13:19 -08:00
Robin Appelman 3bf9aa408e Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig 2013-02-18 15:13:25 +01:00
Robin Appelman 2bbb57e429 merge master into mountconfig 2013-02-18 15:12:15 +01:00
Björn Schießle 4a3374ecf8 fix redirect, use the new routing 2013-02-18 14:38:29 +01:00
Lukas Reschke 79284b8e57 Sanitize HTML 2013-02-18 08:11:59 +01:00
Thomas Müller 8e76a98d2f Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
2013-02-17 11:53:51 -08:00
Thomas Mueller 325746ae45 Merge branch 'master' into fix-googledrive 2013-02-17 09:41:37 +01:00
Lukas Reschke 4708d4549d Add missing requesttoken
This is a trivial fix for a regression caused by #1648
2013-02-16 13:28:49 +01:00
Jörn Friedrich Dreyer cad65915a7 look where you are typing ... 2013-02-16 12:55:36 +01:00
Jörn Friedrich Dreyer e1700c28fa pretty print json 2013-02-16 12:10:54 +01:00
Robin Appelman 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