]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Thu, 3 Apr 2014 15:09:40 +0000 (17:09 +0200)]
use command -v to detect if smbclient exists
Thomas Müller [Thu, 3 Apr 2014 15:04:16 +0000 (17:04 +0200)]
Merge branch 'master' into fs-backend-registration
Conflicts:
apps/files_external/templates/settings.php
Thomas Müller [Thu, 3 Apr 2014 14:57:26 +0000 (16:57 +0200)]
Update backends and their configurations
Philipp Kapfer [Fri, 2 Aug 2013 13:44:56 +0000 (15:44 +0200)]
Moved dependency checks to end of class files
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends
Conflicts:
apps/files_external/lib/google.php
apps/files_external/lib/swift.php
apps/files_external/templates/settings.php
Philipp Kapfer [Sat, 1 Jun 2013 09:28:02 +0000 (11:28 +0200)]
Added cURL dependency for Amazon S3, Dropbox and SWIFT
Conflicts:
apps/files_external/lib/amazons3.php
apps/files_external/lib/swift.php
Vincent Petry [Thu, 3 Apr 2014 14:31:58 +0000 (16:31 +0200)]
Merge pull request #7969 from Xenopathic/files_external_fix
Fix error log spam
Philipp Kapfer [Thu, 30 May 2013 15:37:47 +0000 (17:37 +0200)]
Changed dependency check messages from warnings to notes
Added check for duplicate dependency check messages to display only the first
Philipp Kapfer [Sat, 25 May 2013 15:10:20 +0000 (17:10 +0200)]
Added cURL dependency check to Google Drive and WebDAV backend
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing
Conflicts:
apps/files_external/lib/config.php
apps/files_external/lib/google.php
Philipp Kapfer [Fri, 8 Mar 2013 17:15:20 +0000 (18:15 +0100)]
Modified app to dynamically register backends instead of hard-coding them
Moved dependency check to the individual backends instead of the config
Conflicts:
apps/files_external/appinfo/app.php
apps/files_external/lib/config.php
Thomas Müller [Thu, 3 Apr 2014 14:09:44 +0000 (16:09 +0200)]
Merge pull request #7970 from owncloud/webdav-upload-hash
Fix uploading files containing a # in the path for webdav
Robin McCorkell [Mon, 31 Mar 2014 14:16:33 +0000 (15:16 +0100)]
Jenkins for ownCloud [Thu, 3 Apr 2014 05:56:12 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
icewind1991 [Wed, 2 Apr 2014 16:40:34 +0000 (18:40 +0200)]
Merge pull request #8014 from owncloud/uploadsize-reuse
Reuse known free space in the files app
Vincent Petry [Wed, 2 Apr 2014 16:23:33 +0000 (18:23 +0200)]
Merge pull request #7978 from owncloud/enc_cleanup
there is no need to re-calculate the shares after a touch
Robin Appelman [Wed, 2 Apr 2014 14:53:45 +0000 (16:53 +0200)]
Reuse known free space in the files app
Morris Jobke [Wed, 2 Apr 2014 12:45:58 +0000 (14:45 +0200)]
Merge pull request #7995 from owncloud/fix-h3-styles
fix h3 style, move out from settings to apps CSS
Vincent Petry [Wed, 2 Apr 2014 12:10:09 +0000 (14:10 +0200)]
Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib
Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
Morris Jobke [Wed, 2 Apr 2014 11:21:53 +0000 (13:21 +0200)]
Merge pull request #8006 from wakeup/master
Fix admin-dir_permissions redirection when cannot write warning is shown.
Morris Jobke [Wed, 2 Apr 2014 11:20:51 +0000 (13:20 +0200)]
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
always encrypt files to owner
Vincent Petry [Wed, 2 Apr 2014 10:56:36 +0000 (12:56 +0200)]
Merge pull request #7968 from owncloud/core-overwritewebrootwithroot
Allow using "/" in "overwritewebroot"
Volkan Gezer [Wed, 2 Apr 2014 10:41:46 +0000 (12:41 +0200)]
Fix admin-dir_permissions redirection when cannot write warning
is shown.
Vincent Petry [Wed, 2 Apr 2014 10:31:59 +0000 (12:31 +0200)]
Upgraded phpseclib to version 0.3.6
Vincent Petry [Wed, 2 Apr 2014 08:55:50 +0000 (10:55 +0200)]
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
Correctly read the full stream in file_get_contents
Jan-Christoph Borchardt [Tue, 1 Apr 2014 16:50:47 +0000 (18:50 +0200)]
fix h3 style, move out from settings to apps CSS
Jenkins for ownCloud [Wed, 2 Apr 2014 05:56:39 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 1 Apr 2014 20:54:05 +0000 (22:54 +0200)]
Merge pull request #7989 from owncloud/files-deletefileregressionfix
Fixed broken delete file action
Thomas Müller [Tue, 1 Apr 2014 20:51:23 +0000 (22:51 +0200)]
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
idn_to_ascii is only used if available
Vincent Petry [Tue, 1 Apr 2014 19:59:09 +0000 (21:59 +0200)]
Merge pull request #7935 from owncloud/getpath-shared
Make getPath work for shared files
Morris Jobke [Tue, 1 Apr 2014 19:38:43 +0000 (21:38 +0200)]
Merge pull request #7817 from owncloud/app-navigation-for-apps
Makes #app-navigation a part of app management.
Bart Visscher [Tue, 1 Apr 2014 19:23:53 +0000 (21:23 +0200)]
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
Correct the remembering of the trashbin app state in encryption test
Bart Visscher [Wed, 18 Sep 2013 20:06:45 +0000 (22:06 +0200)]
Remember before change works better
Vincent Petry [Tue, 1 Apr 2014 14:51:30 +0000 (16:51 +0200)]
Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists
Fix dirInfo check when dir does not exist
Morris Jobke [Tue, 1 Apr 2014 14:44:31 +0000 (16:44 +0200)]
Merge pull request #7984 from owncloud/wording-applicable2
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
Vincent Petry [Tue, 1 Apr 2014 14:09:48 +0000 (16:09 +0200)]
Fixed broken delete file action
Vincent Petry [Tue, 1 Apr 2014 14:09:19 +0000 (16:09 +0200)]
Merge pull request #7696 from owncloud/chunk-remainingspacefix
Fixed chunking and insufficient storage check
Vincent Petry [Tue, 1 Apr 2014 13:15:03 +0000 (15:15 +0200)]
Fix dirInfo check when dir does not exist
Vincent Petry [Tue, 1 Apr 2014 12:56:37 +0000 (14:56 +0200)]
Merge pull request #7293 from owncloud/update-shares-postgres
fix update to remove shares where file doesn't exist on postgres
Jan-Christoph Borchardt [Tue, 1 Apr 2014 12:28:33 +0000 (14:28 +0200)]
external storage: set storages to be available for All Users by default
Jan-Christoph Borchardt [Tue, 1 Apr 2014 12:26:06 +0000 (14:26 +0200)]
external storage: change confusing 'applicable' to 'available for'
blizzz [Tue, 1 Apr 2014 12:17:05 +0000 (14:17 +0200)]
Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
Fixed user list offset call
Björn Schießle [Tue, 1 Apr 2014 11:56:46 +0000 (13:56 +0200)]
Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
move check if a file should be encrypted to the pre hook
Vincent Petry [Tue, 1 Apr 2014 10:57:16 +0000 (12:57 +0200)]
Merge pull request #7943 from hjort/master
Correction: failure on sharing when user ID was prefixed by zero
Vincent Petry [Tue, 1 Apr 2014 10:38:47 +0000 (12:38 +0200)]
Merge pull request #7975 from owncloud/fix-7973-master-2
remove pl_PL - fixes #7973
Vincent Petry [Tue, 1 Apr 2014 09:20:16 +0000 (11:20 +0200)]
Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
Morris Jobke [Tue, 1 Apr 2014 08:59:53 +0000 (10:59 +0200)]
Merge pull request #7966 from owncloud/url_generation_hack
Check if web root has already been appended
Morris Jobke [Tue, 1 Apr 2014 08:48:55 +0000 (10:48 +0200)]
apply proposed change
Vincent Petry [Mon, 31 Mar 2014 16:37:52 +0000 (18:37 +0200)]
Added missing fclose in file_get_contents and file_put_contents
Vincent Petry [Mon, 31 Mar 2014 16:36:52 +0000 (18:36 +0200)]
Correctly read the full stream in file_get_contents
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
Jenkins for ownCloud [Tue, 1 Apr 2014 05:56:15 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Björn Schießle [Mon, 31 Mar 2014 19:34:42 +0000 (21:34 +0200)]
Merge pull request #7967 from owncloud/sharing_fix_select_statement
select statement always need to contain file_source respectively item_source
Bjoern Schiessle [Mon, 31 Mar 2014 16:24:53 +0000 (18:24 +0200)]
there is no need to re-calculate the shares after a touch
Bjoern Schiessle [Mon, 31 Mar 2014 16:09:46 +0000 (18:09 +0200)]
always encrypt files to owner
Thomas Müller [Mon, 31 Mar 2014 16:03:42 +0000 (18:03 +0200)]
remove pl_PL - fixes #7973
Robin Appelman [Mon, 31 Mar 2014 15:00:32 +0000 (17:00 +0200)]
Fix uploading files containing a # in the path for webdav
Morris Jobke [Mon, 31 Mar 2014 13:56:19 +0000 (15:56 +0200)]
Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
Vincent Petry [Mon, 31 Mar 2014 13:30:44 +0000 (15:30 +0200)]
Allow using "/" in "overwritewebroot"
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
Bjoern Schiessle [Mon, 31 Mar 2014 10:43:38 +0000 (12:43 +0200)]
don't call getFileInfo() to avoid to open the same file twice
Bjoern Schiessle [Thu, 27 Mar 2014 12:49:48 +0000 (13:49 +0100)]
move check if a file should be encrypted to the pre hook
Bjoern Schiessle [Mon, 31 Mar 2014 13:02:02 +0000 (15:02 +0200)]
select statement always need to contain file_source respectively item_source
Robin Appelman [Mon, 31 Mar 2014 12:29:55 +0000 (14:29 +0200)]
Improve phpdoc
Thomas Tanghus [Mon, 31 Mar 2014 12:24:38 +0000 (14:24 +0200)]
Check if web root has already been appended
Morris Jobke [Mon, 31 Mar 2014 11:51:53 +0000 (13:51 +0200)]
merge CSS rules
Jan-Christoph Borchardt [Mon, 31 Mar 2014 11:12:04 +0000 (13:12 +0200)]
external storage: fix merge conflict, indentation
Jan-Christoph Borchardt [Mon, 31 Mar 2014 11:00:46 +0000 (13:00 +0200)]
replace last personalblock fieldset within files_external
Jan-Christoph Borchardt [Mon, 31 Mar 2014 10:27:26 +0000 (12:27 +0200)]
fix duplicate rules for button/input styles, em to px
Vincent Petry [Mon, 31 Mar 2014 08:50:05 +0000 (10:50 +0200)]
Merge pull request #7939 from owncloud/wring_redirect_on_login
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
Jenkins for ownCloud [Mon, 31 Mar 2014 05:55:43 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
raghunayyar [Sun, 30 Mar 2014 10:18:47 +0000 (15:48 +0530)]
Removes highlighting of selected items, padding from apps management.
Jenkins for ownCloud [Sun, 30 Mar 2014 05:55:42 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Tanghus [Sat, 29 Mar 2014 19:40:49 +0000 (20:40 +0100)]
Sub-dir was prepended twice
Thomas Tanghus [Sat, 29 Mar 2014 19:39:55 +0000 (20:39 +0100)]
Sub-dir was prepended twice
Jenkins for ownCloud [Sat, 29 Mar 2014 05:55:44 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 28 Mar 2014 20:54:50 +0000 (21:54 +0100)]
Merge pull request #7845 from duritong/fix_submodule_url
use https as submodule url
Morris Jobke [Fri, 28 Mar 2014 20:20:09 +0000 (21:20 +0100)]
Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
adding @method annotation to declare methods which can be called on the ...
Rodrigo Hjort [Fri, 28 Mar 2014 18:08:59 +0000 (15:08 -0300)]
Correction: failure on sharing when user ID was prefixed by zero
Vincent Petry [Fri, 28 Mar 2014 17:12:21 +0000 (18:12 +0100)]
Fixed user list offset call
Thomas Tanghus [Fri, 28 Mar 2014 17:05:48 +0000 (18:05 +0100)]
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
Vincent Petry [Fri, 28 Mar 2014 16:35:20 +0000 (17:35 +0100)]
Merge pull request #7934 from owncloud/addEventToExpirationDate
Emit event after setting a new expiration for a share
Robin Appelman [Fri, 28 Mar 2014 14:26:15 +0000 (15:26 +0100)]
Implement getPath for shared files
Robin Appelman [Thu, 27 Mar 2014 15:43:34 +0000 (16:43 +0100)]
Give storages the option to implement the getById behaviour for View->getPath
Morris Jobke [Fri, 28 Mar 2014 14:14:12 +0000 (15:14 +0100)]
Merge pull request #7770 from jamesryanbell/master
SVG support detection
Morris Jobke [Fri, 28 Mar 2014 14:00:13 +0000 (15:00 +0100)]
Emit event after setting a new expiration for a share
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
Björn Schießle [Fri, 28 Mar 2014 13:59:05 +0000 (14:59 +0100)]
Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
don't write file if opening a stream to encrypt the data fails
Thomas Müller [Fri, 28 Mar 2014 12:06:07 +0000 (13:06 +0100)]
Merge pull request #7824 from owncloud/hash-parameter-order
Fix parameter order for Storage\Local::hash
Thomas Müller [Fri, 28 Mar 2014 11:57:27 +0000 (12:57 +0100)]
adding @method annotation to declare methods which can be called on the wrapped statement object
Vincent Petry [Fri, 28 Mar 2014 11:23:11 +0000 (12:23 +0100)]
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
sharing api cleanup, first step
Vincent Petry [Fri, 28 Mar 2014 11:12:49 +0000 (12:12 +0100)]
Merge pull request #7613 from owncloud/fix_urlGenerator2
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
Thomas Müller [Fri, 28 Mar 2014 11:07:44 +0000 (12:07 +0100)]
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
Squashed commit of the following:
commit
eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge:
1e9c5be 1e7d7bd
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Mar 28 11:49:04 2014 +0100
Merge branch 'master' of https://github.com/kev300/core into kev300-master
commit
1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:11:42 2013 +0100
Update util.php
commit
3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:09:15 2013 +0100
Update util.php
commit
512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:02:04 2013 +0100
Update util.php
commit
6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date: Mon Dec 16 16:44:46 2013 +0100
Update util.php
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
Vincent Petry [Fri, 28 Mar 2014 11:08:38 +0000 (12:08 +0100)]
Merge pull request #7829 from owncloud/cachefolderlocation
Cache folder is now configurable
Bjoern Schiessle [Fri, 28 Mar 2014 11:02:49 +0000 (12:02 +0100)]
don't write file if opening a stream to encrypt the data fails
Thomas Müller [Fri, 28 Mar 2014 10:41:21 +0000 (11:41 +0100)]
Merge pull request #7703 from rnveach/jstest
Fixing issues found with running 'autotest-js' locally
Vincent Petry [Fri, 28 Mar 2014 10:33:57 +0000 (11:33 +0100)]
Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup
Cleanup the fileproxy proxies on test bootstrap
Björn Schießle [Fri, 28 Mar 2014 10:22:19 +0000 (11:22 +0100)]
Merge pull request #7872 from owncloud/trash-disablestoragestats
Do not retrieve storage stats for trash bin
Vincent Petry [Tue, 25 Mar 2014 10:00:01 +0000 (11:00 +0100)]
Do not retrieve storage stats for trash bin
Robin McCorkell [Fri, 28 Mar 2014 10:02:28 +0000 (10:02 +0000)]
Merge pull request #7842 from Xenopathic/files_external_config_optional
Enable the use of 'optional' on password fields for mount configuration
Vincent Petry [Fri, 28 Mar 2014 09:41:46 +0000 (10:41 +0100)]
Merge pull request #7720 from ideaship/autoconfig_fix
fix autoconfig
Thomas Müller [Fri, 28 Mar 2014 09:33:55 +0000 (10:33 +0100)]
Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
Thomas Müller [Fri, 28 Mar 2014 09:27:15 +0000 (10:27 +0100)]
Merge pull request #7724 from owncloud/mobile
[WIP] Mobile optimization for base layout and Files app
Jenkins for ownCloud [Fri, 28 Mar 2014 05:55:47 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Wed, 26 Mar 2014 16:48:33 +0000 (17:48 +0100)]
prevent dimmed ocdialog div from scrolling