]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoRemove missed stuff from merge
josh4trunks [Fri, 4 Apr 2014 05:17:31 +0000 (22:17 -0700)]
Remove missed stuff from merge

10 years agoFixed Typo
josh4trunks [Thu, 3 Apr 2014 14:32:48 +0000 (07:32 -0700)]
Fixed Typo

10 years agoDon't always $cookie_path, only set it when needed
josh4trunks [Tue, 25 Mar 2014 01:46:42 +0000 (18:46 -0700)]
Don't always $cookie_path, only set it when needed

10 years agocookie would be useless if value is not set
josh4trunks [Mon, 24 Mar 2014 04:39:29 +0000 (21:39 -0700)]
cookie would be useless if value is not set

10 years agoDon't to set the cookie it wasn't needed.
josh4trunks [Mon, 24 Mar 2014 03:05:06 +0000 (20:05 -0700)]
Don't to set the cookie it wasn't needed.

10 years agoFixes login / logout when HTTP Basic Headers are avilable.
josh4trunks [Mon, 24 Mar 2014 02:29:03 +0000 (19:29 -0700)]
Fixes login / logout when HTTP Basic Headers are avilable.

10 years agoMerge pull request #6968 from owncloud/files-ajaxload
Morris Jobke [Thu, 3 Apr 2014 20:02:05 +0000 (22:02 +0200)]
Merge pull request #6968 from owncloud/files-ajaxload

Ajaxify files list for files + trashbin + public page

10 years agoExclude javascript specs from code analysis
Thomas Müller [Thu, 3 Apr 2014 18:05:40 +0000 (20:05 +0200)]
Exclude javascript specs from code analysis

10 years agoMerge pull request #7476 from owncloud/type-hinting
Thomas Müller [Thu, 3 Apr 2014 18:02:27 +0000 (20:02 +0200)]
Merge pull request #7476 from owncloud/type-hinting

Type hinting

10 years agoCorrectly set svg for crumb divider
Vincent Petry [Thu, 3 Apr 2014 15:08:06 +0000 (17:08 +0200)]
Correctly set svg for crumb divider

10 years agoFixed dirInfo check for non existing dir in files ajax call
Vincent Petry [Thu, 3 Apr 2014 15:04:13 +0000 (17:04 +0200)]
Fixed dirInfo check for non existing dir in files ajax call

10 years agoFixed mime type attribute access in file overwrite dialog
Vincent Petry [Thu, 3 Apr 2014 14:55:01 +0000 (16:55 +0200)]
Fixed mime type attribute access in file overwrite dialog

10 years agoRemoved redundant free space and upload limit in public page
Vincent Petry [Thu, 3 Apr 2014 14:50:21 +0000 (16:50 +0200)]
Removed redundant free space and upload limit in public page

10 years agoMerge pull request #7969 from Xenopathic/files_external_fix
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

10 years agoMerge pull request #7970 from owncloud/webdav-upload-hash
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

10 years agoFix error log spam
Robin McCorkell [Mon, 31 Mar 2014 14:16:33 +0000 (15:16 +0100)]
Fix error log spam

Regression from e002b7242cb19a0e028d325cd64b57e67dc48108

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 3 Apr 2014 05:56:12 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #8014 from owncloud/uploadsize-reuse
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

10 years agoMerge pull request #7978 from owncloud/enc_cleanup
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

10 years agoReuse known free space in the files app
Robin Appelman [Wed, 2 Apr 2014 14:53:45 +0000 (16:53 +0200)]
Reuse known free space in the files app

10 years agoFiles, trashbin, public apps use ajax/JSON for the file list
Vincent Petry [Mon, 28 Oct 2013 19:22:06 +0000 (20:22 +0100)]
Files, trashbin, public apps use ajax/JSON for the file list

Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app

10 years agoMerge pull request #7995 from owncloud/fix-h3-styles
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

10 years agoMerge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib
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)

10 years agoMerge pull request #8006 from wakeup/master
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.

10 years agoMerge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
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

10 years agoMerge pull request #7968 from owncloud/core-overwritewebrootwithroot
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"

10 years agoFix admin-dir_permissions redirection when cannot write warning
Volkan Gezer [Wed, 2 Apr 2014 10:41:46 +0000 (12:41 +0200)]
Fix admin-dir_permissions redirection when cannot write warning
is shown.

