Thomas Müller
9637ca3ae8
Merge pull request #5070 from owncloud/smb-streamwrapper-fixes
...
Various fixes for the streamwrapper based SMB backend
2013-10-09 03:05:51 -07:00
Lennart Rosam
5470700c9a
Update file to meet coding standarts
2013-10-07 01:08:39 +02:00
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