summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow admins to override FreeBusy capabilities without modifying ShareAPI ↵Georg Ehrke2018-05-228-89/+172
| | | | | | capabilities Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* Merge pull request #9517 from nextcloud/feature/noid/improve_oauth_handlingRoeland Jago Douma2018-05-229-56/+518
|\ | | | | Improve OAuth handling
| * Add testsRoeland Jago Douma2018-05-222-40/+324
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Don't use special chars to avoid confusionRoeland Jago Douma2018-05-222-1/+8
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Rotate tokenRoeland Jago Douma2018-05-221-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-221-2/+45
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fail if the response type is not properly setRoeland Jago Douma2018-05-221-1/+10
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Set OAuth token expirationRoeland Jago Douma2018-05-225-2/+89
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9520 from nextcloud/3rdparty/noid/bump_phpseclibRoeland Jago Douma2018-05-221-0/+0
|\ \ | |/ |/| [3rdparty] Bump phpseclib to 2.0.11
| * [3rdparty] Bump phpseclib to 2.0.11Roeland Jago Douma2018-05-181-0/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9513 from nextcloud/3rdparty/noid/bump_autosizeRoeland Jago Douma2018-05-224-36/+11
|\ \ | | | | | | Bump autosize to 4.0.2
| * | Bump autosize to 4.0.2Roeland Jago Douma2018-05-174-36/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9515 from ↵Roeland Jago Douma2018-05-221-0/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/reset_session_when_auth_against_protected_share Regenerate session id after public share auth
| * | | Regenerate session id after public share authRoeland Jago Douma2018-05-171-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [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
| | | |
* | | | Merge pull request #9521 from ↵John Molakvoæ2018-05-192-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/add-firefox-profile-with-support-for-css-grid-to-acceptance-tests Add Firefox profile with support for CSS grid to acceptance tests
| * | | | Add Firefox profile with support for CSS grid to acceptance testsDaniel Calviño Sánchez2018-05-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The acceptance tests are currently run on Firefox 47; in that version the CSS grid support was not enabled by default, but it could be enabled through a setting in the Firefox profile. By default Selenium uses a clean Firefox profile when a new session is started, but it also allows the customization of the profile through a zipped "user.js" file. The contents of that file have to be provided in the "firefox_profile" capability when the Firefox session is created. In the Mink extension for Behat several Mink sessions can be defined in the "behat.yml" file. Each Mink session uses a different browser session in Selenium, and each of those browser sessions is initialized with the capabilities provided in the "behat.yml" file. From the point of view of the acceptance tests each Mink session is an actor, so different actors can use different browsers with different capabilities. Due to all this a new actor was introduced, "Rubeus", who uses a Firefox browser that has CSS grid support; this actor is meant to be used only in those acceptance tests that require proper support for CSS grids. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #9490 from marco44/faster_large_filehelper_32bitsRoeland Jago Douma2018-05-181-6/+14
|\ \ \ \ \ | |_|_|_|/ |/| | | | Make LargeFileHelper.php faster by avoiding execs as much as possible
| * | | | Make LargeFileHelper.php faster by avoiding execs as much as possiblemarco442018-05-171-6/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marc Cousin <cousinmarc@gmail.com>
* | | | | Merge pull request #9508 from nextcloud/3rdparty/noid/bump_symfonyRoeland Jago Douma2018-05-181-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | | [3rdparty] Bump symfony components
| * | | | [3rdparty] Bump symfony componentsRoeland Jago Douma2018-05-171-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-05-18330-458/+458
| |_|/ / |/| | |
* | | | Merge pull request #9437 from nextcloud/feature/noid/imprintRoeland Jago Douma2018-05-1710-20/+144
|\ \ \ \ | | | | | | | | | | allow to specify a link to a legal notice
| * | | | Use link not address in labels for URLsArthur Schiwon2018-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix undo for url-typed inputsArthur Schiwon2018-05-114-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and minor adjustments Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix testsArthur Schiwon2018-05-112-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | allow to specify a link to a legal noticeArthur Schiwon2018-05-098-16/+124
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #9491 from nextcloud/feature/noid/tokens_can_expireRoeland Jago Douma2018-05-1711-6/+220
|\ \ \ \ \ | |_|_|_|/ |/| | | | Allow token to expire
| * | | | Certain tokens can expireRoeland Jago Douma2018-05-1711-6/+220
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #9507 from nextcloud/dep/noid/update_dompurify_1_0_4Morris Jobke2018-05-173-8/+7
|\ \ \ \ | | | | | | | | | | Bump DOMPurify to 1.0.4
| * | | | Bump DOMPurity to 1.0.4Roeland Jago Douma2018-05-173-8/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9503 from nextcloud/bugfix/noid/theming-mime-checkMorris Jobke2018-05-172-8/+13
|\ \ \ \ \ | |_|_|/ / |/| | | | Check mime type properly in theming app
| * | | | Add Content-Disposition headerJulius Härtl2018-05-172-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Properly check mime type of the uploaded fileJulius Härtl2018-05-172-8/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-05-17232-524/+524
| |/ / / |/| | |
* | | | Merge pull request #9484 from nextcloud/feature/noid/support_rotating_tokensRoeland Jago Douma2018-05-165-2/+105
|\ \ \ \ | |_|_|/ |/| | | Allow the rotation of tokens
| * | | Allow the rotation of tokensRoeland Jago Douma2018-05-165-2/+105
|/ / / | | | | | | | | | | | | | | | This for example will allow rotating the apptoken for oauth Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9475 from ↵Morris Jobke2018-05-163-0/+20
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bug/9469/delete_preview_on_version_restore Delete the previews when a version is restored
| * | | Delete the previews when a version is restoredRoeland Jago Douma2018-05-143-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9469 When a version of a file is restored the previews are no longer valid. Thus we should remove them so they are regenerated. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9481 from nextcloud/techdep/noid/make_token_code_strictRoeland Jago Douma2018-05-158-104/+121
|\ \ \ | | | | | | | | Make the Token Auth code strict
| * | | Refix scopeRoeland Jago Douma2018-05-152-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix session testsRoeland Jago Douma2018-05-151-2/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Fix testsRoeland Jago Douma2018-05-156-30/+32
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make the Token Auth code strictRoeland Jago Douma2018-05-155-90/+94
|/ / / | | | | | | | | | | | | | | | In preparation for #9441 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9444 from nextcloud/techdep/noid/appframework_mapper_to_qbRoeland Jago Douma2018-05-145-2/+290
|\ \ \ | | | | | | | | Add a QueryBuilder based Mapper
| * | | The column is not user input so suppress the phan warningRoeland Jago Douma2018-05-141-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Move over TokenMapperRoeland Jago Douma2018-05-101-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 09:09:43 +0000