10 years agoUpgraded phpseclib to version 0.3.6
Vincent Petry [Wed, 2 Apr 2014 10:31:59 +0000 (12:31 +0200)]
Upgraded phpseclib to version 0.3.6

10 years agoMerge pull request #7979 from owncloud/core-fixfilegetcontentsloop
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

10 years agofix h3 style, move out from settings to apps CSS
Jan-Christoph Borchardt [Tue, 1 Apr 2014 16:50:47 +0000 (18:50 +0200)]
fix h3 style, move out from settings to apps CSS

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 2 Apr 2014 05:56:39 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoFixed parseQueryString to handle empty values and plus signs
Vincent Petry [Tue, 28 Jan 2014 15:16:09 +0000 (16:16 +0100)]
Fixed parseQueryString to handle empty values and plus signs

- now correctly parse query strings with '+' signs
- empty values are now parsed either as null or empty string
- added unit test for parseQueryString()

10 years agoMerge pull request #7989 from owncloud/files-deletefileregressionfix
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

10 years agoMerge pull request #7884 from owncloud/use-idn_to_ascii-if-available
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

10 years agoMerge pull request #7935 from owncloud/getpath-shared
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

10 years agoMerge pull request #7817 from owncloud/app-navigation-for-apps
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.

10 years agoMerge pull request #7997 from owncloud/correct-remember-trashbin-state
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

10 years agoRemember before change works better
Bart Visscher [Wed, 18 Sep 2013 20:06:45 +0000 (22:06 +0200)]
Remember before change works better

10 years agoMerge pull request #7986 from owncloud/files-fixredirectwhendirnotexists
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

10 years agoMerge pull request #7984 from owncloud/wording-applicable2
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«

10 years agoFixed broken delete file action
Vincent Petry [Tue, 1 Apr 2014 14:09:48 +0000 (16:09 +0200)]
Fixed broken delete file action

10 years agoMerge pull request #7696 from owncloud/chunk-remainingspacefix
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

10 years agoFix dirInfo check when dir does not exist
Vincent Petry [Tue, 1 Apr 2014 13:15:03 +0000 (15:15 +0200)]
Fix dirInfo check when dir does not exist

10 years agoMerge pull request #7293 from owncloud/update-shares-postgres
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

10 years agoexternal storage: set storages to be available for All Users by default
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

10 years agoexternal storage: change confusing 'applicable' to 'available for'
Jan-Christoph Borchardt [Tue, 1 Apr 2014 12:26:06 +0000 (14:26 +0200)]
external storage: change confusing 'applicable' to 'available for'

10 years agoMerge pull request #7940 from owncloud/settings-userlistajaxcallfix
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

10 years agoMerge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
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

10 years agoMerge pull request #7943 from hjort/master
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

10 years agoMerge pull request #7975 from owncloud/fix-7973-master-2
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

10 years agoMerge pull request #7915 from owncloud/replace-personalblock
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

10 years agoMerge pull request #7966 from owncloud/url_generation_hack
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

10 years agoapply proposed change
Morris Jobke [Tue, 1 Apr 2014 08:48:55 +0000 (10:48 +0200)]
apply proposed change

10 years agoAdded missing fclose in file_get_contents and file_put_contents
Vincent Petry [Mon, 31 Mar 2014 16:37:52 +0000 (18:37 +0200)]
Added missing fclose in file_get_contents and file_put_contents

10 years agoCorrectly read the full stream in file_get_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.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 1 Apr 2014 05:56:15 +0000 (01:56 -0400)]
[tx-robot] updated from transifex

10 years agoMerge branch 'master' into type-hinting
Bart Visscher [Mon, 31 Mar 2014 19:38:54 +0000 (21:38 +0200)]
Merge branch 'master' into type-hinting

Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php

10 years agoMerge pull request #7967 from owncloud/sharing_fix_select_statement
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

10 years agothere is no need to re-calculate the shares after a touch
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

10 years agoalways encrypt files to owner
Bjoern Schiessle [Mon, 31 Mar 2014 16:09:46 +0000 (18:09 +0200)]
always encrypt files to owner

10 years agoremove pl_PL - fixes #7973
Thomas Müller [Mon, 31 Mar 2014 16:03:42 +0000 (18:03 +0200)]
remove pl_PL - fixes #7973

10 years agoFix uploading files containing a # in the path for webdav
Robin Appelman [Mon, 31 Mar 2014 15:00:32 +0000 (17:00 +0200)]
Fix uploading files containing a # in the path for webdav

