Robin Appelman
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
Jenkins for ownCloud
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
Lukas Reschke
515e1b467e
Merge pull request #81 from fmms/master
...
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
Robin Appelman
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
Jenkins for ownCloud
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
Felix Moeller
561cbb2de6
NoSpaceAfterComma II
2012-10-23 23:01:10 +02:00
Felix Moeller
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
Robin Appelman
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
Felix Moeller
03581ef463
Correct a first issue Checkstyle is complaining about ...
...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
Jenkins for ownCloud
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
Robin Appelman
33cabcf590
postpone the cost of setting up some of the external storage backends untill we actually need it
2012-10-21 22:04:45 +02:00
Robin Appelman
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
Jenkins for ownCloud
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
Robin Appelman
cfa036eaa9
drop filectime from the filesystem api's
2012-10-20 23:58:07 +02:00
Robin Appelman
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
Jenkins for ownCloud
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
Robin Appelman
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +02:00
Jenkins for ownCloud
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
Robin Appelman
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
Jenkins for ownCloud
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
Bart Visscher
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
Jenkins for ownCloud
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
Robin Appelman
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
Jenkins for ownCloud
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
Robin Appelman
c099545b6d
don't throw errors if certificate folder doesn't exist
2012-10-12 14:52:22 +02:00
Jenkins for ownCloud
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
Robin Appelman
141ff806c6
fix namespace problems for external storage backends
2012-10-11 23:17:59 +02:00
Robin Appelman
542869114a
implement getId for the external storage providers
2012-10-11 23:06:57 +02:00
Robin Appelman
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
Robin Appelman
92ddefe5a6
fix filetype for smb storage backend
2012-10-11 22:18:34 +02:00
Robin Appelman
5698c8519a
fix webdav storage backend when trying to open a non existing file for reading
2012-10-11 22:18:34 +02:00
Robin Appelman
5256301a53
skip the files_external test cases the correct way
2012-10-11 22:18:34 +02:00
Benjamin Liles
8336b3287e
Various bug fixes for swift
2012-10-11 08:52:21 -05:00
Jenkins for ownCloud
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
Robin Appelman
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
Robin Appelman
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
Jenkins for ownCloud
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
Björn Schießle
293484d1ee
add directory while creating mount point
2012-10-09 15:18:21 +02:00
Robin Appelman
c815fd5a5c
fix files_external test cases
2012-10-08 14:31:13 +02:00
Robin Appelman
e7899e17de
merge phpunit into filesystem
2012-10-08 13:53:53 +02:00
Jenkins for ownCloud
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
Robin Appelman
a203a4a1c7
add support to mount a specific folder from dropbox
2012-10-06 13:44:53 +02:00
Robin Appelman
54695b11eb
test case for dropbox storage
2012-10-06 13:43:34 +02:00
Jenkins for ownCloud
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
Jenkins for ownCloud
4fd53eca06
[tx-robot] updated from transifex
2012-10-05 02:06:09 +02:00
Jenkins for ownCloud
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
Jenkins for ownCloud
6fada7a4c0
[tx-robot] updated from transifex
2012-10-03 02:05:14 +02:00
Robin Appelman
ac44506b40
Merge branch 'master' into filesystem
2012-10-02 23:29:13 +02:00
Jenkins for ownCloud
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
Thomas Mueller
7abe1360b2
l18n support added to files_external/js
2012-10-02 23:09:28 +02:00
Frank Karlitschek
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Robin Appelman
b7eb3f3dff
merge master into filesystem
2012-10-01 14:21:49 +02:00
Björn Schießle
aa9ffd119a
check if file really exist before add/remove it
2012-09-27 12:37:23 +02:00
Björn Schießle
a56f2ec183
only upload valid ssl root certificates
2012-09-27 11:21:29 +02:00
Jenkins for ownCloud
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
Björn Schießle
21c6cc45e6
take '\' on windows systems into account to prevent file deletion above upload direectory
2012-09-26 23:08:40 +02:00
Björn Schießle
9ab887fed5
fix security issue, don't allow to go back in the path
2012-09-26 21:35:14 +02:00
Robin Appelman
88bca9bc49
Merge branch 'master' into filesystem
2012-09-26 17:52:28 +02:00
Jenkins for ownCloud
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
Björn Schießle
25499644e3
Merge branch 'master' of github.com:owncloud/core
2012-09-25 12:02:02 +02:00
Björn Schießle
90a1bd5721
seperate the form to set up the mount points and the form to upload ssl certificates
2012-09-25 12:01:09 +02:00
Jenkins for ownCloud
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
Jenkins for ownCloud
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
Robin Appelman
96b798a59f
move storage backend test cases to their own namespace
2012-09-22 14:51:15 +02:00
Robin Appelman
93292516d9
Merge branch 'master' into filesystem
2012-09-22 14:28:14 +02:00
Björn Schießle
3d2cd64a48
add a line break after every certificate
2012-09-21 16:54:08 +02:00
Jenkins for ownCloud
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
Jenkins for ownCloud
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
Björn Schießle
842cd57fa7
use more oc file operations instead of plain PHP functions
2012-09-18 17:04:22 +02:00
Jenkins for ownCloud
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
Michael Gapczynski
89fb5d47a4
Add chosen script and style, bug fix for oc-1745
2012-09-16 13:27:27 -04:00
Michael Gapczynski
f8d907df71
Set configured to true after configuring Dropbox storage
2012-09-12 21:30:04 -04:00
Jenkins for ownCloud
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
Jenkins for ownCloud
bd720bdf4c
[tx-robot] updated from transifex
2012-09-10 02:04:59 +02:00
Jenkins for ownCloud
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
Jenkins for ownCloud
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
Robin Appelman
bd83422095
put filestorages in a namespace
2012-09-07 18:30:48 +02:00
Thomas Mueller
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
Bart Visscher
285c198c36
EOL fixes
...
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
Jenkins for ownCloud
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
Jenkins for ownCloud
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
Thomas Mueller
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
Bart Visscher
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
Robin Appelman
aa8cee1afa
I don't think this file was meant to be commited
2012-09-05 19:42:26 +02:00
Jenkins for ownCloud
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
Georg Ehrke
745f279fbc
make use of OC_User::getHome in files_external app
2012-09-04 15:56:00 +02:00
Jenkins for ownCloud
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
Bart Visscher
db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
Bart Visscher
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
Bart Visscher
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
Jenkins for ownCloud
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
Jenkins for ownCloud
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
Jenkins for ownCloud
c33a2ca01d
[tx-robot] updated from transifex
2012-08-27 02:02:37 +02:00
Jenkins for ownCloud
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
Jenkins for ownCloud
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
Jenkins for ownCloud
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
Michael Gapczynski
68f5dc2a44
Remove unnecessary files
2012-08-20 21:22:23 -04:00
Jenkins for ownCloud
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
Michael Gapczynski
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
Jenkins for ownCloud
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
Jenkins for ownCloud
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
Jenkins for ownCloud
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
Jenkins for ownCloud
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
Michael Gapczynski
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
Jenkins for ownCloud
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
Michael Gapczynski
830676b475
Improve usability for configuring Dropbox and Google Drive external storage
2012-08-13 17:10:58 -04:00
Michael Gapczynski
d3bdab286b
Suggest mount point name, don't reload custom javascript file
2012-08-13 17:10:58 -04:00
Michael Gapczynski
98c7d40fcd
Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct
2012-08-13 17:10:58 -04:00
Michael Gapczynski
7f12a65c24
Show access granted label immediately after granting access
2012-08-13 17:10:58 -04:00
Michael Gapczynski
0e6d22e25f
Prevent editing Dropbox configuration input after access granted
2012-08-13 17:10:58 -04:00
Michael Gapczynski
b6b2f8826b
Show access granted label next to Google Drive and Dropbox storage in configuration
2012-08-13 17:10:58 -04:00
Michael Gapczynski
be32625fcc
Fix remove button display for external storage
2012-08-13 17:10:58 -04:00
Thomas Mueller
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
Lukas Reschke
2dfc485149
XSRF checks
2012-08-10 00:44:35 +02:00
Michael Gapczynski
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
Michael Gapczynski
48f33be848
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-27 12:32:03 -04:00
Michael Gapczynski
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
Robin Appelman
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +02:00
Robin Appelman
3c2967074f
remove unused variable from dropbox filestorage backend
2012-07-20 16:48:28 +02:00
Robin Appelman
1224d7ec01
minor fixes for the google filestorage backend
2012-07-20 16:47:26 +02:00
Robin Appelman
23c71b15a0
remove unused variables from webdav file backend
2012-07-20 16:35:51 +02:00
Bjoern Schiessle
43f00a2dc8
create uploads directory for ssl certificates if it didn't exists
2012-07-09 18:11:29 +02:00
Jörn Friedrich Dreyer
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
Bjoern Schiessle
77f07c672e
remove hard coded path
2012-07-09 12:49:04 +02:00
Bjoern Schiessle
6bf1473f0e
replace urlencoded slash
2012-07-09 11:58:16 +02:00
Bjoern Schiessle
32b476d6ec
remove comments around code block
2012-07-09 10:19:19 +02:00
Bjoern Schiessle
7d41d3aba8
webdav ssl cleanup
2012-07-09 09:40:33 +02:00
Lukas Reschke
ea70ca3ce3
CSRF checks
2012-07-07 16:12:21 +02:00
Bjoern Schiessle
ca26bcc581
close file after write process
2012-07-06 17:09:20 +02:00
Bjoern Schiessle
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
Bjoern Schiessle
963faf6458
CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
2012-07-06 12:35:29 +02:00
Bjoern Schiessle
8353517969
use OC_Connector_Sabre_Client
2012-07-06 12:24:03 +02:00
Bjoern Schiessle
378fa2bc86
check if caview really exists
2012-07-05 12:17:33 +02:00
Bjoern Schiessle
aa3b575ceb
disabled user upload of root certificates until sabredav client can handle them
2012-07-05 11:31:30 +02:00
Bjoern Schiessle
f86ecb3bf7
send ca cert path to sabredav client
2012-07-05 11:28:32 +02:00
Bjoern Schiessle
e258da5c3c
certificate should be only visible for users
2012-07-04 17:22:04 +02:00
Bjoern Schiessle
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
Bjoern Schiessle
ab036d4764
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
2012-07-02 17:52:51 +02:00
Michael Gapczynski
edc6a648d1
Fix placeholder value for optional fields in external storage UI
2012-06-29 19:35:57 -04:00
Michael Gapczynski
719c7f7f6e
Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
2012-06-29 13:01:00 -04:00
Michael Gapczynski
7e9455c382
Allow multiple Google Drive and Dropbox external storages to be configured
2012-06-29 11:22:54 -04:00
Michael Gapczynski
2d49a491fb
Clear the mount point value for the new mount point row
2012-06-29 11:10:51 -04:00
Michael Gapczynski
f311c2a2ff
Hide the delete button on new mount point row
2012-06-29 11:10:51 -04:00
Bjoern Schiessle
60ec46f706
- remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
...
- if secure is set to true add 's' to http
2012-06-29 12:01:23 +02:00
Michael Gapczynski
31bba86e87
Fix external storage UI for Admin page
2012-06-28 17:55:22 -04:00
Michael Gapczynski
db6139fd41
Don't overwrite fake directory stream for Amazon S3 storage
2012-06-27 19:44:52 -04:00
Michael Gapczynski
9b605969f1
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
2012-06-27 15:23:49 -04:00
Michael Gapczynski
b7f86cf282
Add Samba Share parameter to external storage UI
2012-06-27 12:24:21 -04:00
Michael Gapczynski
19f94774fb
Don't overwrite fake directory stream for Dropbox and Google Drive
2012-06-27 12:04:33 -04:00
Michael Gapczynski
79da782892
Improve error handling of Dropbox storage backend
2012-06-26 20:37:50 -04:00
Michael Gapczynski
618a3c1d94
Fix removing personal mounts
2012-06-22 12:22:42 -04:00
Michael Gapczynski
b650f46698
Fix variable checks for mounting Google Drive
2012-06-22 12:22:42 -04:00
Robin Appelman
ad4f066bac
suppress error when using is_dir on non directory in smb backend
2012-06-17 03:09:49 +02:00
Robin Appelman
ed66c63c29
improve caching smb results a bit
2012-06-17 02:59:38 +02:00
Robin Appelman
769cbe9a4c
improve filecache support for smb
2012-06-17 02:54:23 +02:00
Michael Gapczynski
92083aa20c
Fix upload for Google Drive; Google Documents List API documentation was misleading
2012-06-14 20:57:08 -04:00
Michael Gapczynski
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
Michael Gapczynski
bd01e93469
Add support for mounting Google Drive in external storage UI
2012-06-13 13:54:50 -04:00
Michael Gapczynski
5f80be7664
Add support for mounting Dropbox in external storage UI
2012-06-12 11:36:43 -04:00
Lukas Reschke
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
Lukas Reschke
27d1c1bb94
Sanitize user input
2012-06-11 00:14:28 +02:00
Michael Gapczynski
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
Michael Gapczynski
ab41b57f62
Add Dropbox storage backend
2012-06-09 15:02:48 -04:00
Bart Visscher
ac36512102
Don't use substr to get first char of string
2012-06-08 21:38:10 +02:00
Michael Gapczynski
8fcdccdcdc
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
2012-06-08 13:48:38 -04:00
Michael Gapczynski
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
Robin Appelman
4768510923
split share and root config for smb backend, also sanitize config a bit more
2012-06-08 01:29:55 +02:00
Michael Gapczynski
d334f33eba
Initial support for Amazon S3 storage backend
...
Conflicts:
apps/files_external/tests/config.php
2012-05-29 12:19:29 -04:00
Robin Appelman
a1539dace7
share code between smb and ftp filestorage backends
2012-05-24 19:41:32 +02:00
Robin Appelman
2f40f11c87
smb filestorage backend
2012-05-24 18:23:59 +02:00
Michael Gapczynski
bee724c53e
Initial work on UI for mounting external storage
2012-05-24 11:06:03 -04:00
Frank Karlitschek
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
Thomas Mueller
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
Robin Appelman
6779f28af4
cache app types during install or update
2012-05-14 22:49:31 +02:00
Robin Appelman
0b51c53443
run none of the extranal storage tests on default
2012-05-02 23:44:00 +02:00
Michael Gapczynski
6d37b8567b
Refactoring and upload support for Google Drive backend
2012-05-02 14:41:57 -04:00
Frank Karlitschek
8c7f854671
move all the files stuff into a files class
2012-05-02 12:54:31 +02:00
Frank Karlitschek
93b63cf375
ported the rest of the OC_Helper calls
2012-05-02 00:20:45 +02:00
Robin Appelman
5b70e2fb25
some performance improvements to the openstack swift backend
2012-04-25 00:12:12 +02:00
Robin Appelman
5cefd34660
emulate touch with custom mtime for swift backend
2012-04-19 00:25:47 +02:00
Robin Appelman
9a707e10bf
add SWIFT (openstack object storage) storage backend
2012-04-18 20:54:28 +02:00
Robin Appelman
926b2b78fe
keep version numbers in their own files for faster reading
2012-04-14 16:29:11 +02:00
Robin Appelman
6066ea3170
only run tests for files_external when asked for explicitly
2012-04-13 18:49:50 +02:00
Jan-Christoph Borchardt
011132feb3
renaming remote storage support to External storage support to clear up naming conflict
2012-03-30 18:18:37 +02:00