summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * | Bump autoloaderRoeland Jago Douma2018-05-102-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add a QueryBuilder MapperRoeland Jago Douma2018-05-102-1/+284
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9442 from nextcloud/feature/noid/use_composer_apcuRoeland Jago Douma2018-05-142-29/+31
|\ \ \ | |_|/ |/| | Use APCu caching of composer
| * | Bump integration test imageRoeland Jago Douma2018-05-141-29/+29
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Use APCu caching of composerRoeland Jago Douma2018-05-101-0/+2
| |/ | | | | | | | | | | | | Should potentially shave of a few ms when loading classes of apps that don't ship their own autoloader. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9420 from nextcloud/feature/5263/cleanup_previesMorris Jobke2018-05-1421-74/+353
|\ \ | | | | | | Cleanup previews in the background
| * | Add testsRoeland Jago Douma2018-05-141-0/+159
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move to joinRoeland Jago Douma2018-05-141-8/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix testsRoeland Jago Douma2018-05-148-12/+25
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Kill the dete preview watcherRoeland Jago Douma2018-05-142-51/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code had the potential to time out. If a huge folder with pictures for example was deleted then this could easily grow the number of files to clean with a factor 5 (or more). Now the previews just get cleaned up in the background. Which is good enough for the 99% case As a bonus this now also keeps the previews when in the trashbin so you don't have a spiking server load when a user opens the trashbin view. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add the jobRoeland Jago Douma2018-05-146-2/+58
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add backgroundcleanup jobRoeland Jago Douma2018-05-141-0/+91
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Make Appdata staticRoeland Jago Douma2018-05-143-9/+16
| | | | | | | | | | | | | | | | | | * Add fileid for simpleroot folders (only internal) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9446 from ↵Morris Jobke2018-05-147-2/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/9416/fileid_trashbin_dav_endpoint Support fileid propfind on trash endpoint
| * | | Support fileid propfind on trash endpointRoeland Jago Douma2018-05-117-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9416 In order to support previews on mobile clients they will need the fileid of files in the trashbin. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | 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 endpoint
| * | | Move the webui over to the new dav endpointRoeland Jago Douma2018-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We should use the new dav endpoint everywhere now. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #9464 from nextcloud/fix/noid/version_expiration_DIMorris Jobke2018-05-144-28/+8
|\ \ \ \ | | | | | | | | | | Use more magic DI in files_versions
| * | | | Use more magic DI in files_versionsRoeland Jago Douma2018-05-114-28/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | There is no need to register this. The system can figure out by itself what it needs to do :) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [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
|\ \ \ \ | | | | | | | | | | Ldap password renewal fixes for NC13
| * | | | Remove unneeded semicolon and parenthesesRoger Szabo2018-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | css indent alignmentRoger Szabo2018-04-251-70/+87
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | adjust css to nc13 core changesRoger Szabo2018-04-241-5/+107
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * | | | remove reset password linkRoger Szabo2018-04-241-6/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | | | | [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:size
| * | | | Trashbin propfind respond to oc:sizeRoeland Jago Douma2018-05-104-0/+14
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | In order to display the total size of folders also in the clients (and web) we should return the oc:size. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / | | [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
|\ \ \ | | | | | | | | Fix "Invalid argument supplied for foreach()"
| * | | adjust unit tests for \"Invalid argument supplied for foreach()\" fixRoger Szabo2018-05-091-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>