summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9846 from nextcloud/feature/noid/add_stricter_cspsJohn Molakvoæ2018-06-136-2/+198
|\
| * Add stricter CSPsRoeland Jago Douma2018-06-136-2/+198
* | Merge pull request #9859 from nextcloud/fix/noid/iconcontroller_timing_fixMorris Jobke2018-06-132-8/+4
|\ \
| * | Fix possible test timing issues in IconControllerRoeland Jago Douma2018-06-132-8/+4
| |/
* | Merge pull request #9855 from nextcloud/feature/noid/cleanup-old-updater-back...Roeland Jago Douma2018-06-135-0/+144
|\ \
| * | Background job to clean up old backups of the updaterMorris Jobke2018-06-135-0/+144
| |/
* | Merge pull request #9852 from nextcloud/feature/noid/merge-setup-checks-into-...Morris Jobke2018-06-138-240/+374
|\ \ | |/ |/|
| * Merge all setup checks into one controllerMorris Jobke2018-06-138-240/+374
|/
* Merge pull request #9836 from nextcloud/feature/noid/merge-tips-and-tricks-in...Morris Jobke2018-06-1315-246/+69
|\
| * Merge tips & tricks section into setup checksMorris Jobke2018-06-1315-246/+69
* | Merge pull request #9850 from nextcloud/fix/noid/setup-check-empty-indexMorris Jobke2018-06-134-19/+25
|\ \ | |/ |/|
| * Fix wrong hint about missing indexesMorris Jobke2018-06-134-19/+25
* | Merge pull request #9833 from nextcloud/dependabot/composer/build/integration...John Molakvoæ2018-06-1312-71/+82
|\ \
| * | Fixed phpunit Test classJohn Molakvoæ (skjnldsv)2018-06-1311-70/+81
| * | Update phpunit/phpunit requirement to ~6.5 in /build/integrationdependabot[bot]2018-06-131-1/+1
|/ /
* / [tx-robot] updated from transifexNextcloud bot2018-06-13196-1634/+1856
|/
* Merge pull request #9834 from nextcloud/copy-fixJohn Molakvoæ2018-06-1230-48/+460
|\
| * Fixed testsJohn Molakvoæ (skjnldsv)2018-06-123-4/+3
| * Indent fix and copy2John Molakvoæ (skjnldsv)2018-06-122-10/+17
| * Copyright fix, changed vue settings output name and fixes template nameJohn Molakvoæ (skjnldsv)2018-06-1227-23/+429
* | Merge pull request #9828 from nextcloud/gc-s3-listMorris Jobke2018-06-121-0/+5
|\ \
| * | Fix listing s3 objects when using google cloud aws compatibilityRobin Appelman2018-06-111-0/+5
* | | [tx-robot] updated from transifexNextcloud bot2018-06-1256-2/+158
* | | Merge pull request #9473 from nextcloud/dav-upload-no-partfile-lockMorris Jobke2018-06-111-15/+23
|\ \ \ | |/ / |/| |
| * | properly lock the target file on dav upload when not using part filesRobin Appelman2018-06-111-15/+23
|/ /
* | Merge pull request #9558 from nextcloud/fix/9489/trashbin_previewsMorris Jobke2018-06-115-55/+73
|\ \ | |/ |/|
| * Previews on for all trashbin filesRoeland Jago Douma2018-06-055-55/+73
* | Merge pull request #9814 from nextcloud/bugfix/6032/delete_group_with_slashMorris Jobke2018-06-111-1/+1
|\ \
| * | Make the DELETION of groups match greedy on the groupIDRoeland Jago Douma2018-06-091-1/+1
* | | Merge pull request #9810 from nextcloud/tests/9769/apps-management-acceptanceJohn Molakvoæ2018-06-1110-5/+354
|\ \ \
| * | | Update asettings bundled javascriptJulius Härtl2018-06-092-2/+2
| * | | Add key and fix disabled apps listingJulius Härtl2018-06-091-2/+2
| * | | Properly check for the sidebarJulius Härtl2018-06-092-3/+26
| * | | Add category field to apps that are only known from the app storeJulius Härtl2018-06-091-0/+1
| * | | Add basic acceptance tests for apps managementJulius Härtl2018-06-096-1/+326
* | | | Merge pull request #9807 from nextcloud/fix-highlighting-of-the-upload-drop-zoneJohn Molakvoæ2018-06-112-16/+36
|\ \ \ \
| * | | | Do not show an error message when draging and dropping textDaniel Calviño Sánchez2018-06-081-0/+10
| * | | | Remove no longer needed special handling for FirefoxDaniel Calviño Sánchez2018-06-081-15/+8
| * | | | Use "dropnofiles" callback to disable the drop state in the UIDaniel Calviño Sánchez2018-06-081-0/+10
| * | | | Add callback to clean up after misbehaved drag and drop eventsDaniel Calviño Sánchez2018-06-081-0/+12
| * | | | Remove duplicated codeDaniel Calviño Sánchez2018-06-081-6/+1
* | | | | Merge pull request #9798 from nextcloud/bugfix/noid/enable_caldav_for_public_...Morris Jobke2018-06-111-1/+1
|\ \ \ \ \
| * | | | | enable caldav for webdav subtree public-calendarsGeorg Ehrke2018-06-081-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-116-0/+18
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-1010-4/+32
| |_|_|/ / |/| | | |
* | | | | Merge pull request #9802 from nextcloud/bugfix/noid/token_check_expire_betterMorris Jobke2018-06-091-1/+1
|\ \ \ \ \
| * | | | | Make the token expiration also work for autocasting 0Roeland Jago Douma2018-06-081-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-06-0932-0/+108
* | | | | | Merge pull request #9793 from nextcloud/fix-mention-regexJohn Molakvoæ2018-06-082-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add another testMario Danic2018-06-081-1/+3