summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5924 from nextcloud/12.0.1rc4v12.0.1RC4Lukas Reschke2017-07-301-2/+2
|\
| * 12.0.1RC4Lukas Reschke2017-07-281-2/+2
* | [tx-robot] updated from transifexNextcloud bot2017-07-3030-32/+402
* | [tx-robot] updated from transifexNextcloud bot2017-07-2932-24/+268
|/
* Merge pull request #5919 from nextcloud/add-brackets-on-concat-methodLukas Reschke2017-07-282-2/+2
|\
| * Add brackets around concat statements so comparing the result works as intendedJoas Schilling2017-07-282-2/+2
* | [tx-robot] updated from transifexNextcloud bot2017-07-2820-4/+22
* | Merge pull request #5902 from nextcloud/oc-migrationv12.0.1RC3Morris Jobke2017-07-276-5/+69
|\ \
| * | Use the existing array of OC versionsJoas Schilling2017-07-271-3/+1
| * | This is RC3Lukas Reschke2017-07-271-1/+1
| * | Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-07-275-1/+67
| |/
* | Merge pull request #5896 from nextcloud/12-5895Morris Jobke2017-07-271-1/+1
|\ \ | |/ |/|
| * Fix show password button for password changeMorris Jobke2017-07-261-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-07-2716-132/+332
|/
* Merge pull request #5883 from nextcloud/12-5871Morris Jobke2017-07-261-1/+1
|\
| * Enable postgres on drone againMorris Jobke2017-07-261-1/+1
* | Merge pull request #5889 from nextcloud/stable12-overlay-on-show-passwordv12.0.1RC2Lukas Reschke2017-07-261-1/+1
|\ \
| * | fix overlay on show passwordMaxence Lange2017-07-261-1/+1
| |/
* | Merge pull request #5875 from nextcloud/stable12-edu-editionMorris Jobke2017-07-266-0/+99
|\ \ | |/ |/|
| * Add new bundleLukas Reschke2017-07-266-0/+99
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-2626-84/+210
* Merge pull request #5851 from nextcloud/make-it-rc2Lukas Reschke2017-07-251-2/+2
|\
| * v12.0.1 RC2Lukas Reschke2017-07-241-2/+2
* | [tx-robot] updated from transifexNextcloud bot2017-07-2556-18/+366
|/
* Merge pull request #5858 from nextcloud/12-5850Morris Jobke2017-07-245-6/+6
|\
| * Remove unneeded stylesMorris Jobke2017-07-245-6/+6
| * Adjust to height=120Lukas Reschke2017-07-245-6/+6
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-2462-112/+484
* Merge pull request #5830 from nextcloud/12-5812Roeland Jago Douma2017-07-232-37/+39
|\
| * add tests for renaming paths with multibyte utf8 charactersRobin Appelman2017-07-221-36/+38
| * Fix for mb strlenArtem Kochnev2017-07-221-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-07-2334-130/+356
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-2256-4/+162
* Merge pull request #5826 from nextcloud/12-backport-5821Morris Jobke2017-07-211-1/+1
|\
| * Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
* | Merge pull request #5757 from nextcloud/mount-rename-12Morris Jobke2017-07-212-11/+14
|\ \
| * | fix parsing of dav permissionsRobin Appelman2017-07-171-3/+2
| * | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
* | | Merge pull request #5786 from nextcloud/path-repair-steps-storage-12Morris Jobke2017-07-213-5/+41
|\ \ \ | |_|/ |/| |
| * | Also repair storage id's when repairing invalid entriesRobin Appelman2017-07-193-5/+41
* | | Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12Roeland Jago Douma2017-07-211-2/+7
|\ \ \
| * | | still remove the federated share even if we cant notify the remoteRobin Appelman2017-07-171-2/+7
| | |/ | |/|
* | | Merge pull request #5792 from nextcloud/stable12-prevent-php7.2-usageRoeland Jago Douma2017-07-212-0/+16
|\ \ \
| * | | Show warning if PHP 7.2 is usedLukas Reschke2017-07-212-0/+16
* | | | Merge pull request #5805 from nextcloud/fix-public-links-stable12Roeland Jago Douma2017-07-211-1/+3
|\ \ \ \
| * | | | fix preview for public linksBjoern Schiessle2017-07-201-1/+3
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-21350-1080/+460
* | | | | Merge pull request #5807 from nextcloud/12-backport-5790Morris Jobke2017-07-201-5/+1
|\ \ \ \ \
| * | | | | Fix config.sample.php documentationMorris Jobke2017-07-201-5/+1
| |/ / / /
* | | | | Merge pull request #5630 from nextcloud/add-recovery-key-on-public-upload-sta...Björn Schießle2017-07-201-2/+21
|\ \ \ \ \