summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12375 from nextcloud/backport/12284/stable14Morris Jobke2018-11-131-1/+1
|\
| * Properly search the root of a shared external storageRoeland Jago Douma2018-11-091-1/+1
* | Merge pull request #12431 from nextcloud/stb14-ie11-width-fixMorris Jobke2018-11-131-1/+1
|\ \
| * | Fix IE rule for min widthJohn Molakvoæ (skjnldsv)2018-11-131-1/+1
* | | Merge pull request #12433 from nextcloud/backport/12411-12413/unique-constrai...Morris Jobke2018-11-132-8/+30
|\ \ \ | |/ / |/| |
| * | Fix UniqueConstraintViolationException while insert into oc_file_locksMorris Jobke2018-11-131-1/+12
| * | Fix UniqueConstraintViolationException while insert into oc_filecacheMorris Jobke2018-11-131-7/+18
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-11-13256-288/+336
* | Merge pull request #12416 from nextcloud/stb14-admin-vue-approval-fixMorris Jobke2018-11-126-45/+26
|\ \
| * | Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-126-45/+26
* | | Merge pull request #12412 from nextcloud/backport/12358/fix-update-checkMorris Jobke2018-11-128-23/+35
|\ \ \ | |/ / |/| |
| * | Adjust unit testsJoas Schilling2018-11-122-7/+11
| * | Improve style of incompatible apps listMorris Jobke2018-11-121-0/+4
| * | Use the version number when checking the appstore for compatible updatesJoas Schilling2018-11-125-9/+38
| * | Fix overlapping update button in notificationsMorris Jobke2018-11-123-32/+7
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-11-1214-2/+46
* | [tx-robot] updated from transifexNextcloud bot2018-11-1110-4/+28
* | [tx-robot] updated from transifexNextcloud bot2018-11-10122-444/+506
* | Merge pull request #12374 from nextcloud/backport/12342/stable14Roeland Jago Douma2018-11-091-0/+5
|\ \ | |/ |/|
| * Add fix for IE11 flexbox height bugJulius Härtl2018-11-091-0/+5
|/
* [tx-robot] updated from transifexNextcloud bot2018-11-09144-330/+400
* Merge pull request #12353 from nextcloud/backport/11838/fix-default-types-of-...Morris Jobke2018-11-081-6/+6
|\
| * Fix default types of activity event member variablesJoas Schilling2018-11-081-6/+6
|/
* Merge pull request #12339 from nextcloud/bugfix/12007Roeland Jago Douma2018-11-081-0/+6
|\
| * fix - Add to favorites not working in IE11 - polyfill needed #12007Yevhenii Kostiuk2018-11-081-0/+6
|/
* Merge pull request #12341 from nextcloud/stb14-ie11-function-fixRoeland Jago Douma2018-11-081-1/+3
|\
| * Remove arrow function for ie compatibilityJohn Molakvoæ (skjnldsv)2018-11-071-1/+3
* | [tx-robot] updated from transifexNextcloud bot2018-11-0850-68/+98
|/
* Merge pull request #12331 from nextcloud/backport/12306/stable14Morris Jobke2018-11-074-8/+11
|\
| * Build settingsRoeland Jago Douma2018-11-072-2/+2
| * Show disabled even if empty if ldap enabledJohn Molakvoæ (skjnldsv)2018-11-072-6/+9
|/
* [tx-robot] updated from transifexNextcloud bot2018-11-0764-66/+166
* Merge pull request #12297 from nextcloud/backport/12127/stable14Morris Jobke2018-11-061-0/+5
|\
| * A folder should get a folder mimetypeRoeland Jago Douma2018-11-061-0/+5
* | Merge pull request #12300 from nextcloud/backport/12230/stable14Morris Jobke2018-11-063-20/+13
|\ \
| * | Fix testsRoeland Jago Douma2018-11-062-20/+10
| * | Do not log FileLock as exceptionRoeland Jago Douma2018-11-061-0/+3
| |/
* | Merge pull request #12299 from nextcloud/backport/12177/stable14Morris Jobke2018-11-062-23/+31
|\ \
| * | Use the proper server for the apptoken flow loginRoeland Jago Douma2018-11-062-23/+31
| |/
* | Merge pull request #12301 from nextcloud/backport/12231/stable14Roeland Jago Douma2018-11-061-1/+1
|\ \ | |/ |/|
| * Set the filemodel before rending the detailsviewRoeland Jago Douma2018-11-061-1/+1
|/
* [tx-robot] updated from transifexNextcloud bot2018-11-0626-16/+134
* [tx-robot] updated from transifexNextcloud bot2018-11-0522-18/+108
* [tx-robot] updated from transifexNextcloud bot2018-11-0450-44/+254
* [tx-robot] updated from transifexNextcloud bot2018-11-0388-132/+198
* Merge pull request #12197 from nextcloud/backport/12188/revert-wait-for-cronRoeland Jago Douma2018-11-025-76/+12
|\
| * Revert "Wait for cron to finish before running upgrade command"Morris Jobke2018-11-015-76/+12
* | Merge pull request #12202 from brad2014/stable14Roeland Jago Douma2018-11-021-2/+3
|\ \
| * | Fix bug #12151: fix list formatting by correcting malformed htmlbrad20142018-11-011-2/+3
* | | [tx-robot] updated from transifexNextcloud bot2018-11-02128-410/+432
| |/ |/|