]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoAdd support for font previews
Olivier Paroz [Sat, 24 Jan 2015 15:33:29 +0000 (16:33 +0100)]
Add support for font previews

9 years agoMerge pull request #14068 from owncloud/autotest-external-sftp
Thomas Müller [Tue, 24 Feb 2015 16:06:27 +0000 (08:06 -0800)]
Merge pull request #14068 from owncloud/autotest-external-sftp

[files_external] sftp tests

9 years agoMerge pull request #13740 from owncloud/fix-12190-2
Lukas Reschke [Tue, 24 Feb 2015 15:37:49 +0000 (16:37 +0100)]
Merge pull request #13740 from owncloud/fix-12190-2

Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups

9 years agoMerge pull request #14400 from owncloud/fix-cron-deadlock
Lukas Reschke [Tue, 24 Feb 2015 15:16:48 +0000 (16:16 +0100)]
Merge pull request #14400 from owncloud/fix-cron-deadlock

Use flock instead of just checking if there is a file to prevent deadloc...

9 years agouse flock instead of just checking if there is a file to prevent deadlocks when the...
Bernhard Posselt [Fri, 20 Feb 2015 12:10:16 +0000 (13:10 +0100)]
use flock instead of just checking if there is a file to prevent deadlocks when the process crashed or the unlink wasnt done

move cron.lock into top directory to prevent external storage issues

use tmp directory lock file

use new config interface

incorporate #13770

add dots

9 years agoMerge pull request #14195 from owncloud/activity-manager-performance-improvements
Lukas Reschke [Tue, 24 Feb 2015 14:19:15 +0000 (15:19 +0100)]
Merge pull request #14195 from owncloud/activity-manager-performance-improvements

Activity manager performance improvements

9 years agoMerge pull request #14282 from owncloud/disable-non-shipped-apps-master
Thomas Müller [Tue, 24 Feb 2015 13:39:45 +0000 (14:39 +0100)]
Merge pull request #14282 from owncloud/disable-non-shipped-apps-master

3rd-party apps are disabled on upgrade

9 years agoMerge pull request #14461 from owncloud/fix-code-that-never-worked
Thomas Müller [Tue, 24 Feb 2015 13:00:43 +0000 (14:00 +0100)]
Merge pull request #14461 from owncloud/fix-code-that-never-worked

Fix code that never worked

9 years agoMerge pull request #11555 from goodkiller/patch-1
Joas Schilling [Tue, 24 Feb 2015 12:58:41 +0000 (13:58 +0100)]
Merge pull request #11555 from goodkiller/patch-1

Update group.php

9 years agoMerge pull request #13340 from owncloud/use-http-only
Lukas Reschke [Tue, 24 Feb 2015 12:50:49 +0000 (13:50 +0100)]
Merge pull request #13340 from owncloud/use-http-only

Use "HTTPOnly" for cookies when logging out

9 years agoMerge pull request #14459 from owncloud/fix-oracle
Lukas Reschke [Tue, 24 Feb 2015 12:35:07 +0000 (13:35 +0100)]
Merge pull request #14459 from owncloud/fix-oracle

Dont break code which relies on the cursor being open after insert/updat...

9 years agoFix code that never worked
Lukas Reschke [Tue, 24 Feb 2015 12:26:23 +0000 (13:26 +0100)]
Fix code that never worked

Introduced with https://github.com/owncloud/core/commit/1df8a5a774ae5d665849daf74540d967826d5e11 in February 2013…

9 years agoDont break code which relies on the cursor being open after insert/update/delete
Bernhard Posselt [Tue, 24 Feb 2015 11:58:36 +0000 (12:58 +0100)]
Dont break code which relies on the cursor being open after insert/update/delete

9 years agoprint app upgrade information to console as well
Thomas Müller [Tue, 24 Feb 2015 11:52:16 +0000 (12:52 +0100)]
print app upgrade information to console as well

9 years ago3rd-party apps are only disabled in case core is upgraded
Thomas Müller [Tue, 24 Feb 2015 11:51:55 +0000 (12:51 +0100)]
3rd-party apps are only disabled in case core is upgraded

9 years agoMerge pull request #10830 from Finkregh/patch-1
Lukas Reschke [Tue, 24 Feb 2015 11:13:55 +0000 (12:13 +0100)]
Merge pull request #10830 from Finkregh/patch-1

