summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2980 from nextcloud/backport-2930-kill-group-restriction-...v11.0.1RC1Morris Jobke2017-01-103-0/+32
|\
| * Remove group restrictions when those are not allowed anymoreJoas Schilling2017-01-093-0/+32
* | Merge pull request #2994 from nextcloud/stable11_2987Morris Jobke2017-01-103-8/+23
|\ \
| * | dont write a certificate bundle if the shipped ca bundle is emptyRobin Appelman2017-01-093-8/+23
* | | Merge pull request #2993 from nextcloud/stable11-rc1Christoph Wurst2017-01-091-2/+2
|\ \ \ | |/ / |/| |
| * | Increase version to 11.0.1 RC1Lukas Reschke2017-01-091-2/+2
|/ /
* | Merge pull request #2981 from nextcloud/backport-2854-2fa-redirect-urlRoeland Jago Douma2017-01-092-0/+2
|\ \
| * | Set redirect_url on 2FA challenge pageChristoph Wurst2017-01-092-0/+2
| |/
* | Merge pull request #2988 from nextcloud/backport-2933-dont-link-to-oc-forumMorris Jobke2017-01-091-1/+1
|\ \ | |/ |/|
| * Don't link to the oC forumJoas Schilling2017-01-091-1/+1
|/
* [tx-robot] updated from transifexNextcloud bot2017-01-0960-416/+914
* [tx-robot] updated from transifexNextcloud bot2017-01-0538-184/+464
* Merge pull request #2949 from nextcloud/backport-2677-fix-avatars-in-mailMorris Jobke2017-01-054-2/+196
|\
| * Don't set Content-Disposition header if one already existsLukas Reschke2017-01-054-2/+196
* | [tx-robot] updated from transifexNextcloud bot2017-01-0444-48/+838
|/
* [tx-robot] updated from transifexNextcloud bot2017-01-038-0/+82
* [tx-robot] updated from transifexNextcloud bot2017-01-0230-400/+762
* [tx-robot] updated from transifexNextcloud bot2017-01-014-2/+76
* [tx-robot] updated from transifexNextcloud bot2016-12-318-4/+8
* Merge pull request #2882 from nextcloud/stable11-updateRoeland Jago Douma2016-12-304-8/+34
|\
| * Increase version to 11.0.1Lukas Reschke2016-12-294-8/+34
* | [tx-robot] updated from transifexNextcloud bot2016-12-3024-86/+738
|/
* [tx-robot] updated from transifexNextcloud bot2016-12-2936-114/+558
* [tx-robot] updated from transifexNextcloud bot2016-12-2830-46/+968
* [tx-robot] updated from transifexNextcloud bot2016-12-2730-0/+94
* [tx-robot] updated from transifexNextcloud bot2016-12-26548-4248/+4162
* Merge pull request #2825 from nextcloud/stable11-2659Morris Jobke2016-12-221-3/+3
|\
| * Fix overwriting parameterRoeland Jago Douma2016-12-221-3/+3
* | Merge pull request #2804 from nextcloud/backport-2752-firefox-password-comple...Roeland Jago Douma2016-12-221-3/+3
|\ \
| * | Use a form so firefox doesn't try to save the space as a passwordJoas Schilling2016-12-211-3/+3
* | | Merge pull request #2751 from nextcloud/backport-2643-apps-buttons-wordingMorris Jobke2016-12-222-2/+2
|\ \ \
| * | | fix wording for apps mgmt buttonsJan-Christoph Borchardt2016-12-192-2/+2
* | | | Merge pull request #2750 from nextcloud/backport-2671-reduce-log-level-on-dat...Morris Jobke2016-12-221-1/+1
|\ \ \ \
| * | | | Only log as info when we can not create a new DB userJoas Schilling2016-12-191-1/+1
| |/ / /
* | | | Merge pull request #2807 from nextcloud/stable11-2273Lukas Reschke2016-12-225-0/+452
|\ \ \ \
| * | | | Add DAV repair step to fix calendar dataRoeland Jago Douma2016-12-215-0/+452
| | |_|/ | |/| |
* | | | Merge pull request #2809 from nextcloud/stable11-2757Lukas Reschke2016-12-221-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Also check in cron for old php versionRoeland Jago Douma2016-12-211-0/+7
|/ / /
* | | Merge pull request #2805 from nextcloud/stable11-2714Morris Jobke2016-12-211-1/+1
|\ \ \ | |_|/ |/| |
| * | Changed anchoramittel2016-12-211-1/+1
|/ /
* | Merge pull request #2793 from nextcloud/stable11-update-drone-imagesMorris Jobke2016-12-211-28/+28
|\ \ | |/ |/|
| * [stable11] update drone images to latest versionMorris Jobke2016-12-201-28/+28
|/
* Merge pull request #2746 from nextcloud/backport-2625Roeland Jago Douma2016-12-192-4/+4
|\
| * Fix TodoTestRoeland Jago Douma2016-12-191-3/+3
| * Fix the Todos filterJoas Schilling2016-12-191-1/+1
|/
* Merge pull request #2703 from nextcloud/enoch85-patch-2Roeland Jago Douma2016-12-161-1/+1
|\
| * Do not connect to database before creating itJoas Schilling2016-12-151-1/+1
* | Merge pull request #2696 from nextcloud/shared-scanner-unmasked-11Lukas Reschke2016-12-164-3/+57
|\ \
| * | Add integration tests for uploading files to a permission limited shareRobin Appelman2016-12-151-0/+20
| * | use unmasked permissions in shared scannerRobin Appelman2016-12-153-3/+37