summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | display error icon on non-successMaxence Lange2017-07-313-6/+26
* | | | | | Merge pull request #5914 from nextcloud/12-5913Morris Jobke2017-08-081-1/+1
|\ \ \ \ \ \
| * | | | | | Fix anchor name for federated sharing settingsMorris Jobke2017-07-281-1/+1
* | | | | | | Merge pull request #5945 from nextcloud/stable12_5836Morris Jobke2017-08-081-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Empty search no longer worksRoeland Jago Douma2017-08-011-1/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-ligh...Morris Jobke2017-08-081-4/+7
|\ \ \ \ \ \ \
| * | | | | | | Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-041-4/+7
* | | | | | | | Merge pull request #5925 from derkostka/patch-1Morris Jobke2017-08-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [Stable 12] Removed cast to integer in getSizeSebastian Kostka2017-07-291-1/+1
* | | | | | | | | Merge pull request #6001 from nextcloud/backport-5695-dont-throw-when-table-i...Joas Schilling2017-08-081-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't throw an error when the table doesn't existJoas Schilling2017-08-071-0/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* / | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-0818-42/+740
|/ / / / / / / /
* | | | | | | | Merge pull request #5989 from nextcloud/final-version-bump-stable12v12.0.1Lukas Reschke2017-08-061-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump version to 12.0.5Lukas Reschke2017-08-051-2/+2
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-08-068-4/+16
|/ / / / / / / /
* | / / / / / / [tx-robot] updated from transifexNextcloud bot2017-08-05158-270/+350
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #5983 from nextcloud/revert-5977-stable12-theming-lightnes...v12.0.1RC5Lukas Reschke2017-08-041-7/+4
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | Use same lightness calculation as the SCSS compiler for themingJulius Härtl2017-08-041-4/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #5976 from nextcloud/12.0.1rc5Lukas Reschke2017-08-041-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | v12.0.1RC5Lukas Reschke2017-08-041-2/+2
|/ / / / / /
* | | | | / [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.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