add question about user-backend

9 years agoshipped and 3rd-party apps of type authentication and session will remain enabled...
Thomas Müller [Thu, 19 Feb 2015 14:59:20 +0000 (15:59 +0100)]
shipped and 3rd-party apps of type authentication and session will remain enabled during update

9 years ago3rd-party apps are disabled on upgrade - refs #14026
Thomas Müller [Tue, 17 Feb 2015 11:00:39 +0000 (12:00 +0100)]
3rd-party apps are disabled on upgrade - refs #14026

9 years agoMerge pull request #10599 from owncloud/move_passwordchange_text
Lukas Reschke [Tue, 24 Feb 2015 10:54:17 +0000 (11:54 +0100)]
Merge pull request #10599 from owncloud/move_passwordchange_text

Make the password changed msg inline to fix #10242

9 years agoMerge pull request #14009 from owncloud/installing-installed-apps-is-stupid
Thomas Müller [Tue, 24 Feb 2015 09:34:06 +0000 (10:34 +0100)]
Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid

don't allow installation of already installed apps - fixes #14004

9 years agoMerge pull request #14419 from owncloud/preview_apostrophe_fix
Joas Schilling [Tue, 24 Feb 2015 08:58:53 +0000 (09:58 +0100)]
Merge pull request #14419 from owncloud/preview_apostrophe_fix

fix issue with previews not being displayed if filename contains apostrophe

9 years agoMerge pull request #14442 from owncloud/fix-oracle-ci-master
Lukas Reschke [Tue, 24 Feb 2015 08:20:59 +0000 (09:20 +0100)]
Merge pull request #14442 from owncloud/fix-oracle-ci-master

Close the cursor after the affected count has been extracted.

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 24 Feb 2015 06:54:58 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoapp store can be used with any edition
Thomas Müller [Wed, 18 Feb 2015 22:51:18 +0000 (23:51 +0100)]
app store can be used with any edition

9 years agodon't allow installation of already installed apps - fixes #14004
Thomas Müller [Mon, 9 Feb 2015 21:48:27 +0000 (22:48 +0100)]
don't allow installation of already installed apps - fixes #14004

9 years agoMerge pull request #14433 from owncloud/fix-public-php
Thomas Müller [Mon, 23 Feb 2015 21:43:51 +0000 (22:43 +0100)]
Merge pull request #14433 from owncloud/fix-public-php

Use `getParam` instead of `server`

9 years agoMerge pull request #14416 from owncloud/setup-command
Thomas Müller [Mon, 23 Feb 2015 21:41:10 +0000 (22:41 +0100)]
Merge pull request #14416 from owncloud/setup-command

Setup command

9 years agoMerge pull request #13439 from owncloud/app-filter
Thomas Müller [Mon, 23 Feb 2015 20:51:53 +0000 (21:51 +0100)]
Merge pull request #13439 from owncloud/app-filter

Make the search box filter apps

9 years agoproperly initialize OC::$WEBROOT and host name
Thomas Müller [Mon, 23 Feb 2015 20:49:35 +0000 (21:49 +0100)]
properly initialize OC::$WEBROOT and host name

9 years agoMerge pull request #14119 from owncloud/dbal251
Thomas Müller [Mon, 23 Feb 2015 19:59:51 +0000 (20:59 +0100)]
Merge pull request #14119 from owncloud/dbal251

Update doctrine/dbal to 2.5.1 #13537

9 years agoFix error handling
Thomas Müller [Mon, 23 Feb 2015 16:46:08 +0000 (17:46 +0100)]
Fix error handling

9 years agoClose the cursor after the affected count has been extracted.
Thomas Müller [Mon, 23 Feb 2015 16:17:20 +0000 (17:17 +0100)]
Close the cursor after the affected count has been extracted.

9 years agoimplement command maintenance:install
Thomas Müller [Sat, 21 Feb 2015 19:52:32 +0000 (20:52 +0100)]
implement command maintenance:install

9 years agoFix namespace of OC_Setup -> \OC\Setup
Thomas Müller [Sat, 21 Feb 2015 19:51:50 +0000 (20:51 +0100)]
Fix namespace of OC_Setup -> \OC\Setup

