wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16502 commits 157 branches 562 tags 714 MiB
Commit graph

661 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
bd86642747 Merge pull request #7261 from owncloud/issue/6793 
Allow admins to disable certain external storages for users
 2014-03-05 14:41:36 +01:00
Thomas Müller
f42b6f1a4e Merge pull request #7525 from owncloud/fix_S3string 
fix https://github.com/owncloud/core/issues/6825
 2014-03-04 14:30:30 +01:00
Frank Karlitschek
0bca969e99 fix https://github.com/owncloud/core/issues/6825 2014-03-04 12:38:56 +01:00
Joas Schilling
932c4ee927 Allow admins to disable certain external storages for users 
Fix issue #6793
 2014-02-26 15:02:41 +01:00
Vincent Petry
7f7d674c2a Merge pull request #7335 from owncloud/fix-7333 
Fix code to search for mount.json in custom data folders
 2014-02-25 15:27:47 +01:00
Vincent Petry
539ea0882b Fixed mount config path 2014-02-24 10:35:24 +01:00
Robin Appelman
f1475671ab Merge branch 'master' into extstorage-configclass 2014-02-21 15:51:41 +01:00
Lukas Reschke
6cb64a4fce Fix code to search for mount.json in custom data folders 2014-02-20 18:34:27 +01:00
icewind1991
d1b1ad0813 Merge pull request #7290 from owncloud/issue/5463 
Correctly redirect to settings page when not selecting cert file for upload
 2014-02-20 16:24:31 +01:00
Lukas Reschke
c869e0116b Merge pull request #6999 from kofemann/mount-config 
mount: make location of mount.json configurable
 2014-02-20 15:15:00 +01:00
Vincent Petry
b060a17b59 Added extra checks for ext storage class 2014-02-20 10:40:10 +01:00
Vincent Petry
49f2014e0c Revert "Added extra checks for ext storage class" 
This reverts commit 9e9a5b9ea1.

Unit tests weren't ready, need further tweaking.
 2014-02-20 10:01:49 +01:00
Lukas Reschke
38d6c56249 Merge pull request #7294 from owncloud/extstorage-configclass 
Added extra checks for ext storage class
 2014-02-20 09:53:52 +01:00
Vincent Petry
9e9a5b9ea1 Added extra checks for ext storage class 2014-02-19 19:08:28 +01:00
Vincent Petry
b2b35cd335 Fixed ext storage webdav path encoding 
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
  support/return it
- Fixed touch() to return false if the server doesn't implement
  PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
  lighttpd's WebDAV
 2014-02-19 18:34:08 +01:00
Joas Schilling
513940f4a4 Correctly redirect to settings page when not selecting cert file for upload 
Fix #5463
 2014-02-19 17:07:29 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +01:00
Thomas Müller
9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
Robin Appelman
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Joas Schilling
658af627ce External FTP Storage should request hostname instead of URL 
Fix issue #6277
 2014-02-12 18:20:10 +01:00
Joas Schilling
b330d07b51 Fix more documentation failes 
Issue #7111
 2014-02-08 11:47:55 +01:00
Joas Schilling
828985dc60 Make google drive client secret and dropbox api secret a password field 
Fix issue #5794
 2014-02-07 18:12:01 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Tigran Mkrtchyan
8cc9727520 mount: make location of mount.json configurable 
do not share users data with config files

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2014-01-29 17:14:23 +01:00
Jan-Christoph Borchardt
46745895ae Merge pull request #5153 from owncloud/core-em-to-px 
Cleans up Core apps for relative(em) to absolute(px) styles.
 2014-01-27 02:29:47 -08:00
Vincent Petry
bf95532fb6 Removed unused writeBack method 2014-01-23 15:05:05 +01:00
Vincent Petry
421f24868a Now using SFTP stream wrapper from phpseclib 
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
 2014-01-23 12:43:12 +01:00
Tigran Mkrtchyan
a78dc11732 webdav: return SPACE_UNKNOWN if server do not support quota 
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
 2014-01-17 11:45:26 +01:00
raghunayyar
775e08e0ee Merge branch 'master' into core-em-to-px 
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
 2014-01-16 14:42:37 +05:30
Vincent Petry
bd643c47f3 Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix 
Fixed Dropbox/Google storage async save call
 2014-01-15 07:41:01 -08:00
Vincent Petry
ab21c25e38 Merge pull request #6759 from owncloud/extstorage-smbtimezonefix 
Fixed timezone issue with SMB storage
 2014-01-14 06:03:24 -08:00
Vincent Petry
1eb5ebd58c Fixed timezone issue with SMB storage 
Now forcing smbclient to also run on UTC
 2014-01-14 00:37:57 +01:00
Thomas Müller
92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Vincent Petry
5e04b7f284 Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files 
Fixing Issue #6301 on master branch
 2014-01-13 07:09:01 -08:00
Thomas Müller
a8d20e0919 Merge pull request #5238 from owncloud/externalstorage-owncloudbackend 
Added ownCloud backend for external storage
 2014-01-08 01:49:15 -08:00
Thomas Müller
e2d739fa21 Merge pull request #6580 from monreal/master 
Silence output of 'which' command used in smbclient detection
 2014-01-05 04:32:30 -08:00
Jenkins for ownCloud
e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud
095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Michael Monreal
f52a9e5e42 Silence output of 'which' command used in smbclient detection 2013-12-27 18:10:47 +01:00
Frank Karlitschek
0b9f4130b0 clarifying license 2013-12-17 17:32:01 +01:00
Carlos Cerrillo
c06844c374 Fix ``createCertificateBundle` and `getCertificates`` methods 
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
 2013-12-17 10:13:14 +01:00
Carlos Cerrillo
b245e2e3d8 Fixing tab/space coding style 
Only set SSL things when ```$this->secure``` is ```true```
 2013-12-17 09:38:43 +01:00
Carlos Cerrillo
7c264c88fe Fixing Issue #6301 on master branch 
Added private var $certPath to store the user root cert

Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome()

Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
 2013-12-15 17:22:52 +01:00
Vsevolod Kukol
a8f814fe2d fix smbclient directory listing parser 2013-12-11 17:21:34 +01:00
Vincent Petry
e13be94e56 Fixed Dropbox/Google storage async save call 
When clicking "Grant access", the settings for Dropbox/Google were saved
through a call that gets cancelled when redirecting to the grant page
(for example in Firefox)

This fix makes sure the "save settings" call finished before redirecting
to the grant page.

Fixes #6176
 2013-12-06 17:25:09 +01:00
Vincent Petry
3b7905364f Fixed test function for S3 
Fixes #5752
 2013-12-03 12:26:08 +01:00
Vincent Petry
76b1fcbf27 Fixed Amazon S3 ext storage config UI 
Optional parameters are now really optional

Fixes #5861
 2013-12-03 12:26:08 +01:00
Vincent Petry
d6121464a0 Fixed placeholder after page reload 
The placeholder somehow had too many characters stripping from it...
 2013-12-03 12:26:08 +01:00
Vincent Petry
d69243ee51 Fixed FTP and SMB to use rmdir() when deleting folders 
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
 2013-11-29 13:01:01 +01:00