Merge pull request #2034 from nextcloud/product-typo

Fix translation string

Fix translation string

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

Merge pull request #2026 from nextcloud/setting_lang

Move setlanguage to controller

Merge pull request #2032 from nextcloud/noodlesegg-refactor

refactoring code to reduce cyclomatic complexit

refactoring code to reduce cyclomatic complexit

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

[tx-robot] updated from transifex

Fix route and js

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

Add settings PersonalController

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

[tx-robot] updated from transifex

Merge pull request #2018 from nextcloud/firefox-svg-workaround

Workaround for disappearing app icons for Firefox before version 51

Merge pull request #2021 from henrymohn/bug-1875_Password-Hint

Removed else statement preventing Success message from displaying cau…

[tx-robot] updated from transifex

Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tad

Cleanup OC_Group usage a bit

Merge pull request #2015 from nextcloud/swift-bucket

allow using 'bucket' to set the swift container

Removed else statement preventing Success message from displaying causing bug #1875
Signed-off-by: Henry Mohn <hmohniii@gmail.com>

Cleanup OC_Group usage a bit

This is deprecated internal stuff. Should not be used anymore.

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

Workaround for disappearing app icons for Firefox before version 51

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Merge pull request #2007 from nextcloud/downstream-26411

[oc] Fix initMountPoints to set usersSetup earlier

allow using 'bucket' to set the swift container

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

Merge pull request #2010 from nextcloud/downstream-26534

[oC] Fixed disappearing of share info in file view

Merge pull request #1880 from nextcloud/downstream-26235

Integration tests refactoring

Add sleep function

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

Fixed disappearing of share info in file view

Merge pull request #2008 from nextcloud/remove_removed_script

Remove adding sharedialogmailview

Fix tests

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

Remove adding sharedialogmailview

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

[tx-robot] updated from transifex

Merge pull request #2006 from nextcloud/downstream-26380

[oC] Hide "Add group" for subadmins

Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-link

Use mail for encrypting the password reset token as well

Merge pull request #1741 from nextcloud/new_preview

Improve previews

Fix initMountPoints to set usersSetup earlier

This is needed because in some cases like LDAP, the user manager itself
might trigger avatar updates which would internally also call
initMountPoints with the same user. This could cause the same user to
be setup twice, and in some sharing situations could cause recursive
deduplication of shares by adding "(2)" every time.

Merge pull request #2002 from nextcloud/propagate-mtime-iont

explicitly cast mtime to int in propagation

Hide "Add group" for subadmins

Merge pull request #1733 from nextcloud/dav-events

Activities for calendars, events and todos

Fix tests

* Tests fixed and controller coverage to 100%

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

Merge pull request #2003 from nextcloud/query-logger-limit

Cap the number of queries we save in the query logger

Cap the number of queries we save in the query logger

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

Merge pull request #2000 from nextcloud/sharebymail-icon

add share by mail icon, fix #1979

Add more tests

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

explicitly cast mtime to int

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

Add tests for triggerCalendarActivity

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

[WIP] Use mail for encrypting the password reset token as well

Merge pull request #1908 from nextcloud/downstream-26078

Upload autorename on client side

Merge pull request #1994 from nextcloud/proper-cron-hints

Show a hint for system based cron user name

Update changelog

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

add share by mail icon, fix #1979

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>

Add cache 1 day cache to preview endpoint

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

More tests

* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test

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

Added genertor helper & tests

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

Update thumbnail endpoint to new generato

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

Move over files_trashbin

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

Moved over files_versions

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

Fix urlgenerator test

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

Update autoloader

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

Move publicpreview over

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

Move Ipreview to more of DI thingy

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

Fix name conflict

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

Move file

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

Move preview endpoint to controller

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

Watch for file modification/deletion

* Only connect the watcher once the instance is properly setup else
AppData fails hard.

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

Move to AppData

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

New preview generator

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

Merge pull request #1997 from nextcloud/changelog

Introducing changelog.md

Merge pull request #1996 from nextcloud/allow-phpunit-options

Allow to run autotest with phpunit options

Added changelog.md

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

Start unit tests for the activity listener

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

Add tests for dispatching of the events

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

Merge pull request #1915 from nextcloud/downstream-26398

Add using casing check/fix for initMountPoints

Use the event dispatcher

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

Use a different type for events and todos

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

Activities for events and todos

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

Move the methods into a new class

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

Add activities for shares

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

Fix unshare actions for author != owner

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

Add activity for unshare from group

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

Unshare user activities

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

Start working on calendar activities

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

Allow to run autotest with phpunit options

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

Merge pull request #1954 from nextcloud/issue_#1953

#1953 add can to subshare options

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

Signed-off-by: Andreas Hechenberger <world@greenstation.de>

Merge pull request #1993 from nextcloud/wait-600-seconds-for-mysqlmb4

adjust autotest.sh to also wait 600 seconds for mysqlmb4

Show a hint for system based cron user name

* makes it easier to setup cron job
* gives hints for PHP documentation
* disables the cron setting if requirements not met
* fixes #1989

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

adjust autotest.sh to also wait 600 seconds for mysqlmb4

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

Merge pull request #1991 from nextcloud/code-check-more-shipped-apps

Run code checker on more shipped apps

Merge pull request #1990 from nextcloud/use-php-7.1-rc-5

Use PHP 7.1 RC5 for CI

[tx-robot] updated from transifex

Run code checker on more shipped apps

Adds:
- sharebymail
- systemtags
- theming
- workflowengine

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

Use PHP 7.1 RC5 for CI

This image has PHP 7.1 RC5 inside and the currently used one only RC4.

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

Adjust tests and DI for Share.php

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

DI for root.php

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

Remove unneeded behat method

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

Adapted favorites and dav2 features

Adapted sharing and external features, random failures in sharing:857

Added weddav related feature

Removed forgotten leftovers

Merge pull request #1978 from nextcloud/remove-send-mail-option

Remove send mail option

Merge pull request #1988 from nextcloud/silly-but-effective-test

Add test for "languageCodes.php"

Do not expose user data in exceptions & fix typo

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

Fix mock warning in some FS tests (#26464)

Add using casing check/fix for initMountPoints

Upload autorename on client side

Removes the need for POST to collection which would hit against upload
limits.

The client tries to auto rename the file by adding a suffix "(2)".
It tries to use the file list on the client side to guess a
suitable name. In case a file still cannot be uploaded and creates a
conflict, which can happen when the file was concurrently uploaded, the
logic will continue increasing the suffix.

Merge pull request #1981 from nextcloud/multibucket-num-buckets

Allow setting a maximun number of buckets for multibucket

Add test for "languageCodesTest.php"

Arguably not the most awesome test but increases coverage and is an easy gain.

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