9 years agoMerge pull request #14439 from owncloud/fix-ajax-files-external
Lukas Reschke [Mon, 23 Feb 2015 15:29:45 +0000 (16:29 +0100)]
Merge pull request #14439 from owncloud/fix-ajax-files-external

Fix Ajax type casting for files_external

9 years agoMerge pull request #13829 from owncloud/appmanager-list
Vincent Petry [Mon, 23 Feb 2015 15:03:32 +0000 (16:03 +0100)]
Merge pull request #13829 from owncloud/appmanager-list

Better caching for enabled apps

9 years agoFix Ajax type casting for files_external
Robin McCorkell [Mon, 23 Feb 2015 14:57:37 +0000 (14:57 +0000)]
Fix Ajax type casting for files_external

9 years agoAdded unit test for app filter
Vincent Petry [Mon, 23 Feb 2015 14:29:25 +0000 (15:29 +0100)]
Added unit test for app filter

9 years agoUse `getParam` instead of `server`
Lukas Reschke [Mon, 23 Feb 2015 13:07:42 +0000 (14:07 +0100)]
Use `getParam` instead of `server`

`server` is completely wrong here and this will not work on master. With `getParam` it will work fine though.

Testplan:
- [ ] Without patch: Share a file and try to access `http://localhost/public.php?service=files&t=THESHAREDTOKEN` => Fails
- [ ] With patch: Try the same => Works

Master only.

9 years agoMerge pull request #14427 from owncloud/fix-some-php-docs
Bernhard Posselt [Mon, 23 Feb 2015 13:04:35 +0000 (14:04 +0100)]
Merge pull request #14427 from owncloud/fix-some-php-docs

Fix some PHPDocs

9 years agoMerge pull request #14403 from owncloud/update-license-headers
Thomas Müller [Mon, 23 Feb 2015 12:53:16 +0000 (13:53 +0100)]
Merge pull request #14403 from owncloud/update-license-headers

Update license headers

9 years agoFix some PHPDocs
Lukas Reschke [Mon, 23 Feb 2015 11:19:52 +0000 (12:19 +0100)]
Fix some PHPDocs

9 years agoUpdating license headers
Jenkins for ownCloud [Mon, 23 Feb 2015 10:28:53 +0000 (05:28 -0500)]
Updating license headers

9 years agoMerge pull request #14422 from owncloud/use-off-and-off
Thomas Müller [Mon, 23 Feb 2015 10:12:53 +0000 (11:12 +0100)]
Merge pull request #14422 from owncloud/use-off-and-off

Use "off" and "off" instead of true booleans

9 years agoMerge pull request #14275 from chris-se/master
Lukas Reschke [Mon, 23 Feb 2015 09:25:13 +0000 (10:25 +0100)]
Merge pull request #14275 from chris-se/master

DAV authentication: use Owncloud's internal user instead of HTTP auth one

9 years agoUse "off" and "off" instead of true booleans
Lukas Reschke [Mon, 23 Feb 2015 08:40:15 +0000 (09:40 +0100)]
Use "off" and "off" instead of true booleans

Apparently a boolean in php.ini is according to the documentation "on" or "off"…

Fixes itself.

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 23 Feb 2015 06:55:10 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoAdding .mailmap - helps to add unified authors to the license header
Thomas Müller [Fri, 20 Feb 2015 14:08:46 +0000 (15:08 +0100)]
Adding .mailmap - helps to add unified authors to the license header

9 years agophp script which updates the license header in all php file in the repo
Thomas Müller [Fri, 20 Feb 2015 11:16:23 +0000 (12:16 +0100)]
php script which updates the license header in all php file in the repo

9 years agoMerge pull request #14414 from owncloud/add-ini-helper
Thomas Müller [Sun, 22 Feb 2015 19:44:02 +0000 (20:44 +0100)]
Merge pull request #14414 from owncloud/add-ini-helper

Add helper to check for `ini` values in `OC_Util::checkServer`

9 years agoMerge pull request #14413 from owncloud/verify-php-before-running-tests-2
Thomas Müller [Sun, 22 Feb 2015 19:36:07 +0000 (20:36 +0100)]
Merge pull request #14413 from owncloud/verify-php-before-running-tests-2

Check for PHP configuration before executing unit tests

