summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11361 from nextcloud/rel-14.0.1v14.0.1Joas Schilling2018-09-251-2/+2
|\ | | | | Increase version for 14.0.1
| * Increase version for 14.0.1Joas Schilling2018-09-251-2/+2
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #11340 from ↵Morris Jobke2018-09-241-0/+27
|\ | | | | | | | | nextcloud/stable14-add-unit-test-findlanguagefromlocale [14] Add unit test for findLanguageFromLocale
| * Add simple unit test for findLanguageFromLocaleDaniel Kesselberg2018-09-231-0/+27
|/ | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Merge pull request #11259 from nextcloud/fix/11144/backport14Joas Schilling2018-09-202-5/+70
|\ | | | | [14] Fixes empty favorite names for trailing slashes
| * Fixes empty favorite names for trailing slashesMichael Weimann2018-09-192-5/+70
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Merge pull request #11173 from nextcloud/update-version-14.0.1v14.0.1RC1Joas Schilling2018-09-201-2/+2
|\ \ | | | | | | Prepare 14.0.1 release
| * | Prepare 14.0.1 releaseJoas Schilling2018-09-201-2/+2
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #11302 from nextcloud/backport/11297/this-database-dudeblizzz2018-09-202-3/+3
|\ \ | | | | | | [stable14] Fix expiration code of tokens
| * | Also adjust the expiration of PublicKeyTokenProviderJoas Schilling2018-09-201-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Copy the expiration from 480864b3e32d88361b17b70d238f986f64579757 to ↵Joas Schilling2018-09-201-1/+1
| | | | | | | | | | | | | | | | | | getTokenById Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #11077 from ↵blizzz2018-09-203-32/+55
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable14-11064-fix-markup-and-style-of-mentions-in-comments [stable14] 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 #11294 from nextcloud/stable14-locale-template-fixblizzz2018-09-203-2/+34
|\ \ \ \ | | | | | | | | | | [stable14] Use user locale as default in the template
| * | | | Fix since tagJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fallback to $lang if no $locale matchJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | TypehintJohn Molakvoæ (skjnldsv)2018-09-192-3/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Since requirementJohn Molakvoæ (skjnldsv)2018-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix public l10nJohn Molakvoæ (skjnldsv)2018-09-191-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Use user locale as default in the templateJohn Molakvoæ (skjnldsv)2018-09-193-2/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #11288 from ↵Joas Schilling2018-09-201-10/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport/11171/shared-by-info-for-room-shares-without-names [stable14] Shared by info for room shares without names
| * | | | | Better shared-by info for conversations without namesJoas Schilling2018-09-191-10/+22
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #11287 from ↵Joas Schilling2018-09-203-11/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/backport/11041/get_permission_of_storage_for_shares [stable14] Get permission of storage for shares
| * | | | | Update test now that we check permissions properlyRoeland Jago Douma2018-09-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we actually check thepermissions properly we have to update the tests. * We checked an invalid path * We checked from wrong permissions (files never have CREATE permissions for example) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Properly check share permissionsRoeland Jago Douma2018-09-191-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isCreatable only works on folders isUpdatable if the file is not there but it is a part file also has to be checked on the folder Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix shared cacheRoeland Jago Douma2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Check the permission of the underlying storageRoeland Jago Douma2018-09-191-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else shares might expose more permissions than the storage actually providers. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #11293 from ↵Joas Schilling2018-09-201-2/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | nextcloud/backport/11292/do-not-apcu-cache-the-autoloader [stable14] Revert "Use APCu caching of composer"
| * | | | Revert "Use APCu caching of composer"Joas Schilling2018-09-191-2/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts commit 948ab8a4d06b3821ab94c11a3a04c820e60d6c8a. For details why see https://github.com/nextcloud/server/issues/11290
* | | | Merge pull request #11291 from nextcloud/stable14-fix-icons-cacherblizzz2018-09-191-1/+1
|\ \ \ \ | |_|/ / |/| | | [stable14] Fix icons cacher regex for compressed output
| * | | Fix icons cacher regex for compressed outputJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #11282 from ↵Joas Schilling2018-09-192-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/backport/11183/fix-link-for-update-notifications [stable14] Fix the link and anchor for the update notifications
| * | | Fix the link and anchor for the update notificationsJoas Schilling2018-09-192-2/+2
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #11283 from ↵blizzz2018-09-191-0/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable14-11268-include-empty-directories-in-the-default-state-of-acceptance-tests [stable14] Include empty directories in the default state of acceptance tests
| * | | Include empty directories in the default state of acceptance testsDaniel Calviño Sánchez2018-09-191-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before each scenario of the acceptance tests is run the Nextcloud server is reset to a default state. To do this the full directory of the Nextcloud server is commited to a local Git repository and then reset to that commit when needed. Unfortunately, Git does not support including empty directories in a commit. Due to this, when the default state was restored, it could happen that the file cache listed an empty directory that did not exist because it was not properly restored (for example, "data/appdata_*/css/icons"), and that in turn could lead to an error when the directory was used. Currently the only way to force Git to include an empty directory is to add a dummy file to the directory (so it will no longer be empty, but that should not be a problem in the affected directories, even if the dummy file is not included in the file cache); although Git FAQ suggests using a ".gitignore" file a ".keep" file was used instead, as it conveys better its purpose. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #11280 from nextcloud/backport/11080/stable14blizzz2018-09-192-2/+2
|\ \ \ | | | | | | | | [stable14] replace setcookie value with '' instead of null.
| * | | replace setcookie value with '' instead of null.MartB2018-09-192-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 #11277 from ↵blizzz2018-09-191-0/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable14-11257-prevent-comment-being-composed-from-overlapping-the-submit-button [stable14] Prevent comment being composed from overlapping the submit button
| * | | Prevent comment being composed from overlapping the submit buttonDaniel Calviño Sánchez2018-09-191-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The submit button is placed in the text area using absolute positioning, so it is not taken into account when calculating the text layout. Due to this it is necessary to add an explicit padding to the right of the text area to prevent the text from overlapping the submit button. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #11276 from ↵blizzz2018-09-191-0/+21
|\ \ \ | |/ / |/| | | | | | | | nextcloud/stable14-11054-fix-size-of-icons-in-menus-inside-apps-when-shown-as-images [stable14] 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-191-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 #11237 from nextcloud/backport/11042/stable14Joas Schilling2018-09-172-5/+3
|\ \ | | | | | | [stable14] Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 18:00:41 +0000