summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Remove unused config optionMorris Jobke2018-06-121-6/+0
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9842 from nextcloud/backport/9814/stable12Morris Jobke2018-06-121-1/+1
|\ \ | | | | | | [stable12] Make the DELETION of groups match greedy on the groupID
| * | Make the DELETION of groups match greedy on the groupIDRoeland Jago Douma2018-06-121-1/+1
|/ / | | | | | | | | | | | | | | fixes #6032 Now since the match is greedy it will also eat the / Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-06-1256-2/+158
| |
* | Merge pull request #9822 from nextcloud/version/noid/12.0.9v12.0.9Morris Jobke2018-06-111-2/+2
|\ \ | | | | | | 12.0.9
| * | 12.0.9Morris Jobke2018-06-111-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9804 from nextcloud/backport/9802/stable12John Molakvoæ2018-06-111-1/+1
|\ \ | | | | | | [stable12] Make the token expiration also work for autocasting 0
| * | Make the token expiration also work for autocasting 0Roeland Jago Douma2018-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Some bad databases don't respect the default null apprently. Now even if they cast it to 0 it should work just fine. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-06-116-0/+18
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-06-1010-4/+32
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-06-0932-0/+108
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-06-08276-11600/+11754
| |
* | Merge pull request #9779 from nextcloud/version/noid/12.0.8v12.0.8Morris Jobke2018-06-071-2/+2
|\ \ | | | | | | 12.0.8
| * | 12.0.8Morris Jobke2018-06-071-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-06-07170-14454/+15014
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-0630-2/+42
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-0414-36/+38
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-0310-18/+20
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-026-146/+156
| |
* | Merge pull request #9702 from nextcloud/version/noid/12.0.8RC1v12.0.8RC1Morris Jobke2018-06-012-3/+3
|\ \ | | | | | | 12.0.8 RC 1
| * | Ping mysql version in CIMorris Jobke2018-06-011-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | 12.0.8 RC 1Morris Jobke2018-06-011-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9611 from ↵Morris Jobke2018-06-011-0/+67
|\ \ | | | | | | | | | | | | nextcloud/bugfix-stable12/3830/invitations_for_shared_calendars [stable12] send invitations for shared calendars
| * | send invitations for shared calendarsGeorg Ehrke2018-05-251-0/+67
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #9695 from nextcloud/backport/9692/stable12Morris Jobke2018-06-011-1/+9
|\ \ \ | | | | | | | | [stable12] Make sure the log doesn't try to read from PUT if it can't
| * | | Make sure the log doesn't try to read from PUT if it can'tRoeland Jago Douma2018-05-301-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a PUT request comes in that is not JSON or from encoded. Then we can only read it (exactly) once. If that is the case we must assume no shared secret is set. If we don't then we either are the first to read it, thus causing the real read of the data to fail. Or we are later and then it throws an exception (also failing the request). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-06-0134-12/+146
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-3134-166/+138
|/ / /
* | | Merge pull request #9660 from nextcloud/backport/9653/stable12Morris Jobke2018-05-302-0/+89
|\ \ \ | | | | | | | | [stable12] The OAuth endpoint needs to support Basic Auth
| * | | The OAuth endpoint needs to support Basic AuthRoeland Jago Douma2018-05-292-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | * Add test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #9669 from nextcloud/backport/9666/stable12Morris Jobke2018-05-302-0/+26
|\ \ \ \ | | | | | | | | | | [stable12] Make sure the file is readable before attempting to create a preview
| * | | | Make sure the file is readable before attempting to create a previewRoeland Jago Douma2018-05-292-0/+26
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #9671 from nextcloud/drone-mysqlmb4-fix-stable12Morris Jobke2018-05-301-1/+1
|\ \ \ \ | | | | | | | | | | [stable12] Fix drone mysqlmb4 tests
| * | | | Fix drone mysqlmb4 testsJohn Molakvoæ (skjnldsv)2018-05-301-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / / / [tx-robot] updated from transifexNextcloud bot2018-05-3064-14/+106
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-05-2932-8/+44
| | |
* | | Merge pull request #9630 from nextcloud/backport/9627/stable12Roeland Jago Douma2018-05-281-1/+1
|\ \ \ | | | | | | | | [stable12] Limit Sinon version to 5.0.7 at most
| * | | Limit Sinon version to 5.0.7 at mostDaniel Calviño Sánchez2018-05-281-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using fake servers with Sinon.JS, the JavaScript test framework, the XHR objects are also fake. In Sinon 5.0.8 the "setRequestHeader" of XMLHttpRequest was modified to normalize the header values (as requested by the spec), but since then only string values are accepted; null or integer values can no longer be passed to "setRequestHeader", as it expects the "replace" function to be available in the object. However, in the tests null and integer values are passed to "setRequestHeader", which causes them to fail. Both Firefox and Chromium accept passing non-string values to their "setRequestHeader" implementation, and it is done, for example, in davclient.js; it is not clear yet whether Sinon got too restrictive or the code calling "setRequestHeader" was too loose. Given that davclient.js is an external dependency, as a temporary measure Sinon version is forced to be 5.0.7 at most until either Sinon or davclient.js are updated. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #9618 from nextcloud/backport/9515/stable12Roeland Jago Douma2018-05-281-0/+1
|\ \ \ | | | | | | | | [stable12] Regenerate session id after public share auth
| * | | Regenerate session id after public share authRoeland Jago Douma2018-05-261-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-2826-0/+74
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-27114-188/+252
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2018-05-2670-98/+214
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-05-25236-408/+582
| |
* | Merge pull request #9580 from ↵Morris Jobke2018-05-242-7/+48
|\ \ | | | | | | | | | | | | nextcloud/bugfix_stable12/noid/fix_force_language_html_attr [stable12] make sure force language is reflected in html lang attribute
| * | Always set the request language to the force languageRoeland Jago Douma2018-05-241-6/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | make sure force language is reflected in html lang attributeGeorg Ehrke2018-05-242-7/+49
|/ / | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | [tx-robot] updated from transifexNextcloud bot2018-05-24140-110/+502
| |
* | Merge pull request #9567 from nextcloud/backport/9395/stable12Roeland Jago Douma2018-05-231-9/+12
|\ \ | | | | | | [stable12] cleanup locks in scanner on error
| * | cleanup locks in scanner on errorRobin Appelman2018-05-231-9/+12
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>