9 years agofix issue with previews not being displayed if filename contains apostrophe
Georg Ehrke [Sun, 22 Feb 2015 15:51:16 +0000 (16:51 +0100)]
fix issue with previews not being displayed if filename contains apostrophe

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 22 Feb 2015 06:54:42 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoAdd expected values to default config as well
Lukas Reschke [Sat, 21 Feb 2015 11:17:59 +0000 (12:17 +0100)]
Add expected values to default config as well

9 years agoAdd helper to check for `ini` values in `OC_Util::checkServer`
Lukas Reschke [Sat, 21 Feb 2015 11:12:34 +0000 (12:12 +0100)]
Add helper to check for `ini` values in `OC_Util::checkServer`

This allows to check for specific values in the PHP.ini that ownCloud requires for full compatibility.

`mbstring.func_overload`: https://github.com/owncloud/core/issues/14372
`output_buffering`: http://doc.owncloud.org/server/8.0/admin_manual/configuration/big_file_upload_configuration.html#configuring-php

Fixes https://github.com/owncloud/core/issues/14372 and https://github.com/owncloud/core/issues/14412

9 years agoCheck for PHP configuration before executing unit tests
Thomas Müller [Sat, 21 Feb 2015 10:51:52 +0000 (11:51 +0100)]
Check for PHP configuration before executing unit tests

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 21 Feb 2015 06:54:38 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13777 from owncloud/close-cursor
Lukas Reschke [Fri, 20 Feb 2015 19:15:22 +0000 (20:15 +0100)]
Merge pull request #13777 from owncloud/close-cursor

Close cursor for appframework and manipulation queries if applicable

9 years agoMerge pull request #13767 from owncloud/issue/13764-mimetype-racecondition
Thomas Müller [Fri, 20 Feb 2015 16:39:17 +0000 (17:39 +0100)]
Merge pull request #13767 from owncloud/issue/13764-mimetype-racecondition

Use insertIfNotExists() and reload mimetypes after inserting one

9 years agoMerge pull request #14325 from owncloud/fix-plurals-with-quotes
Lukas Reschke [Fri, 20 Feb 2015 15:35:53 +0000 (16:35 +0100)]
Merge pull request #14325 from owncloud/fix-plurals-with-quotes

Correctly create the expected key for plurals with quotes

9 years agoMerge pull request #14278 from owncloud/fix-index
Lukas Reschke [Fri, 20 Feb 2015 13:56:13 +0000 (14:56 +0100)]
Merge pull request #14278 from owncloud/fix-index

Check if the offset exists before accessing

9 years agoMerge pull request #14359 from owncloud/add-satisfy-all
Lukas Reschke [Fri, 20 Feb 2015 13:55:43 +0000 (14:55 +0100)]
Merge pull request #14359 from owncloud/add-satisfy-all

Add `Satisfy All`

9 years agoMerge pull request #13645 from owncloud/fix-breadcrumb-backslash
Morris Jobke [Fri, 20 Feb 2015 12:36:38 +0000 (13:36 +0100)]
Merge pull request #13645 from owncloud/fix-breadcrumb-backslash

Parse backslash as directory separator in breadcrumb

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 20 Feb 2015 06:55:01 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #14366 from owncloud/remove-old-l10n-files
Lukas Reschke [Thu, 19 Feb 2015 22:31:21 +0000 (23:31 +0100)]
Merge pull request #14366 from owncloud/remove-old-l10n-files

Remove some old l10n files they arent loaded anymore

9 years agoapply backslash fix to _setCurrentDir
Thomas Müller [Thu, 19 Feb 2015 16:12:29 +0000 (17:12 +0100)]
apply backslash fix to _setCurrentDir

9 years agoMerge pull request #14199 from owncloud/cast-type-manually
Morris Jobke [Thu, 19 Feb 2015 16:19:54 +0000 (17:19 +0100)]
Merge pull request #14199 from owncloud/cast-type-manually

Manually type-cast all AJAX files

9 years agoMerge pull request #13505 from owncloud/streamline-scanning-code
Thomas Müller [Thu, 19 Feb 2015 15:35:05 +0000 (16:35 +0100)]
Merge pull request #13505 from owncloud/streamline-scanning-code

Streamline auth and CSRF check in scan.php

9 years agoMerge pull request #14267 from owncloud/encode-eventsource
Thomas Müller [Thu, 19 Feb 2015 15:21:12 +0000 (16:21 +0100)]
Merge pull request #14267 from owncloud/encode-eventsource

