summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9484 from nextcloud/feature/noid/support_rotating_tokensRoeland Jago Douma2018-05-165-2/+105
|\
| * Allow the rotation of tokensRoeland Jago Douma2018-05-165-2/+105
|/
* Merge pull request #9475 from nextcloud/bug/9469/delete_preview_on_version_re...Morris Jobke2018-05-163-0/+20
|\
| * Delete the previews when a version is restoredRoeland Jago Douma2018-05-143-0/+20
* | Merge pull request #9481 from nextcloud/techdep/noid/make_token_code_strictRoeland Jago Douma2018-05-158-104/+121
|\ \
| * | Refix scopeRoeland Jago Douma2018-05-152-3/+5
| * | Fix session testsRoeland Jago Douma2018-05-151-2/+11
| * | Fix testsRoeland Jago Douma2018-05-156-30/+32
| * | Make the Token Auth code strictRoeland Jago Douma2018-05-155-90/+94
|/ /
* | Merge pull request #9444 from nextcloud/techdep/noid/appframework_mapper_to_qbRoeland Jago Douma2018-05-145-2/+290
|\ \
| * | The column is not user input so suppress the phan warningRoeland Jago Douma2018-05-141-0/+2
| * | Move over TokenMapperRoeland Jago Douma2018-05-101-1/+2
| * | Bump autoloaderRoeland Jago Douma2018-05-102-0/+2
| * | Add a QueryBuilder MapperRoeland Jago Douma2018-05-102-1/+284
* | | Merge pull request #9442 from nextcloud/feature/noid/use_composer_apcuRoeland Jago Douma2018-05-142-29/+31
|\ \ \ | |_|/ |/| |
| * | Bump integration test imageRoeland Jago Douma2018-05-141-29/+29
| * | Use APCu caching of composerRoeland Jago Douma2018-05-101-0/+2
| |/
* | Merge pull request #9420 from nextcloud/feature/5263/cleanup_previesMorris Jobke2018-05-1421-74/+353
|\ \
| * | Add testsRoeland Jago Douma2018-05-141-0/+159
| * | Move to joinRoeland Jago Douma2018-05-141-8/+8
| * | Fix testsRoeland Jago Douma2018-05-148-12/+25
| * | Kill the dete preview watcherRoeland Jago Douma2018-05-142-51/+4
| * | Add the jobRoeland Jago Douma2018-05-146-2/+58
| * | Add backgroundcleanup jobRoeland Jago Douma2018-05-141-0/+91
| * | Make Appdata staticRoeland Jago Douma2018-05-143-9/+16
* | | Merge pull request #9446 from nextcloud/feature/9416/fileid_trashbin_dav_endp...Morris Jobke2018-05-147-2/+26
|\ \ \
| * | | Support fileid propfind on trash endpointRoeland Jago Douma2018-05-117-2/+26
* | | | Merge pull request #9429 from nextcloud/feature/noid/move_webui_to_new_davMorris Jobke2018-05-141-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Move the webui over to the new dav endpointRoeland Jago Douma2018-05-081-1/+1
* | | | Merge pull request #9464 from nextcloud/fix/noid/version_expiration_DIMorris Jobke2018-05-144-28/+8
|\ \ \ \
| * | | | Use more magic DI in files_versionsRoeland Jago Douma2018-05-114-28/+8
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-146-0/+14
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-1388-86/+88
* | | | Merge pull request #9288 from GitHubUser4234/ldap_password_renew_nc13fixRoeland Jago Douma2018-05-122-10/+125
|\ \ \ \
| * | | | Remove unneeded semicolon and parenthesesRoger Szabo2018-04-251-1/+1
| * | | | css indent alignmentRoger Szabo2018-04-251-70/+87
| * | | | adjust css to nc13 core changesRoger Szabo2018-04-241-5/+107
| * | | | remove reset password linkRoger Szabo2018-04-241-6/+2
* | | | | [tx-robot] updated from transifexNextcloud bot2018-05-1238-104/+230
| |/ / / |/| | |
* | | | Merge pull request #9447 from nextcloud/feature/noid/trashbin_propfind_oc_sizeRoeland Jago Douma2018-05-114-0/+14
|\ \ \ \
| * | | | Trashbin propfind respond to oc:sizeRoeland Jago Douma2018-05-104-0/+14
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexNextcloud bot2018-05-1110-0/+22
|/ / /
* | | Merge pull request #9360 from GitHubUser4234/ldap_password_renew_invarg_fixRoeland Jago Douma2018-05-102-6/+6
|\ \ \
| * | | adjust unit tests for \"Invalid argument supplied for foreach()\" fixRoger Szabo2018-05-091-4/+4
| * | | Fix "Invalid argument supplied for foreach()"Roger Szabo2018-05-021-2/+2
* | | | Merge pull request #9427 from nextcloud/bugfix/noid/no_listing_if_not_in_debu...Roeland Jago Douma2018-05-102-2/+9
|\ \ \ \
| * | | | If not in debug disable principal listingRoeland Jago Douma2018-05-082-2/+9
* | | | | [tx-robot] updated from transifexNextcloud bot2018-05-1038-58/+428
* | | | | Merge pull request #9390 from nextcloud/bugfix/noid/no-body-for-no-contentblizzz2018-05-091-3/+55
|\ \ \ \ \
| * | | | | Do not send a body for "No content", "Not modified" and othersJoas Schilling2018-05-041-3/+55
| | |/ / / | |/| | |