summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #20055 from nextcloud/remove-placeholder-check-17Roeland Jago Douma2020-03-212-77/+0
|\ \ \ | | | | | | | | [17] remove the requirement that everything that looks like a placeholder …
| * | | remove the requirement that everything that looks like a placeholder is ↵Robin Appelman2020-03-202-77/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | substituted While maybe not common, `$` is a valid option in config fields Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #20052 from nextcloud/backport/20049/stable17Roeland Jago Douma2020-03-211-2/+2
|\ \ \ | | | | | | | | [stable17] Force compatible dependency versions in acceptance tests
| * | | Force compatible dependency versions in acceptance testsDaniel Calviño Sánchez2020-03-201-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | behat/mink 1.8 and behat/mink-selenium2-driver 1.4 introduced behaviour changes that broke the acceptance tests. Until the tests are updated to work with the newer versions the last known versions are forced. Note that some acceptance tests still fail after enforcing the compatible versions, although that is caused by changes in the Nextcloud server itself. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* / / [tx-robot] updated from transifexNextcloud bot2020-03-2162-114/+116
|/ /
* / [tx-robot] updated from transifexNextcloud bot2020-03-2034-54/+76
|/
* [tx-robot] updated from transifexNextcloud bot2020-03-1910-6/+24
|
* Merge pull request #20017 from nextcloud/backport/19981/stable17Roeland Jago Douma2020-03-181-0/+5
|\ | | | | [stable17] Update the target when it isempty after sharing
| * Update the target when it isempty after sharingRoeland Jago Douma2020-03-181-0/+5
| | | | | | | | | | | | | | Hooks that listen to it (audit log) benefit from having the target properly set. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #19983 from nextcloud/backport/19698/stable17Roeland Jago Douma2020-03-185-5/+30
|\ \ | |/ |/| [stable17] Fix default action for deleted shares
| * Fix default action for deleted sharesGretaD2020-03-185-5/+30
|/ | | | | Signed-off-by: GretaD <gretadoci@gmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* [tx-robot] updated from transifexNextcloud bot2020-03-184-4/+6
|
* Merge pull request #20000 from nextcloud/backport/19995/stable17Roeland Jago Douma2020-03-172-2/+2
|\ | | | | [stable17] Default value of lookupServerEnabled should be the same everywhere
| * Default value of lookupServerEnabled should be the same everywhereGeorg Ehrke2020-03-172-2/+2
|/ | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* [tx-robot] updated from transifexNextcloud bot2020-03-1732-90/+224
|
* [tx-robot] updated from transifexNextcloud bot2020-03-1620-12/+92
|
* [tx-robot] updated from transifexNextcloud bot2020-03-1538-16/+224
|
* [tx-robot] updated from transifexNextcloud bot2020-03-1422-10/+48
|
* Merge pull request #19925 from nextcloud/backport/19910/stable17Roeland Jago Douma2020-03-131-1/+1
|\ | | | | [stable17] Do not use the instance name as user part of from mail addresses
| * Do not use the instance name as user part of from mail addressesJulius Härtl2020-03-131-1/+1
|/ | | | | | | This will cause issues since the theming name can contain characters that are not allowed in the local part of the mail address (like spaces) Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #19917 from nextcloud/backport/19888/stable17Roeland Jago Douma2020-03-131-6/+1
|\ | | | | [stable17] Get correct mimetype on objectstores
| * Get correct mimetype on objectstoresRoeland Jago Douma2020-03-121-6/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2020-03-13130-678/+682
|/
* Merge pull request #19885 from nextcloud/backport/19704/stable17Roeland Jago Douma2020-03-122-5/+4
|\ | | | | [stable17] Fix hostname in Apple configuration profile
| * Fix testNils Wittenbrink2020-03-111-4/+3
| | | | | | | | Signed-off-by: Nils Wittenbrink <nilswittenbrink@web.de>
| * Fix hostname given in Apple config fileNils Wittenbrink2020-03-111-1/+1
| | | | | | | | Signed-off-by: Nils Wittenbrink <nilswittenbrink@web.de>
* | [tx-robot] updated from transifexNextcloud bot2020-03-1236-20/+370
| |
* | Merge pull request #19865 from nextcloud/version/17.0.4/finalv17.0.4Roeland Jago Douma2020-03-111-2/+2
|\ \ | |/ |/| 17.0.4
| * 17.0.4Roeland Jago Douma2020-03-091-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2020-03-11128-108/+136
| |
* | [tx-robot] updated from transifexNextcloud bot2020-03-1036-72/+82
|/
* Merge pull request #19843 from nextcloud/version/17.0.4/RC2v17.0.4RC2Roeland Jago Douma2020-03-091-2/+2
|\ | | | | 17.0.4 RC2
| * 17.0.4 RC2Roeland Jago Douma2020-03-071-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #19831 from nextcloud/backport/19815/stable17Roeland Jago Douma2020-03-091-3/+3
|\ \ | | | | | | [stable17] Prevent self-xss via invalid mysql user name on install screen
| * | Prevent self-xss via invalid mysql user name on install screenJoas Schilling2020-03-071-3/+3
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2020-03-0910-0/+12
| |
* | [tx-robot] updated from transifexNextcloud bot2020-03-086-2/+20
|/
* Merge pull request #19816 from nextcloud/backport/19742/stable17Roeland Jago Douma2020-03-072-2/+19
|\ | | | | [stable17] Add message for DoesNotExistException
| * Add message for DoesNotExistExceptionDaniel Kesselberg2020-03-062-2/+19
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | [tx-robot] updated from transifexNextcloud bot2020-03-0718-14/+22
|/
* [tx-robot] updated from transifexNextcloud bot2020-03-0620-14/+90
|
* Merge pull request #19733 from nextcloud/version/17.0.4/RC1v17.0.4RC1Roeland Jago Douma2020-03-051-2/+2
|\ | | | | 17.0.4 RC1
| * 17.0.4 RC1Roeland Jago Douma2020-03-051-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #19785 from nextcloud/backport/19392/stable17Roeland Jago Douma2020-03-052-4/+24
|\ | | | | [stable17] Introduce a default refresh rate app setting for calendar subscriptions
| * Introduce a default refresh rate app setting for calendar subscriptionsThomas Citharel2020-03-052-4/+24
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #19703 from ↵Christoph Wurst2020-03-058-17/+69
|\ \ | | | | | | | | | | | | nextcloud/feature/revive-send-welcome-email-toggle-stable17 [stable17] Revive the "send email to new users" toggle for the user form
| * | Revive the "send email to new users" toggle for the user formChristoph Wurst2020-03-058-17/+69
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18580 from nextcloud/backport/18140/stable17Roeland Jago Douma2020-03-052-0/+9
|\ \ \ | |_|/ |/| | [stable17] Allow inline styles for theming images
| * | Allow inline styles for theming imagesJulius Härtl2020-03-052-0/+9
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #19327 from nextcloud/backport/19303/stable17Roeland Jago Douma2020-03-053-8/+38
|\ \ | | | | | | [stable17] Fix occ maintenance:install database connect failure