summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11064 from nextcloud/fix-markup-and-style-of-mentions-in-...Roeland Jago Douma2018-09-053-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 #11066 from nextcloud/bump-version-masterblizzz2018-09-0525-55/+58
|\ \
| * | Update version requirements and versions of shipped appsJoas Schilling2018-09-0524-52/+55
| * | Bump the version on masterJoas Schilling2018-09-051-3/+3
* | | Merge pull request #10958 from nextcloud/bugfix/10727/fix_caldav_logic_exceptionChristoph Wurst2018-09-053-14/+11
|\ \ \
| * | | remove LogicException, because it's also triggered with legitimate parametersGeorg Ehrke2018-09-053-14/+11
* | | | Merge pull request #10836 from nextcloud/fix_8281blizzz2018-09-054-0/+102
|\ \ \ \
| * | | | Add summary with amount of updatesTobia De Koninck2018-08-271-0/+13
| * | | | Add license header and fix undefined index errorTobia De Koninck2018-08-271-1/+22
| * | | | Add an occ command to report updatesTobia De Koninck2018-08-274-0/+68
* | | | | Merge pull request #11068 from nextcloud/3rdparty/symofny/3.4.15Julius Härtl2018-09-051-0/+0
|\ \ \ \ \
| * | | | | [3rdparty] Bump symfony to 3.4.15Roeland Jago Douma2018-09-051-0/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #11061 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Julius Härtl2018-09-054-10/+15
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Compiled bumpJohn Molakvoæ (skjnldsv)2018-09-052-2/+2
| * | | | Bump vue-select from 2.4.0 to 2.5.0 in /apps/updatenotificationdependabot[bot]2018-09-052-8/+13
| | |_|/ | |/| |
* | | | Merge pull request #11060 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-09-052-5/+5
|\ \ \ \
| * | | | Bump webpack from 4.17.1 to 4.17.2 in /apps/oauth2dependabot[bot]2018-09-052-5/+5
| |/ / /
* | | | Merge pull request #11063 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Roeland Jago Douma2018-09-052-5/+5
|\ \ \ \
| * | | | Bump webpack from 4.17.1 to 4.17.2 in /apps/updatenotificationdependabot[bot]2018-09-052-5/+5
| |/ / /
* | | | Merge pull request #11062 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-09-052-9/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump webpack from 4.17.1 to 4.17.2 in /apps/accessibilitydependabot[bot]2018-09-052-9/+7
| |/ /
* | | Merge pull request #11058 from nextcloud/3rdparty/guzzle/6.3.3Christoph Wurst2018-09-051-0/+0
|\ \ \ | |/ / |/| |
| * | [3rdparty] Update to guzzle 6.3.3Roeland Jago Douma2018-09-051-0/+0
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-09-0522-26/+6
* | Merge pull request #11048 from nextcloud/stable14-10963Julius Härtl2018-09-041-3/+3
|\ \
| * | Updates logo scss to regard default valuesMichael Weimann2018-09-041-3/+3
* | | Merge pull request #11022 from nextcloud/bump/npm/settingsJulius Härtl2018-09-044-97/+85
|\ \ \
| * | | Bump js deps settingsRoeland Jago Douma2018-09-044-97/+85
* | | | Merge pull request #11047 from nextcloud/typo/config.sample.phpRoeland Jago Douma2018-09-041-1/+1
|\ \ \ \
| * | | | Fix typo in config.sample.phpMarius Blüm2018-09-041-1/+1
| |/ / /
* | | | Merge pull request #11046 from nextcloud/feature/10725/apploggerRoeland Jago Douma2018-09-044-0/+96
|\ \ \ \ | |/ / / |/| | |
| * | | Add wrapper Logger in DIContainerRoeland Jago Douma2018-09-044-0/+96
* | | | Merge pull request #10975 from nextcloud/dependabot/npm_and_yarn/build/node-s...John Molakvoæ2018-09-042-1503/+1518
|\ \ \ \
| * | | | Bump node-sass from 4.9.2 to 4.9.3 in /builddependabot[bot]2018-09-032-1503/+1518
* | | | | Merge pull request #11023 from nextcloud/bump/npm/accessibilityChristoph Wurst2018-09-044-17/+19
|\ \ \ \ \
| * | | | | Bump JS deps AccessibilityRoeland Jago Douma2018-09-034-17/+19
* | | | | | Merge pull request #11044 from nextcloud/td/8.2.0-public-utilChristoph Wurst2018-09-041-44/+0
|\ \ \ \ \ \
| * | | | | | Remove deprecated methods from OCP\UtilRoeland Jago Douma2018-09-041-44/+0
* | | | | | | Merge pull request #11040 from nextcloud/feature/11035/worker-srcRoeland Jago Douma2018-09-043-0/+46
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Deprecate the childSrc functionsRoeland Jago Douma2018-09-042-0/+4
| * | | | | | Add workerSrc to CSPRoeland Jago Douma2018-09-043-0/+42
| |/ / / / /