create new encryption keys on password reset and backup the old one

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

Merge pull request #3012 from nextcloud/fix-karma-image-warnings

show fewer warnings in karma test runs

Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type

Make sure the used event type and the setting/filter are the same

Merge pull request #2914 from nextcloud/logrotate-logfile

Get the logfile location while running the logrotate cron job instead…

Merge pull request #3000 from nextcloud/cache-no-store

set 'no-store' cache header if we do not want FF to cache

show fewer warnings in karma test runs

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #2943 from nextcloud/kill_old_preview_code

Cleanup old preview code

Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares

share by mail should continue to work, even if public links are disabled

Merge pull request #3005 from nextcloud/dev-manual-12

fix dev manual link

Make sure the used event type and the setting/filter are the same

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix controller test

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

fix dev manual link

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #2982 from nextcloud/better-notification-links

Set the link of the notification on render instead of creation

Merge pull request #2925 from nextcloud/remove-close-wrapper

replace close:// streamwrapper with CallBackWrapper

fix data response test expected cache headers

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #2998 from Loki3000/master

Default cache value for null user

Default value for null user

For guest users on every request executes query:
SELECT `uid`, `displayname` FROM `users` WHERE LOWER(`uid`) = LOWER(null)
as I see, uid can't be equal to null by design.

set 'no-store' cache header if we do not want FF to cache

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Merge pull request #2987 from nextcloud/no-empty-bundle

dont write a certificate bundle if the shipped ca bundle is empty

Merge pull request #2992 from nextcloud/fix_subdir_install_style

Fix subdir install style

dont write a certificate bundle if the shipped ca bundle is empty

Signed-off-by: Robin Appelman <robin@icewind.nl>

Merge pull request #2985 from nextcloud/fix-trusted-domain-error

Allow access to CSS resources

Fix subdir install style

* We need to pass the serverroot so that it can include the right files.

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

Merge pull request #2814 from nextcloud/appstore_etag_validation

Add ETag validation to appstore requests

Allow access to CSS resources

Fixes https://github.com/nextcloud/server/issues/2984

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix update notification tests

Signed-off-by: Joas Schilling <coding@schilljs.com>

Cleanup comment tests

Signed-off-by: Joas Schilling <coding@schilljs.com>

Only add the link when the user can follow it.

Signed-off-by: Joas Schilling <coding@schilljs.com>

Set the link of the notification on render instead of creation

Signed-off-by: Joas Schilling <coding@schilljs.com>

Set the comment link on render instead of creation

Signed-off-by: Joas Schilling <coding@schilljs.com>

[tx-robot] updated from transifex

Merge pull request #2512 from nextcloud/cleanup-system-tag-usage

Only allow admins to delete tags

Get the logfile location while running the logrotate cron job instead of when registering the job

Signed-off-by: Robin Appelman <robin@icewind.nl>

Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-applicable

Remove group restrictions when those are not allowed anymore

update autoloader

Signed-off-by: Robin Appelman <robin@icewind.nl>

replace close:// streamwrapper with CallBackWrapper

Signed-off-by: Robin Appelman <robin@icewind.nl>

Merge pull request #2948 from nextcloud/allow-global-composer-to-be-used

Allow to use a global composer instance

Merge pull request #2934 from nextcloud/quota-stream-non-global

remove the need to register the quota streamwrapper globally

Merge pull request #2968 from nextcloud/update-3rdparty

Update 3rdparty

Merge pull request #2966 from nextcloud/ldif-mime-support

recognize LDIF (and schema) file types

Update 3rdparty after the merge of #2050

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #2050 from nextcloud/scss-switch-base

Switch to SCSS: base files

Fix js tests

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

Theme update pages via CSS

* SCSS on-the-fly generation isn't allowed during update
* fallback to plain CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

recognize LDIF (and schema) file types

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Update autoloader

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

Fix css url prefix for IgnoreFrontController enabled configs

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

ScssCcacher typo fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Camelcase fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Remove webroot from file path

The webroot is already provided, otherwise this links to stuff like "/nextcloud/nextcloud/index.php" instead of "/nextcloud/index.php"

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Adds CssControllerTests

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

Fix variables should be passed by reference

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Updated installation css for config error and update

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Removed old css files

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

3rdparty branch set

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Tooltip scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Systemtags scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Styles scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Share scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Multiselect scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Jquery-ui-fixes scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Inputs scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Icons scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Header scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Apps scss

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Fix typo

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

Inject SCSSCacher

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

Make SCCCacher injectable

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

Formatting

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

No need for the CssManager

* It is a simple wrapper we can always add it later if needed

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

Installation css & template edit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Css installation page fallback

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Do not add ICssManager to OCP

We can add it later if needed

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

Code cleanup

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

Fix php docs

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Css cache folder name fix, route fix and various fixes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Appdata location fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Regex fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Injection fix and log appname fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Since fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Url generator fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

log app name fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Appdata integration 2

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Appdata integration 1 & log fix 2

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Debug log fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Cache and compile base

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Merge pull request #2676 from nextcloud/smb-2.0.0

Update icewind/smb to 2.0.0

Merge pull request #2817 from nextcloud/fix-invalid-share-perms

Fix invalid share perms

Merge pull request #2946 from nextcloud/kill-apc

Kill APC because it requires PHP 5.4 or lower

Merge pull request #2797 from nextcloud/issue-2734-sudo-password-with-ldap

Use login name to fix password confirm with ldap users

Merge pull request #2922 from nextcloud/fopen-only-simple-modes

log a warning when trying to use a non basic fopen mode

Merge pull request #2535 from nextcloud/allow-to-reuse-admin-as-install-name-like-on-mysql

Allow to reuse the same name when installing a new instance on postgres

Use the new expression

Signed-off-by: Joas Schilling <coding@schilljs.com>

Add bitwise AND and OR to the expression builder

Signed-off-by: Joas Schilling <coding@schilljs.com>

Adjust version to Nextcloud

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Add repair step to fix file share permissions

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Add ETag validation to appstore requests

* If the ETag if present store it
* If a stored ETag is present then pass it along (with the original
response) to get
* Add tests
* Added files to classmap

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

[tx-robot] updated from transifex

Remove warning

Signed-off-by: Joas Schilling <coding@schilljs.com>

Fix tests

Signed-off-by: Joas Schilling <coding@schilljs.com>