Encode requesttoken

9 years agoMerge pull request #14295 from owncloud/encode-request-token-for-avatars
Thomas Müller [Thu, 19 Feb 2015 15:20:41 +0000 (16:20 +0100)]
Merge pull request #14295 from owncloud/encode-request-token-for-avatars

Encode Requesttoken for avatars

9 years agoMerge pull request #14311 from raimund-schluessler/Fix#14310
Thomas Müller [Thu, 19 Feb 2015 15:17:19 +0000 (16:17 +0100)]
Merge pull request #14311 from raimund-schluessler/Fix#14310

Fix #14310

9 years agoMerge pull request #14377 from owncloud/port-14041
Thomas Müller [Thu, 19 Feb 2015 14:49:30 +0000 (15:49 +0100)]
Merge pull request #14377 from owncloud/port-14041

Port of #14041 to master

9 years agoPort of #14041 to master
Arthur Schiwon [Tue, 3 Feb 2015 18:02:25 +0000 (19:02 +0100)]
Port of #14041 to master

on ownCloud upgrade: upgrade all apps in order, load important ones

Fix "other" app update stack

9 years agoMerge pull request #14338 from owncloud/fix-nav-heigt
Morris Jobke [Thu, 19 Feb 2015 12:11:53 +0000 (13:11 +0100)]
Merge pull request #14338 from owncloud/fix-nav-heigt

If no link text has been set for the navigation show the link nonetheless

9 years agoRemove some old l10n files they arent loaded anymore
Joas Schilling [Thu, 19 Feb 2015 10:58:40 +0000 (11:58 +0100)]
Remove some old l10n files they arent loaded anymore

9 years agoMerge pull request #14342 from owncloud/disallow-path-traversals-in-file-view
Thomas Müller [Thu, 19 Feb 2015 09:27:04 +0000 (10:27 +0100)]
Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-view

Disallow path traversals in file view

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 19 Feb 2015 06:55:43 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoAdd `Satisfy All`
Lukas Reschke [Thu, 19 Feb 2015 01:16:44 +0000 (02:16 +0100)]
Add `Satisfy All`

Fixes https://github.com/owncloud/core/issues/14356

9 years agoMerge pull request #13836 from owncloud/part-no-cache-update
Thomas Müller [Wed, 18 Feb 2015 23:08:10 +0000 (00:08 +0100)]
Merge pull request #13836 from owncloud/part-no-cache-update

Dont update the cache when working with part files

9 years agoMake the search box filter apps
Robin Appelman [Sun, 18 Jan 2015 13:52:19 +0000 (14:52 +0100)]
Make the search box filter apps

9 years agoMerge pull request #14349 from owncloud/contributetrackerupdate
Thomas Müller [Wed, 18 Feb 2015 19:43:16 +0000 (20:43 +0100)]
Merge pull request #14349 from owncloud/contributetrackerupdate

add documentation issue trackers and use https everywhere

9 years agoMerge pull request #12213 from sebomoto/add-loadfeedback
Jan-Christoph Borchardt [Wed, 18 Feb 2015 18:42:18 +0000 (19:42 +0100)]
Merge pull request #12213 from sebomoto/add-loadfeedback

Add loadfeedback

9 years agoadd documentation issue trackers and use https everywhere
Volkan Gezer [Wed, 18 Feb 2015 18:11:45 +0000 (19:11 +0100)]
add documentation issue trackers and use https everywhere

9 years agoAdd some basic PHPDoc to functions
Lukas Reschke [Wed, 18 Feb 2015 15:08:30 +0000 (16:08 +0100)]
Add some basic PHPDoc to functions

9 years agoPrevent directory traversals in ctr of \OC\Files\View
Lukas Reschke [Wed, 18 Feb 2015 15:01:24 +0000 (16:01 +0100)]
Prevent directory traversals in ctr of \OC\Files\View

This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown.

9 years agoMerge pull request #13989 from owncloud/enhancment/security/11857
Clark Tomlinson [Wed, 18 Feb 2015 15:27:29 +0000 (10:27 -0500)]
Merge pull request #13989 from owncloud/enhancment/security/11857

Allow AppFramework applications to specify a custom CSP header

