summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-05158-270/+350
|
* Merge pull request #5983 from ↵v12.0.1RC5Lukas Reschke2017-08-041-7/+4
|\ | | | | | | | | nextcloud/revert-5977-stable12-theming-lightness-correction Revert "[stable12] theming lightness correction"
| * Revert "[stable12] theming lightness correction"Lukas Reschke2017-08-041-7/+4
|/
* Merge pull request #5977 from nextcloud/stable12-theming-lightness-correctionLukas Reschke2017-08-041-4/+7
|\ | | | | [stable12] theming lightness correction
| * Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-041-4/+7
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #5976 from nextcloud/12.0.1rc5Lukas Reschke2017-08-041-2/+2
|\ \ | |/ |/| v12.0.1RC5
| * v12.0.1RC5Lukas Reschke2017-08-041-2/+2
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-08-0462-176/+246
|
* [tx-robot] updated from transifexNextcloud bot2017-08-0340-6/+158
|
* [tx-robot] updated from transifexNextcloud bot2017-08-02116-192/+614
|
* [tx-robot] updated from transifexNextcloud bot2017-08-0134-42/+62
|
* [tx-robot] updated from transifexNextcloud bot2017-07-316-0/+38
|
* Merge pull request #5924 from nextcloud/12.0.1rc4v12.0.1RC4Lukas Reschke2017-07-301-2/+2
|\ | | | | 12.0.1RC4
| * 12.0.1RC4Lukas Reschke2017-07-281-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [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 a…
| * Add brackets around concat statements so comparing the result works as intendedJoas Schilling2017-07-282-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [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
|\ \ | | | | | | Add a repair step to drop the account_terms table on oc migration
| * | Use the existing array of OC versionsJoas Schilling2017-07-271-3/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | This is RC3Lukas Reschke2017-07-271-1/+1
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-07-275-1/+67
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5896 from nextcloud/12-5895Morris Jobke2017-07-271-1/+1
|\ \ | |/ |/| [stable12] Fix show password button for password change
| * Fix show password button for password changeMorris Jobke2017-07-261-1/+1
| | | | | | | | | | | | | | | | * fix the show password button on the personal page * before: if the password change failed the show password icon was not shown again * after: show password icon is visible Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-07-2716-132/+332
|/
* Merge pull request #5883 from nextcloud/12-5871Morris Jobke2017-07-261-1/+1
|\ | | | | [stable12] Enable postgres on drone again
| * Enable postgres on drone againMorris Jobke2017-07-261-1/+1
| | | | | | | | | | | | * use proper password Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5889 from nextcloud/stable12-overlay-on-show-passwordv12.0.1RC2Lukas Reschke2017-07-261-1/+1
|\ \ | | | | | | fix overlay on show password
| * | fix overlay on show passwordMaxence Lange2017-07-261-1/+1
| |/ | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | Merge pull request #5875 from nextcloud/stable12-edu-editionMorris Jobke2017-07-266-0/+99
|\ \ | |/ |/| [stable12] Add new bundle
| * Add new bundleLukas Reschke2017-07-266-0/+99
|/ | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* [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 RC2
| * v12.0.1 RC2Lukas Reschke2017-07-241-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | [tx-robot] updated from transifexNextcloud bot2017-07-2556-18/+366
|/
* Merge pull request #5858 from nextcloud/12-5850Morris Jobke2017-07-245-6/+6
|\ | | | | [stable12] proper logo height in emails for Outlook
| * Remove unneeded stylesMorris Jobke2017-07-245-6/+6
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Adjust to height=120Lukas Reschke2017-07-245-6/+6
|/ | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-07-2462-112/+484
|
* Merge pull request #5830 from nextcloud/12-5812Roeland Jago Douma2017-07-232-37/+39
|\ | | | | [stable12] Fix for mb strlen
| * add tests for renaming paths with multibyte utf8 charactersRobin Appelman2017-07-221-36/+38
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Fix for mb strlenArtem Kochnev2017-07-221-1/+1
| | | | | | Error with moving files with long names in UTF-8
* | [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
|\ | | | | [stable12] Fix error message on untrusted domain error page
| * Fix error message on untrusted domain error pageMorris Jobke2017-07-211-1/+1
| | | | | | | | | | | | Fixes #5347 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5757 from nextcloud/mount-rename-12Morris Jobke2017-07-212-11/+14
|\ \ | | | | | | [12] Fix renaming of non-renamble mounts
| * | fix parsing of dav permissionsRobin Appelman2017-07-171-3/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | non movable mounts can not be movedRobin Appelman2017-07-171-8/+12
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>