10 years agoMerge pull request #7916 from owncloud/fix-input-sizes
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

10 years agoAllow using "/" in "overwritewebroot"
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"

10 years agodon't call getFileInfo() to avoid to open the same file twice
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

10 years agomove check if a file should be encrypted to the pre hook
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

10 years agoselect statement always need to contain file_source respectively item_source
Bjoern Schiessle [Mon, 31 Mar 2014 13:02:02 +0000 (15:02 +0200)]
select statement always need to contain file_source respectively item_source

10 years agoImprove phpdoc
Robin Appelman [Mon, 31 Mar 2014 12:29:55 +0000 (14:29 +0200)]
Improve phpdoc

10 years agoCheck if web root has already been appended
Thomas Tanghus [Mon, 31 Mar 2014 12:24:38 +0000 (14:24 +0200)]
Check if web root has already been appended

10 years agomerge CSS rules
Morris Jobke [Mon, 31 Mar 2014 11:51:53 +0000 (13:51 +0200)]
merge CSS rules

10 years agoexternal storage: fix merge conflict, indentation
Jan-Christoph Borchardt [Mon, 31 Mar 2014 11:12:04 +0000 (13:12 +0200)]
external storage: fix merge conflict, indentation

10 years agoreplace last personalblock fieldset within files_external
Jan-Christoph Borchardt [Mon, 31 Mar 2014 11:00:46 +0000 (13:00 +0200)]
replace last personalblock fieldset within files_external

10 years agofix duplicate rules for button/input styles, em to px
Jan-Christoph Borchardt [Mon, 31 Mar 2014 10:27:26 +0000 (12:27 +0200)]
fix duplicate rules for button/input styles, em to px

10 years agoMerge pull request #7939 from owncloud/wring_redirect_on_login
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

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 31 Mar 2014 05:55:43 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoRemoves highlighting of selected items, padding from apps management.
raghunayyar [Sun, 30 Mar 2014 10:18:47 +0000 (15:48 +0530)]
Removes highlighting of selected items, padding from apps management.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 30 Mar 2014 05:55:42 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoSub-dir was prepended twice
Thomas Tanghus [Sat, 29 Mar 2014 19:40:49 +0000 (20:40 +0100)]
Sub-dir was prepended twice

10 years agoSub-dir was prepended twice
Thomas Tanghus [Sat, 29 Mar 2014 19:39:55 +0000 (20:39 +0100)]
Sub-dir was prepended twice

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 29 Mar 2014 05:55:44 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #7845 from duritong/fix_submodule_url
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

10 years agoMerge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
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 ...

10 years agoCorrection: failure on sharing when user ID was prefixed by zero
Rodrigo Hjort [Fri, 28 Mar 2014 18:08:59 +0000 (15:08 -0300)]
Correction: failure on sharing when user ID was prefixed by zero

10 years agoFixed user list offset call
Vincent Petry [Fri, 28 Mar 2014 17:12:21 +0000 (18:12 +0100)]
Fixed user list offset call

10 years agoUse UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
Thomas Tanghus [Fri, 28 Mar 2014 17:05:48 +0000 (18:05 +0100)]
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936

10 years agoMerge pull request #7934 from owncloud/addEventToExpirationDate
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

10 years agoImplement getPath for shared files
Robin Appelman [Fri, 28 Mar 2014 14:26:15 +0000 (15:26 +0100)]
Implement getPath for shared files

10 years agoGive storages the option to implement the getById behaviour for View->getPath
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

10 years agoMerge pull request #7770 from jamesryanbell/master
Morris Jobke [Fri, 28 Mar 2014 14:14:12 +0000 (15:14 +0100)]
Merge pull request #7770 from jamesryanbell/master

SVG support detection

10 years agoEmit event after setting a new expiration for a share
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

10 years agoMerge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
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

10 years agoMerge pull request #7824 from owncloud/hash-parameter-order
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

10 years agoadding @method annotation to declare methods which can be called on the wrapped state...
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

10 years agoMerge pull request #7879 from owncloud/sharing_cleanup_public_api
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

10 years agoMerge pull request #7613 from owncloud/fix_urlGenerator2
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()

10 years agoFix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
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.

10 years agoMerge pull request #7829 from owncloud/cachefolderlocation
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

10 years agodon't write file if opening a stream to encrypt the data fails
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

10 years agoMerge pull request #7703 from rnveach/jstest
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

10 years agoMerge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup
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