summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Used CSS VariablesEASY2018-10-011-2/+2
| | | | |
| * | | | Update theming.scssEASY2018-10-011-2/+2
| |/ / /
* | | | Merge pull request #11451 from nextcloud/stable14_10833Morris Jobke2018-10-011-2/+3
|\ \ \ \ | |/ / / |/| | | [stable14] Re-enable upload button after updating Avatar
| * | | Re-enable upload button after updating Avatar fixes #8623Tobia De Koninck2018-09-291-2/+3
|/ / / | | | | | | | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
* | | Merge pull request #11436 from nextcloud/assemblystream-eof-14Roeland Jago Douma2018-09-281-1/+1
|\ \ \ | | | | | | | | [14] AssemblyStream is also eof if we have no more source stream
| * | | AssemblyStream is also eof if we have no more source streamRobin Appelman2018-09-281-1/+1
|/ / / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #11418 from ↵Morris Jobke2018-09-281-2/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable14-11411-fix-checkWellKnownUrl-not-being-executed [stable14] Fix "checkWellKnownUrl" not being run
| * | | Fix "checkWellKnownUrl" not being runDaniel Calviño Sánchez2018-09-271-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The check is run only if its last parameter is true; data() tries to convert the HTML attribute string to an actual JavaScript value, so "true" is returned as an actual boolean instead of an string; as a strict comparison against "true" was used the result was false and thus the checks were not run. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #11421 from nextcloud/backport/11262/stable14Morris Jobke2018-09-281-1/+3
|\ \ \ | | | | | | | | [stable14] use a dummy database name for the default postgres database name
| * | | use a dummy database name for the default postgres database nameRobin Appelman2018-09-271-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | For some reason the docker image does not setup the permissions correctly, by using a different name the nextcloud installer will create the database instead with the correct permissions Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #11425 from ↵Morris Jobke2018-09-286-6/+12
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable14-hover-quota-used-space-regression [stable14] Add back the total used space per user
| * | | Add back the total used space per userJohn Molakvoæ (skjnldsv)2018-09-286-6/+12
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11430 from nextcloud/stable14-history-icon-center-fixRoeland Jago Douma2018-09-282-2/+2
|\ \ \ | | | | | | | | [stable14] Center back the history icon
| * | | CleanupJohn Molakvoæ (skjnldsv)2018-09-281-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Center back the history iconJohn Molakvoæ (skjnldsv)2018-09-282-2/+2
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11426 from nextcloud/stable14-inline-input-error-fixMorris Jobke2018-09-281-160/+160
|\ \ \ | | | | | | | | [stable14] Fix invalid inline input confirm border
| * | | Fix invalid inline input confirm borderJohn Molakvoæ (skjnldsv)2018-09-281-160/+160
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11422 from nextcloud/fix/acceptance-appsRoeland Jago Douma2018-09-281-1/+1
|\ \ \ | |/ / |/| | Fix acceptance tests as app title changed
| * | Fix acceptance tests as app title changedRoeland Jago Douma2018-09-271-1/+1
|/ / | | | | | | | | | | | | The redundant app was removed. So we need to update the tests to make it green. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11385 from nextcloud/11372/fix/14-logo-heightRoeland Jago Douma2018-09-271-3/+3
|\ \ | | | | | | [14] Fixes the logo height
| * | Fixes the logo heightMichael Weimann2018-09-261-3/+3
| | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | Merge pull request #11399 from ↵Morris Jobke2018-09-271-1/+48
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/stable14-11112-do-not-hide-the-progress-bar-while-the-chunked-upload-is-being-assembled [stable14] Do not hide the progress bar while the chunked upload is being assembled
| * | | Do not hide the progress bar while the chunked upload is being assembledDaniel Calviño Sánchez2018-09-261-1/+48
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Large files are not uploaded in a single operation, but uploaded in several chunks; once all the chunks are uploaded then the server needs to assemble them to get the final file. Before, once the chunks were uploaded the progress bar was hidden. However, this was confusing for the users, as the file could still need some time to appear in the file list due to the assembling. Now once all the chunks are uploaded the text in the progress bar changes to inform the user that there are still some pending operations, and only when the file is finally assembled the progress bar is hidden. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #11389 from nextcloud/backport/11383/stable14blizzz2018-09-271-1/+9
|\ \ \ | | | | | | | | [stable14] do not explode when getting permissions from a FailedStorage
| * | | do not explode when getting permissions from a FailedStorageArthur Schiwon2018-09-261-1/+9
| |/ / | | | | | | | | | | | | | | | | | | for instance if a user of an external user backend is not available currently, the whole Files UI would be frozen. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #11350 from ↵blizzz2018-09-262-8/+12
|\ \ \ | |/ / |/| | | | | | | | nextcloud/stable14-11258-fix-contacts-menu-on-mentions [stable14] Fix contacts menu on mentions
| * | Fix position of contacts menu shown on mentionsDaniel Calviño Sánchez2018-09-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no default CSS rules for the contacts menu, as its position depends on the element on which it is shown. Note, however, that if no explicit rules are provided the contacts menu on mentions is affected by the rules for the contacts menu on shares from the sharing tab. The contacts menu is now positioned to show the tip of the arrow horizontally aligned with the center of the avatar, and with the top of the menu slightly below the bottom border of the mention. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix contacts menu not triggered on certain areas of a mentionDaniel Calviño Sánchez2018-09-241-8/+7
| |/ | | | | | | | | | | | | | | | | | | The contacts menu was triggered only when the avatar or the name of the user were clicked. Due to this, clicking on certain (small) areas of a mention (like the right end, or the space between the avatar and the name) did not show the contacts menu. Now the contacts menu is shown when any area of the mention is clicked. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #11373 from nextcloud/gs-and-saml-stable14blizzz2018-09-261-1/+1
|\ \ | | | | | | [stable14] make the server ready to use global scale with SAML as auth back-end
| * | add back-end as parameter to the pre-login hookBjoern Schiessle2018-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for the Global Scale setup to allow the master node to perform different operations during login, depending on the user management. Because in case of SAML, the authentication at the idp happens at the master node. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #11374 from nextcloud/stable14-content-list-flex-fixesMorris Jobke2018-09-262-2/+4
|\ \ \ | |/ / |/| | [stable14] Fix default flex shrink on list
| * | Fix default flex shrink on listJohn Molakvoæ (skjnldsv)2018-09-252-2/+4
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-02 20:15:13 +0000