]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoUse more verbose text for upload menu 4922/head
Jan-Christoph Borchardt [Tue, 16 May 2017 19:06:05 +0000 (21:06 +0200)]
Use more verbose text for upload menu

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoMerge pull request #4881 from nextcloud/sign-off-check v12.0.0beta3
Roeland Jago Douma [Mon, 15 May 2017 20:18:27 +0000 (22:18 +0200)]
Merge pull request #4881 from nextcloud/sign-off-check

Run sign-off check as last check

7 years agoMerge pull request #4884 from nextcloud/beta-3
Lukas Reschke [Mon, 15 May 2017 20:09:43 +0000 (22:09 +0200)]
Merge pull request #4884 from nextcloud/beta-3

Bump to 12.0.0 beta 3

7 years agoBump to 12.0.0 beta 3 4884/head
Lukas Reschke [Mon, 15 May 2017 18:25:17 +0000 (20:25 +0200)]
Bump to 12.0.0 beta 3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4883 from nextcloud/revert-4685-fix_4683
Morris Jobke [Mon, 15 May 2017 17:43:36 +0000 (12:43 -0500)]
Merge pull request #4883 from nextcloud/revert-4685-fix_4683

Revert "fix permissions of mountpoints - take 2"

7 years agoRevert "fix permissions of mountpoints - take 2" 4883/head
Morris Jobke [Mon, 15 May 2017 17:43:25 +0000 (12:43 -0500)]
Revert "fix permissions of mountpoints - take 2"

7 years agoMerge pull request #4685 from nextcloud/fix_4683
Morris Jobke [Mon, 15 May 2017 16:53:59 +0000 (11:53 -0500)]
Merge pull request #4685 from nextcloud/fix_4683

fix permissions of mountpoints - take 2

7 years agoMerge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion
Morris Jobke [Mon, 15 May 2017 16:03:33 +0000 (11:03 -0500)]
Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion

Remove more personal info on user deletion

7 years agoMerge pull request #4867 from nextcloud/kill-install-app
Lukas Reschke [Mon, 15 May 2017 16:01:12 +0000 (18:01 +0200)]
Merge pull request #4867 from nextcloud/kill-install-app

Remove OC_App:installApp

7 years agoRun sign-off check as last check 4881/head
Morris Jobke [Mon, 15 May 2017 16:01:06 +0000 (11:01 -0500)]
Run sign-off check as last check

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4810 from nextcloud/downstream-27668
Morris Jobke [Mon, 15 May 2017 15:56:18 +0000 (10:56 -0500)]
Merge pull request #4810 from nextcloud/downstream-27668

Fix mimetype update query

7 years agoMerge pull request #4877 from nextcloud/oc-group-is-gone
Morris Jobke [Mon, 15 May 2017 14:51:42 +0000 (09:51 -0500)]
Merge pull request #4877 from nextcloud/oc-group-is-gone

Remove OC_Group call

7 years agoMerge pull request #4847 from nextcloud/throw-exception-if-password-not-avail
Morris Jobke [Mon, 15 May 2017 14:50:28 +0000 (09:50 -0500)]
Merge pull request #4847 from nextcloud/throw-exception-if-password-not-avail

Throws exception if password not available

7 years agoMerge pull request #4873 from nextcloud/check-whether-REQUEST-exists
Morris Jobke [Mon, 15 May 2017 14:49:11 +0000 (09:49 -0500)]
Merge pull request #4873 from nextcloud/check-whether-REQUEST-exists

Check whether the $_SERVER['REQUEST_*'] vars exist before using them

7 years agoMerge pull request #4872 from nextcloud/os-rename
Morris Jobke [Mon, 15 May 2017 14:12:55 +0000 (09:12 -0500)]
Merge pull request #4872 from nextcloud/os-rename

Revert "fix objectstore rename"

7 years agoupdate comment to code 4685/head
Robin Appelman [Mon, 15 May 2017 13:54:37 +0000 (15:54 +0200)]
update comment to code

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoRemove OC_Group call 4877/head
Lukas Reschke [Mon, 15 May 2017 12:52:40 +0000 (14:52 +0200)]
Remove OC_Group call

