summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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>
* | Merge pull request #9493 from nextcloud/upgrade-from-oc-10.0.8Roeland Jago Douma2018-05-231-0/+1
|\ \ | |/ |/| Allow upgrades from ownCloud 10.0.8
| * Allow upgrades from ownCloud 10.0.8Morris Jobke2018-05-161-0/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9546 from nextcloud/backport/9517/stable12Morris Jobke2018-05-2318-64/+787
|\ \ | | | | | | [stable12] Improve OAuth
| * | Properly set expires to NULL when creating a tokenRoeland Jago Douma2018-05-231-0/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add testsRoeland Jago Douma2018-05-232-40/+324
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Don't use special chars to avoid confusionRoeland Jago Douma2018-05-232-1/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Rotate tokenRoeland Jago Douma2018-05-231-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | On a refresh token request: * rorate * reset expire Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Authenticate the clients on requesting a tokenRoeland Jago Douma2018-05-231-2/+45
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fail if the response type is not properly setRoeland Jago Douma2018-05-231-1/+10
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Set OAuth token expirationRoeland Jago Douma2018-05-233-2/+87
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Certain tokens can expireRoeland Jago Douma2018-05-2311-6/+172
| | | | | | | | | | | | | | | | | | | | | | | | However due to the nature of what we store in the token (encrypted passwords etc). We can't just delete the tokens because that would make the oauth refresh useless. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Allow the rotation of tokensRoeland Jago Douma2018-05-235-2/+96
|/ / | | | | | | | | | | This for example will allow rotating the apptoken for oauth Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-05-23482-21942/+24006
| |
* | Merge pull request #9549 from remyj38/stable12Morris Jobke2018-05-221-0/+3
|\ \ | | | | | | [stable12] Fix translation bug on lost password page
| * | Fix translation bug on lost password pageRémy Jacquin2018-05-221-0/+3
| | | | | | | | | | | | | | | | | | Fix nextcloud/password_policy#26 Signed-off-by: Rémy Jacquin <remy@remyj.fr>
* | | [tx-robot] updated from transifexNextcloud bot2018-05-2234-38/+166
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-05-212-0/+4
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-05-2010-2/+28
| |
* | [tx-robot] updated from transifexNextcloud bot2018-05-1914-0/+72
| |
* | [tx-robot] updated from transifexNextcloud bot2018-05-18330-458/+458
| |
* | [tx-robot] updated from transifexNextcloud bot2018-05-17232-524/+524
|/
* [tx-robot] updated from transifexNextcloud bot2018-05-146-0/+14
|
* [tx-robot] updated from transifexNextcloud bot2018-05-1388-86/+88
|
* [tx-robot] updated from transifexNextcloud bot2018-05-1238-104/+230
|
* [tx-robot] updated from transifexNextcloud bot2018-05-1110-0/+22
|
* [tx-robot] updated from transifexNextcloud bot2018-05-1038-58/+428
|
* Merge pull request #9431 from nextcloud/stable12-9407Morris Jobke2018-05-091-1/+1
|\ | | | | [12] Fix jsunit tests
| * Fix jsunit testsJulius Härtl2018-05-091-1/+1
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2018-05-0928-2/+76
|
* [tx-robot] updated from transifexNextcloud bot2018-05-08146-132/+202
|
* [tx-robot] updated from transifexNextcloud bot2018-05-0712-0/+22
|
* [tx-robot] updated from transifexNextcloud bot2018-05-0612-0/+32
|
* [tx-robot] updated from transifexNextcloud bot2018-05-0520-4/+38
|
* [tx-robot] updated from transifexNextcloud bot2018-05-04126-214/+228
|
* [tx-robot] updated from transifexNextcloud bot2018-05-0318-0/+20
|