summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11173 from nextcloud/update-version-14.0.1v14.0.1RC1Joas Schilling2018-09-201-2/+2
|\
| * Prepare 14.0.1 releaseJoas Schilling2018-09-201-2/+2
|/
* Merge pull request #11302 from nextcloud/backport/11297/this-database-dudeblizzz2018-09-202-3/+3
|\
| * Also adjust the expiration of PublicKeyTokenProviderJoas Schilling2018-09-201-2/+2
| * Copy the expiration from 480864b3e32d88361b17b70d238f986f64579757 to getToken...Joas Schilling2018-09-201-1/+1
* | Merge pull request #11077 from nextcloud/stable14-11064-fix-markup-and-style-...blizzz2018-09-203-32/+55
|\ \
| * | Add new line at the end of fileDaniel Calviño Sánchez2018-09-051-1/+1
| * | Ensure that the avatar and the user name will be kept togetherDaniel Calviño Sánchez2018-09-051-0/+4
| * | Remove unneeded CSS rule for mentionsDaniel Calviño Sánchez2018-09-051-1/+5
| * | Fix pointer cursor not shown on avatarsDaniel Calviño Sánchez2018-09-051-1/+3
| * | Highlight mentions to the current userDaniel Calviño Sánchez2018-09-051-0/+4
| * | Ensure that the user name is shown in bold in mentionsDaniel Calviño Sánchez2018-09-051-0/+5
| * | Reformat embedded HTML code to resemble HTML codeDaniel Calviño Sánchez2018-09-051-27/+31
| * | Remove space between avatar and user nameDaniel Calviño Sánchez2018-09-051-3/+3
| * | Show avatar using "span" instead of "div"Daniel Calviño Sánchez2018-09-052-8/+8
* | | Merge pull request #11294 from nextcloud/stable14-locale-template-fixblizzz2018-09-203-2/+34
|\ \ \
| * | | Fix since tagJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| * | | Fallback to $lang if no $locale matchJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| * | | TypehintJohn Molakvoæ (skjnldsv)2018-09-192-3/+2
| * | | Since requirementJohn Molakvoæ (skjnldsv)2018-09-191-0/+1
| * | | Fix public l10nJohn Molakvoæ (skjnldsv)2018-09-191-1/+2
| * | | Use user locale as default in the templateJohn Molakvoæ (skjnldsv)2018-09-193-2/+33
* | | | Merge pull request #11288 from nextcloud/backport/11171/shared-by-info-for-ro...Joas Schilling2018-09-201-10/+22
|\ \ \ \
| * | | | Better shared-by info for conversations without namesJoas Schilling2018-09-191-10/+22
* | | | | Merge pull request #11287 from nextcloud/backport/11041/get_permission_of_sto...Joas Schilling2018-09-203-11/+18
|\ \ \ \ \
| * | | | | Update test now that we check permissions properlyRoeland Jago Douma2018-09-191-7/+7
| * | | | | Properly check share permissionsRoeland Jago Douma2018-09-191-2/+8
| * | | | | Fix shared cacheRoeland Jago Douma2018-09-191-1/+1
| * | | | | Check the permission of the underlying storageRoeland Jago Douma2018-09-191-1/+2
| |/ / / /
* | | | | Merge pull request #11293 from nextcloud/backport/11292/do-not-apcu-cache-the...Joas Schilling2018-09-201-2/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Revert "Use APCu caching of composer"Joas Schilling2018-09-191-2/+0
| |/ / /
* | | | Merge pull request #11291 from nextcloud/stable14-fix-icons-cacherblizzz2018-09-191-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix icons cacher regex for compressed outputJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
* | | | Merge pull request #11282 from nextcloud/backport/11183/fix-link-for-update-n...Joas Schilling2018-09-192-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the link and anchor for the update notificationsJoas Schilling2018-09-192-2/+2
| |/ /
* | | Merge pull request #11283 from nextcloud/stable14-11268-include-empty-directo...blizzz2018-09-191-0/+2
|\ \ \
| * | | Include empty directories in the default state of acceptance testsDaniel Calviño Sánchez2018-09-191-0/+2
| |/ /
* | | Merge pull request #11280 from nextcloud/backport/11080/stable14blizzz2018-09-192-2/+2
|\ \ \
| * | | replace setcookie value with '' instead of null.MartB2018-09-192-2/+2
| |/ /
* | | Merge pull request #11277 from nextcloud/stable14-11257-prevent-comment-being...blizzz2018-09-191-0/+3
|\ \ \
| * | | Prevent comment being composed from overlapping the submit buttonDaniel Calviño Sánchez2018-09-191-0/+3
| |/ /
* | | Merge pull request #11276 from nextcloud/stable14-11054-fix-size-of-icons-in-...blizzz2018-09-191-0/+21
|\ \ \ | |/ / |/| |
| * | Fix size of icons in menus inside apps when shown as imagesDaniel Calviño Sánchez2018-09-191-0/+21
|/ /
* | Merge pull request #11237 from nextcloud/backport/11042/stable14Joas Schilling2018-09-172-5/+3
|\ \
| * | Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894Patrik Kernstock2018-09-162-5/+3
|/ /
* | Merge pull request #11201 from nextcloud/backport/11036/stable14Joas Schilling2018-09-132-71/+224
|\ \
| * | Backport of #11036 to stable14Arthur Schiwon2018-09-132-71/+224
* | | Merge pull request #11191 from nextcloud/backport/11091-cannot-read-passwdblizzz2018-09-131-4/+4
|\ \ \ | |/ / |/| |
| * | Add int-typehintDaniel Kesselberg2018-09-121-1/+1
| * | Remove posix_getpwuid and compare only useridDaniel Kesselberg2018-09-121-4/+4
|/ /