summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-09-114-0/+34
|
* Merge pull request #11133 from nextcloud/bugfix/noid/invalid-exceptionblizzz2018-09-101-1/+1
|\ | | | | Fix exception class
| * Fix exception classJoas Schilling2018-09-101-1/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2018-09-1024-40/+80
|
* [tx-robot] updated from transifexNextcloud bot2018-09-0916-2/+76
|
* [tx-robot] updated from transifexNextcloud bot2018-09-0816-106/+110
|
* Merge pull request #11096 from nextcloud/bugfix/11080/set-cookie-null-argumentRoeland Jago Douma2018-09-072-2/+2
|\ | | | | replace setcookie value with '' instead of null.
| * replace setcookie value with '' instead of null.MartB2018-09-062-2/+2
| | | | | | | | | | | | | | The php documentation states that an empty string should be used for a cookie when it has no real value. null leads to the following error: expects parameter 2 to be string, null given Signed-off-by: Martin Böh <mart.b@outlook.de>
* | Merge pull request #11104 from nextcloud/fix/token_expire_hardeningRoeland Jago Douma2018-09-071-1/+1
|\ \ | | | | | | Expire tokens hardening
| * | Expire tokens hardeningRoeland Jago Douma2018-09-071-1/+1
| |/ | | | | | | | | | | Just to be sure that the field is also not 0 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11100 from nextcloud/enhancement/generated-migrationsblizzz2018-09-071-6/+10
|\ \ | | | | | | Improve class import and strict typing for generated migration class
| * | Improve class import and strict typing for generated migration classChristoph Wurst2018-09-071-6/+10
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #11098 from nextcloud/3rdparty/id3parser/0.0.3blizzz2018-09-071-0/+0
|\ \ \ | |/ / |/| | [3rdparty] Bump id3parser to 0.0.3
| * | [3rdparty] Bump id3parser to 0.0.3Roeland Jago Douma2018-09-061-0/+0
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / [tx-robot] updated from transifexNextcloud bot2018-09-076-10/+10
|/
* Merge pull request #11081 from ↵Roeland Jago Douma2018-09-061-0/+0
|\ | | | | | | | | nextcloud/3rdparty/symfony-console-completion/0.8.0 [3rdparty] Bump symfony-console-completion to 0.8.0
| * [3rdparty] Bump symfony-console-completion to 0.8.0Roeland Jago Douma2018-09-061-0/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11082 from nextcloud/fix/10584/no_invalidate_token_oauthRoeland Jago Douma2018-09-061-3/+3
|\ \ | | | | | | Do not invalidate main token on OAuth
| * | Do not invalidate main token on OAuthRoeland Jago Douma2018-09-061-3/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #10584 We deleted the main token when using the login flow else mutliple tokens would show up for a single user. However in the case of OAuth this is perfectly fine as the authentication happens really in your browser: 1. You are already logged in, no need to log you out 2. You are not logged in yet, but since you log in into the exact same browser the expected behavior is to stay logged in. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10973 from nextcloud/feature/crash-report-breadcrumbsRoeland Jago Douma2018-09-067-0/+93
|\ \ | |/ |/| Add breadcrumb support to crash reporters
| * Update autoloaderRoeland Jago Douma2018-09-052-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix @since version on new APIChristoph Wurst2018-09-052-2/+2
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * Add breadcrumb support to crash reportersChristoph Wurst2018-09-055-0/+91
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #11076 from nextcloud/3rdpart/scssphp/0.7.7Roeland Jago Douma2018-09-061-0/+0
|\ \ | | | | | | [3rdparty] Bump scssphp to 0.7.7
| * | [3rdparty] Bump scssphp to 0.7.7Roeland Jago Douma2018-09-051-0/+0
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-09-0634-4/+106
| |
* | Merge pull request #10963 from nextcloud/fix/10957/logo-scssRoeland Jago Douma2018-09-054-4/+77
|\ \ | | | | | | Updates logo scss to regard default values and updates favicon upload check
| * | Disables SVG favicon uploads when imagemagick is missing.Michael Weimann2018-09-054-4/+77
| |/ | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Merge pull request #11054 from ↵Roeland Jago Douma2018-09-051-0/+21
|\ \ | |/ |/| | | | | nextcloud/fix-size-of-icons-in-menus-inside-apps-when-shown-as-images Fix size of icons in menus inside apps when shown as images
| * Fix size of icons in menus inside apps when shown as imagesDaniel Calviño Sánchez2018-09-041-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some popover menus, like the contacts menu, still show their icon using an img element. The main CSS rules assume that a "content-box" sizing is being used, and thus set the size and padding of the image to add up to the line height. However, ".app-*" descendants use a "border-box" sizing, so when a menu with an image was shown in an app the icon was not properly shown. Now both the width and height of the image is set to the item height in those cases, which causes the visible size of the icon to be the item height minus the padding (the same as when "content-box" sizing is used). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #11064 from ↵Roeland Jago Douma2018-09-053-32/+55
|\ \ | | | | | | | | | | | | nextcloud/fix-markup-and-style-of-mentions-in-comments Fix markup and style of mentions in comments
| * | Add new line at the end of fileDaniel Calviño Sánchez2018-09-051-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Ensure that the avatar and the user name will be kept togetherDaniel Calviño Sánchez2018-09-051-0/+4
| | | | | | | | | | | | | | | | | | | | | Otherwise a line break could be added between the avatar and the user name when the wrapper is close to the right border of the message. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove unneeded CSS rule for mentionsDaniel Calviño Sánchez2018-09-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Most of the properties of the rule are not needed for mentions, so the rule is no longer applied to them; the only needed property was moved to the main rule for mentions. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix pointer cursor not shown on avatarsDaniel Calviño Sánchez2018-09-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the cursor is on an avatar wrapper the cursor is shown as a pointer to inform the user that it can be clicked (which will either show the contacts menu or insert a mention, depending on the case); the cursor must be explicitly defined for the "img" element that shows the avatar too, or otherwise the default cursor would be shown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Highlight mentions to the current userDaniel Calviño Sánchez2018-09-051-0/+4
| | | | | | | | | | | | | | | | | | | | | Like done in Talk, mentions to the current user are now shown with the primary colors to make them more prominent. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Ensure that the user name is shown in bold in mentionsDaniel Calviño Sánchez2018-09-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Different browsers use different font weights for strong elements (Chromium uses "bold", but Firefox uses "bolder", which is relative to the font weight of the parent), so now the user name in mentions is explicitly shown with a bold weight. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Reformat embedded HTML code to resemble HTML codeDaniel Calviño Sánchez2018-09-051-27/+31
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove space between avatar and user nameDaniel Calviño Sánchez2018-09-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The avatar should be shown immediately after the avatar to be able to accurately define the space between them using only CSS rules. Note that in the case of the "atwho" menu it is not really needed, as a whitespace removal seems to be done automatically by the plugin, but it was modified for its displayed elements too for consistency. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Show avatar using "span" instead of "div"Daniel Calviño Sánchez2018-09-052-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Visually it makes no difference, but as the ".avatar" element is inside a "span" element it can not be a block element to be compliant with the HTML specification. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #11066 from nextcloud/bump-version-masterblizzz2018-09-0525-55/+58
|\ \ \ | | | | | | | | Bump the version on master
| * | | Update version requirements and versions of shipped appsJoas Schilling2018-09-0524-52/+55
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Bump the version on masterJoas Schilling2018-09-051-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | 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 parameters
| * | | | remove LogicException, because it's also triggered with legitimate parametersGeorg Ehrke2018-09-053-14/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #10836 from nextcloud/fix_8281blizzz2018-09-054-0/+102
|\ \ \ \ \ | | | | | | | | | | | | Add an occ command to report updates
| * | | | | Add summary with amount of updatesTobia De Koninck2018-08-271-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
| * | | | | Add license header and fix undefined index errorTobia De Koninck2018-08-271-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
| * | | | | Add an occ command to report updatesTobia De Koninck2018-08-274-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
* | | | | | Merge pull request #11068 from nextcloud/3rdparty/symofny/3.4.15Julius Härtl2018-09-051-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | [3rdparty] Bump symfony to 3.4.15
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 17:48:19 +0000