aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #11389 from nextcloud/backport/11383/stable14blizzz2018-09-271-1/+9
|\ \
| * | do not explode when getting permissions from a FailedStorageArthur Schiwon2018-09-261-1/+9
| |/
* | Merge pull request #11350 from nextcloud/stable14-11258-fix-contacts-menu-on-...blizzz2018-09-262-8/+12
|\ \ | |/ |/|
| * Fix position of contacts menu shown on mentionsDaniel Calviño Sánchez2018-09-241-0/+5
| * Fix contacts menu not triggered on certain areas of a mentionDaniel Calviño Sánchez2018-09-241-8/+7
* | Merge pull request #11373 from nextcloud/gs-and-saml-stable14blizzz2018-09-261-1/+1
|\ \
| * | add back-end as parameter to the pre-login hookBjoern Schiessle2018-09-251-1/+1
* | | Merge pull request #11374 from nextcloud/stable14-content-list-flex-fixesMorris Jobke2018-09-262-2/+4
|\ \ \ | |/ / |/| |
| * | Fix default flex shrink on listJohn Molakvoæ (skjnldsv)2018-09-252-2/+4
|/ /
* | Merge pull request #11361 from nextcloud/rel-14.0.1v14.0.1Joas Schilling2018-09-251-2/+2
|\ \
| * | Increase version for 14.0.1Joas Schilling2018-09-251-2/+2
|/ /
* | Merge pull request #11340 from nextcloud/stable14-add-unit-test-findlanguagef...Morris Jobke2018-09-241-0/+27
|\ \ | |/ |/|
| * Add simple unit test for findLanguageFromLocaleDaniel Kesselberg2018-09-231-0/+27
|/
* Merge pull request #11259 from nextcloud/fix/11144/backport14Joas Schilling2018-09-202-5/+70
|\
| * Fixes empty favorite names for trailing slashesMichael Weimann2018-09-192-5/+70
* | 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
| |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 09:35:13 +0000