OC_Group has been removed in March with https://github.com/nextcloud/server/pull/4867, the check in question is also performed two lines below already.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoCheck whether the $_SERVER['REQUEST_*'] vars exist before using them 4873/head
Joas Schilling [Mon, 15 May 2017 12:33:27 +0000 (14:33 +0200)]
Check whether the $_SERVER['REQUEST_*'] vars exist before using them

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4805 from nextcloud/enforce-upgrade-for-big-instances
Lukas Reschke [Mon, 15 May 2017 12:28:28 +0000 (14:28 +0200)]
Merge pull request #4805 from nextcloud/enforce-upgrade-for-big-instances

Allow to enforce update via web UI

7 years agoUpdate autoloader map 4847/head
Lukas Reschke [Mon, 15 May 2017 12:24:44 +0000 (14:24 +0200)]
Update autoloader map

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4866 from nextcloud/login-footer-bold-link
Lukas Reschke [Mon, 15 May 2017 12:22:19 +0000 (14:22 +0200)]
Merge pull request #4866 from nextcloud/login-footer-bold-link

Bold link in footer on login page

7 years agoRevert "fix objectstore rename" 4872/head
Roeland Jago Douma [Mon, 15 May 2017 11:59:18 +0000 (13:59 +0200)]
Revert "fix objectstore rename"

This reverts commit 5334a3dc337b5883763ac8e1eaef58c1a435144b.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoRemove account data on user deletion 4871/head
Joas Schilling [Mon, 15 May 2017 11:30:52 +0000 (13:30 +0200)]
Remove account data on user deletion

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove 2FA backup codes on user deletion
Joas Schilling [Mon, 15 May 2017 11:19:44 +0000 (13:19 +0200)]
Remove 2FA backup codes on user deletion

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4862 from coderkun/issue-440-localhost-regex
Joas Schilling [Mon, 15 May 2017 10:45:39 +0000 (12:45 +0200)]
Merge pull request #4862 from coderkun/issue-440-localhost-regex