9 years agoMerge pull request #14335 from owncloud/enable-strict-mode-per-deafult
Clark Tomlinson [Wed, 18 Feb 2015 15:06:12 +0000 (10:06 -0500)]
Merge pull request #14335 from owncloud/enable-strict-mode-per-deafult

Fix invalid `ini_set` directives

9 years agoMerge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_insta...
Lukas Reschke [Wed, 18 Feb 2015 14:45:38 +0000 (15:45 +0100)]
Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_instantiation

Revert "add debug log for memcache instantiation"

9 years agoMerge pull request #14324 from owncloud/fix/14320
Clark Tomlinson [Wed, 18 Feb 2015 14:40:32 +0000 (09:40 -0500)]
Merge pull request #14324 from owncloud/fix/14320

Check if instance is not yet installed

9 years agoif no link text has been set for the navigation show the link nonetheless
Bernhard Posselt [Wed, 18 Feb 2015 14:34:31 +0000 (15:34 +0100)]
if no link text has been set for the navigation show the link nonetheless

9 years agoFix invalid `ini_set` directives
Lukas Reschke [Wed, 18 Feb 2015 14:18:27 +0000 (15:18 +0100)]
Fix invalid `ini_set` directives

Somehow they got messed up. Because PHP does automatic type juggling this has worked before as well however it's not guaranteed that this might work in the future as well.

9 years agoMerge pull request #14211 from owncloud/activity/225-files-extension-jenkins
Vincent Petry [Wed, 18 Feb 2015 13:47:15 +0000 (14:47 +0100)]
Merge pull request #14211 from owncloud/activity/225-files-extension-jenkins

Activity/225 Move displaying of files related activities to files app

9 years agoMerge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins
Vincent Petry [Wed, 18 Feb 2015 13:46:58 +0000 (14:46 +0100)]
Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins

Activity/225 sharing extension

9 years agoallow overwriting the appmanager in oc_util by subclassing
Robin Appelman [Wed, 18 Feb 2015 13:24:50 +0000 (14:24 +0100)]
allow overwriting the appmanager in oc_util by subclassing

9 years agoRevert "add debug log for memcache instantiation"
Lukas Reschke [Wed, 18 Feb 2015 13:16:14 +0000 (14:16 +0100)]
Revert "add debug log for memcache instantiation"

9 years agoUse the untrusted domain in the installer
Lukas Reschke [Wed, 18 Feb 2015 12:59:37 +0000 (13:59 +0100)]
Use the untrusted domain in the installer

9 years agoCorrectly create the expected key for plurals with quotes
Joas Schilling [Wed, 18 Feb 2015 12:20:38 +0000 (13:20 +0100)]
Correctly create the expected key for plurals with quotes

Ported from the administration repo:
https://github.com/owncloud/administration/commit/c67eaa11c04d0989ee9331c97788a0225a82e7f5
and
https://github.com/owncloud/administration/commit/41b0f9fa3a9c6183972f971eea3875b98e22217a

9 years agoCheck if instance is not yet installed
Lukas Reschke [Wed, 18 Feb 2015 12:06:46 +0000 (13:06 +0100)]
Check if instance is not yet installed

Due to a security hardening in 8.1 a missing value of empty trusted domains in the config would provoke an error as this was misused by a lot of users.

This caused a problem where the initial installation happened from another domain than 127.0.0.1 as in this case the domain was considered untrusted as no value was defined. However, this special case should not get intercepted.

To test:
- [ ] Installing ownCloud on 127.0.0.1 works
- [ ] Installing ownCloud on another domain / IP works
- [ ] When setting up ownCloud from 127.0.0.1 and accessing it from the domain above the trusted domain error should be shown if not specified in the config

Fixes https://github.com/owncloud/core/issues/14320

9 years agoMerge pull request #13857 from owncloud/phpseclib-0.3.9
Thomas Müller [Wed, 18 Feb 2015 09:17:34 +0000 (10:17 +0100)]
Merge pull request #13857 from owncloud/phpseclib-0.3.9

Update phpseclib to version 0.3.9.

9 years agoMerge pull request #14308 from owncloud/fix-14247
Thomas Müller [Wed, 18 Feb 2015 09:05:33 +0000 (10:05 +0100)]
Merge pull request #14308 from owncloud/fix-14247

Add mapping for a broken varchar type.