Add IPv6 to “localhost” regex (#440)

7 years agoFix variable names 4810/head
Joas Schilling [Mon, 15 May 2017 10:38:30 +0000 (12:38 +0200)]
Fix variable names

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRemove OC_App:installApp 4867/head
Morris Jobke [Mon, 15 May 2017 05:03:35 +0000 (00:03 -0500)]
Remove OC_App:installApp

* uses Installer->installApp now
* removes unused code
* fixes #4453
* added some additional checks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoBold link in footer on login page 4866/head
Morris Jobke [Mon, 15 May 2017 03:26:10 +0000 (22:26 -0500)]
Bold link in footer on login page

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 15 May 2017 00:08:14 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoAdd IPv6 to “localhost” regex (#440) 4862/head
coderkun [Sun, 14 May 2017 19:22:13 +0000 (21:22 +0200)]
Add IPv6 to “localhost” regex (#440)

Signed-off-by: Oliver Hanraths <olli@coderkun.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 14 May 2017 00:07:54 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 13 May 2017 00:08:00 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoThows exception if password not available
Morris Jobke [Fri, 12 May 2017 17:53:29 +0000 (12:53 -0500)]
Thows exception if password not available

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4816 from nextcloud/Ardinis-quota-files_external
Morris Jobke [Fri, 12 May 2017 16:33:54 +0000 (11:33 -0500)]
Merge pull request #4816 from nextcloud/Ardinis-quota-files_external

Correctly calculate used space for quota with external storage

7 years agofix quota tests for external storage 4816/head
Morris Jobke [Thu, 11 May 2017 16:35:48 +0000 (11:35 -0500)]
fix quota tests for external storage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoCorrectly calculate used space for quota with external storage
Ardinis [Sun, 16 Apr 2017 00:32:14 +0000 (02:32 +0200)]
Correctly calculate used space for quota with external storage

issue #4348

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4829 from nextcloud/theming-preview-click
Morris Jobke [Fri, 12 May 2017 15:22:20 +0000 (10:22 -0500)]
Merge pull request #4829 from nextcloud/theming-preview-click

Clicking on theming preview triggers fileupload dialog

7 years agoMerge pull request #4809 from nextcloud/downstream-27676
Lukas Reschke [Fri, 12 May 2017 10:39:07 +0000 (12:39 +0200)]
Merge pull request #4809 from nextcloud/downstream-27676

Disable reset password link

7 years agoMerge pull request #4825 from nextcloud/add-timeout-appstore
Lukas Reschke [Fri, 12 May 2017 10:37:18 +0000 (12:37 +0200)]
Merge pull request #4825 from nextcloud/add-timeout-appstore

Add timeout for requests to appstore

7 years agoMerge pull request #4822 from nextcloud/fix-input-size
Lukas Reschke [Fri, 12 May 2017 10:31:30 +0000 (12:31 +0200)]
Merge pull request #4822 from nextcloud/fix-input-size

Fix size of enforced expiry date input

7 years agoMerge pull request #4824 from nextcloud/log-connection-problems-appfetcher
Lukas Reschke [Fri, 12 May 2017 10:30:17 +0000 (12:30 +0200)]
Merge pull request #4824 from nextcloud/log-connection-problems-appfetcher

Log connectiong problems while fetching data from appstore

7 years agoFix unit tests 4824/head
Joas Schilling [Fri, 12 May 2017 08:02:15 +0000 (10:02 +0200)]
Fix unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix failed assertions 4825/head
Joas Schilling [Fri, 12 May 2017 07:58:18 +0000 (09:58 +0200)]
Fix failed assertions

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4826 from nextcloud/hide-cropper-input
Joas Schilling [Fri, 12 May 2017 07:54:55 +0000 (09:54 +0200)]
Merge pull request #4826 from nextcloud/hide-cropper-input

Hide checkbox in avatarcropper

7 years agoDon't open the dialog for logo and background 4829/head
Joas Schilling [Fri, 12 May 2017 07:48:51 +0000 (09:48 +0200)]
Don't open the dialog for logo and background

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix order of parameter and escaping
Joas Schilling [Fri, 12 May 2017 07:33:51 +0000 (09:33 +0200)]
Fix order of parameter and escaping

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoClicking on theming preview triggers fileupload dialog
Morris Jobke [Fri, 12 May 2017 00:49:32 +0000 (19:49 -0500)]
Clicking on theming preview triggers fileupload dialog

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoHide checkbox in avatarcropper 4826/head
Morris Jobke [Fri, 12 May 2017 00:18:09 +0000 (19:18 -0500)]
Hide checkbox in avatarcropper

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 12 May 2017 00:07:46 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4821 from nextcloud/update-redis-cluster-documentation
Morris Jobke [Thu, 11 May 2017 22:59:09 +0000 (17:59 -0500)]
Merge pull request #4821 from nextcloud/update-redis-cluster-documentation

Update redis cluster documentation

7 years agoAdd timeout for requests to appstore
Morris Jobke [Thu, 11 May 2017 22:48:53 +0000 (17:48 -0500)]
Add timeout for requests to appstore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoLog connectiong problems while fetching data from appstore
Morris Jobke [Thu, 11 May 2017 22:46:41 +0000 (17:46 -0500)]
Log connectiong problems while fetching data from appstore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate redis cluster documentation 4821/head
Morris Jobke [Thu, 11 May 2017 22:02:49 +0000 (17:02 -0500)]
Update redis cluster documentation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix size of enforced expiry date input 4822/head
Morris Jobke [Thu, 11 May 2017 22:18:00 +0000 (17:18 -0500)]
Fix size of enforced expiry date input

* fixes #4819

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4817 from nextcloud/more-app-update-logs
Lukas Reschke [Thu, 11 May 2017 19:52:33 +0000 (21:52 +0200)]
Merge pull request #4817 from nextcloud/more-app-update-logs

Proper logging for appstore updates

7 years agoProper logging for appstore updates 4817/head
Morris Jobke [Thu, 11 May 2017 18:35:17 +0000 (13:35 -0500)]
Proper logging for appstore updates

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAllow to enforce update via web UI 4805/head
Morris Jobke [Thu, 11 May 2017 03:26:51 +0000 (22:26 -0500)]
Allow to enforce update via web UI

* adds a disclaimer that an update via web UI is on own risk
* allows to skip the warning
* fixes #4353

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4804 from nextcloud/proper-upgrade-size
Lukas Reschke [Thu, 11 May 2017 15:10:45 +0000 (17:10 +0200)]
Merge pull request #4804 from nextcloud/proper-upgrade-size

Properly decide on actual users if instance is too big

7 years agoDisable the API endpoints as well 4809/head
Joas Schilling [Thu, 11 May 2017 14:46:43 +0000 (16:46 +0200)]
Disable the API endpoints as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4808 from nextcloud/downstream-27788
Morris Jobke [Thu, 11 May 2017 14:07:57 +0000 (09:07 -0500)]
Merge pull request #4808 from nextcloud/downstream-27788

Adjust sample documentation

7 years agoMerge pull request #4800 from nextcloud/remove-unused-config.php-option
Morris Jobke [Thu, 11 May 2017 14:04:54 +0000 (09:04 -0500)]
Merge pull request #4800 from nextcloud/remove-unused-config.php-option

SSL menu is now shown for files_external

7 years agoMerge pull request #4803 from nextcloud/postgres-sleep
Morris Jobke [Thu, 11 May 2017 14:03:46 +0000 (09:03 -0500)]
Merge pull request #4803 from nextcloud/postgres-sleep

Add 10 seconds sleep time after postgres startup

7 years agoMore fixes 4808/head
Joas Schilling [Thu, 11 May 2017 09:30:51 +0000 (11:30 +0200)]
More fixes

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoActually we want to update the mimetype of all files ending with the suffix
Joas Schilling [Thu, 11 May 2017 08:57:20 +0000 (10:57 +0200)]
Actually we want to update the mimetype of all files ending with the suffix

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agodon´t change folders with --repair-filecache
Rello [Tue, 18 Apr 2017 19:41:52 +0000 (21:41 +0200)]
don´t change folders with --repair-filecache

check if folder is "httpd/unix-directory" and don´t perform here #27585

7 years agoDisable reset password link. Issue: #27440
Ujjwal Bhardwaj [Wed, 19 Apr 2017 10:35:05 +0000 (16:05 +0530)]
Disable reset password link. Issue: #27440

7 years agoAdjust sample documentation
Joas Schilling [Thu, 11 May 2017 08:15:49 +0000 (10:15 +0200)]
Adjust sample documentation

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoProperly decide on actual users if instance is too big 4804/head
Morris Jobke [Thu, 11 May 2017 02:39:09 +0000 (21:39 -0500)]
Properly decide on actual users if instance is too big

* state the reason why NC thinks it is a big instance

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd 10 seconds sleep time after postgres startup 4803/head
Morris Jobke [Thu, 11 May 2017 02:37:09 +0000 (21:37 -0500)]
Add 10 seconds sleep time after postgres startup

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 11 May 2017 00:08:08 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4783 from nextcloud/lite-application-classes
Morris Jobke [Wed, 10 May 2017 22:31:05 +0000 (17:31 -0500)]
Merge pull request #4783 from nextcloud/lite-application-classes

Use automatic injection for appdata folders

7 years agoMerge pull request #4798 from nextcloud/multibucket-root-fs
Morris Jobke [Wed, 10 May 2017 21:50:19 +0000 (16:50 -0500)]
Merge pull request #4798 from nextcloud/multibucket-root-fs

Setup root FS for multibucket object storage

7 years agoSSL menu is now shown for files_external 4800/head
Morris Jobke [Wed, 10 May 2017 21:08:40 +0000 (16:08 -0500)]
SSL menu is now shown for files_external

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUse distributed cache for SCSS dependencies as well 4798/head
Morris Jobke [Wed, 10 May 2017 18:31:45 +0000 (13:31 -0500)]
Use distributed cache for SCSS dependencies as well

* followup to #3978 because with the proper setup of
  appdata we now are using the same data on all nodes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoSetup root FS for multibucket object storage
Morris Jobke [Wed, 10 May 2017 18:21:35 +0000 (13:21 -0500)]
Setup root FS for multibucket object storage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4762 from nextcloud/add-unsafe-global-eval-fn
Morris Jobke [Wed, 10 May 2017 16:37:06 +0000 (11:37 -0500)]
Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn

Add fallback to jQuery.fn.globalEval

7 years agoMerge pull request #4787 from nextcloud/missing-parameter
Roeland Jago Douma [Wed, 10 May 2017 12:44:24 +0000 (14:44 +0200)]
Merge pull request #4787 from nextcloud/missing-parameter

Fix missing placeholder for doc link

7 years agoMerge pull request #4788 from nextcloud/issue-4756-cron-error
Lukas Reschke [Wed, 10 May 2017 11:22:40 +0000 (13:22 +0200)]
Merge pull request #4788 from nextcloud/issue-4756-cron-error

Fix errors with LookupServerConnector background job

7 years agoEval script elemtents in HTML body response 4762/head
Lukas Reschke [Wed, 10 May 2017 11:03:15 +0000 (13:03 +0200)]
Eval script elemtents in HTML body response

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4771 from nextcloud/error-page-logo-css
Joas Schilling [Wed, 10 May 2017 10:10:38 +0000 (12:10 +0200)]
Merge pull request #4771 from nextcloud/error-page-logo-css

use the same logo css for the error page as the login page

7 years agoUse the configured lookup server 4788/head
Joas Schilling [Wed, 10 May 2017 09:59:14 +0000 (11:59 +0200)]
Use the configured lookup server

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDefine method shouldRun
Joas Schilling [Wed, 10 May 2017 09:54:27 +0000 (11:54 +0200)]
Define method shouldRun

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix missing placeholder for doc link 4787/head
Joas Schilling [Wed, 10 May 2017 09:44:01 +0000 (11:44 +0200)]
Fix missing placeholder for doc link

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAutomatic injection into the Fetchers 4783/head
Joas Schilling [Wed, 10 May 2017 07:56:38 +0000 (09:56 +0200)]
Automatic injection into the Fetchers

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAutomatic creation of Identity manager
Joas Schilling [Wed, 10 May 2017 07:44:28 +0000 (09:44 +0200)]
Automatic creation of Identity manager

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse automatic DI injection for UpdateLookupServer
Joas Schilling [Wed, 10 May 2017 07:44:02 +0000 (09:44 +0200)]
Use automatic DI injection for UpdateLookupServer

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAutomatic injection for CssController
Joas Schilling [Wed, 10 May 2017 07:42:40 +0000 (09:42 +0200)]
Automatic injection for CssController

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAutomatic injection for JsController
Joas Schilling [Wed, 10 May 2017 07:41:33 +0000 (09:41 +0200)]
Automatic injection for JsController

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4770 from nextcloud/bugfix/4749/properties_table_propertyvalue_clob
Morris Jobke [Wed, 10 May 2017 05:20:57 +0000 (00:20 -0500)]
Merge pull request #4770 from nextcloud/bugfix/4749/properties_table_propertyvalue_clob

we can't predict the size of propertyvalue. text -> clob

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 10 May 2017 00:08:31 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4772 from nextcloud/fix-theming-background-preview
Lukas Reschke [Tue, 9 May 2017 22:31:55 +0000 (00:31 +0200)]
Merge pull request #4772 from nextcloud/fix-theming-background-preview

Fix theming preview for background image

7 years agoMerge pull request #4702 from nextcloud/handle-user-folder-not-available
Roeland Jago Douma [Tue, 9 May 2017 20:50:52 +0000 (22:50 +0200)]
Merge pull request #4702 from nextcloud/handle-user-folder-not-available

Stop if user folder is not available

7 years agoStop if user folder is not available 4702/head
Morris Jobke [Thu, 4 May 2017 22:34:01 +0000 (19:34 -0300)]
Stop if user folder is not available

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix theming preview for background image 4772/head
Julius Härtl [Tue, 9 May 2017 16:21:41 +0000 (18:21 +0200)]
Fix theming preview for background image

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoMerge pull request #4737 from nextcloud/logo-icon-container
Robin Appelman [Tue, 9 May 2017 16:21:01 +0000 (18:21 +0200)]
Merge pull request #4737 from nextcloud/logo-icon-container

fix sizing of logo in header

7 years agouse the same logo css for the error page as the login page 4771/head
Robin Appelman [Tue, 9 May 2017 16:14:33 +0000 (18:14 +0200)]
use the same logo css for the error page as the login page

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agowe can't predict the size of propertyvalue. text -> clob 4770/head
Georg Ehrke [Tue, 9 May 2017 16:12:50 +0000 (18:12 +0200)]
we can't predict the size of propertyvalue. text -> clob

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
7 years agoMerge pull request #4758 from nextcloud/fix_3470
Roeland Jago Douma [Tue, 9 May 2017 13:00:35 +0000 (15:00 +0200)]
Merge pull request #4758 from nextcloud/fix_3470

Do not write and read rootcerts.crt at the same time

7 years agoMerge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-postin...
Roeland Jago Douma [Tue, 9 May 2017 12:23:29 +0000 (14:23 +0200)]
Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment

Fix mentioned user not clickable after posting or editing a comment

7 years agoDo not write and read rootcerts.crt at the same time 4758/head
Roeland Jago Douma [Tue, 9 May 2017 11:00:07 +0000 (13:00 +0200)]
Do not write and read rootcerts.crt at the same time

(Possibly) fixes #3470

When updating the main file /files_external/rootcerts.crt we should not
read from /files_external/rootcerts.crt at the same time.

For 2 reasons: writing to a file and reading from it at the same time
can have non deterministic results

And we don't want all the certificates to appear 2 times in there.

This isn't caught by our standard file locking (that does not allow this
actually) because it is in a non locked path....

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>