Compare osmarusman/6.x.x branch with master #2852
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Tagging version 5.0.2.2.2
Tagging version 5.0.2.2.3
Tagging version 5.0.2.3
Tagging version 5.0.2.3.1
Tagging version 5.0.2.4
…5 minutes. And also leave room if not in the current page.
Tagging version 5.0.2.5
Signed-off-by: Joas Schilling <coding@schilljs.com>
In Nextcloud 16 the default height for input elements, as well as the confirm icons inside them, is 34px. This caused the room name input to change its height from 44px to 42px, so it is no longer needed to pull it up 2px to prevent moving the items below when it is shown. In a similar way, it also caused the confirm icon to change its height from 42px to 34px; it was misplaced down 1px, so now it is positioned 4px from the top (instead of 5px to keep the same position as before). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Update version on master
…ault-height-for-inputs-from-server Adjust room name input to default height for inputs from server
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.1.1 to 3.0.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/css-loader@v2.1.1...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
…ss-loader-3.0.0 Bump css-loader from 2.1.1 to 3.0.0 in /vue
Only sync and set active room after user has joined room.
# Conflicts: # .gitignore # CHANGELOG.md # appinfo/info.xml # appinfo/routes.php # css/authenticate.css # css/chatview.scss # css/publicshareauth.scss # css/style.scss # js/admin/allowed-groups.js # js/admin/allowed-groups.js.map # js/admin/commands.js # js/admin/commands.js.map # js/admin/signaling-server.js # js/admin/signaling-server.js.map # js/admin/stun-server.js # js/admin/stun-server.js.map # js/admin/turn-server.js # js/admin/turn-server.js.map # js/app.js # js/collections.js # js/collections.js.map # js/collectionsintegration.js # js/collectionsintegration.js.map # js/connection.js # js/embedded.js # js/merged-guest.json # js/merged-share-auth.json # js/merged.json # js/signaling.js # js/simplewebrtc/bundled.js # js/simplewebrtc/peer.js # js/simplewebrtc/simplewebrtc.js # js/simplewebrtc/webrtc.js # js/vendor/jshashes/LICENSE # js/views/chatview.js # js/views/mediacontrolsview.js # js/views/templates.js # js/views/videoview.js # js/webrtc.js # l10n/cs.js # l10n/cs.json # l10n/da.js # l10n/da.json # l10n/de.js # l10n/de.json # l10n/de_DE.js # l10n/de_DE.json # l10n/en_GB.js # l10n/en_GB.json # l10n/es.js # l10n/es.json # l10n/es_419.js # l10n/es_419.json # l10n/es_CL.js # l10n/es_CL.json # l10n/es_CO.js # l10n/es_CO.json # l10n/es_CR.js # l10n/es_CR.json # l10n/es_DO.js # l10n/es_DO.json # l10n/es_EC.js # l10n/es_EC.json # l10n/es_GT.js # l10n/es_GT.json # l10n/es_HN.js # l10n/es_HN.json # l10n/es_MX.js # l10n/es_MX.json # l10n/es_NI.js # l10n/es_NI.json # l10n/es_PA.js # l10n/es_PA.json # l10n/es_PE.js # l10n/es_PE.json # l10n/es_PR.js # l10n/es_PR.json # l10n/es_PY.js # l10n/es_PY.json # l10n/es_SV.js # l10n/es_SV.json # l10n/es_UY.js # l10n/es_UY.json # l10n/eu.js # l10n/eu.json # l10n/fi.js # l10n/fi.json # l10n/fr.js # l10n/fr.json # l10n/gl.js # l10n/gl.json # l10n/he.js # l10n/he.json # l10n/hu.js # l10n/hu.json # l10n/is.js # l10n/is.json # l10n/it.js # l10n/it.json # l10n/ja.js # l10n/ja.json # l10n/ka_GE.js # l10n/ka_GE.json # l10n/ko.js # l10n/ko.json # l10n/lt_LT.js # l10n/lt_LT.json # l10n/nb.js # l10n/nb.json # l10n/nl.js # l10n/nl.json # l10n/pl.js # l10n/pl.json # l10n/pt_BR.js # l10n/pt_BR.json # l10n/ru.js # l10n/ru.json # l10n/sk.js # l10n/sk.json # l10n/sr.js # l10n/sr.json # l10n/sv.js # l10n/sv.json # l10n/tr.js # l10n/tr.json # l10n/vi.js # l10n/vi.json # l10n/zh_CN.js # l10n/zh_CN.json # lib/Chat/MessageParser.php # lib/Controller/ChatController.php # lib/Controller/PageController.php # package-lock.json # templates/authenticate.php # templates/index-public.php # templates/index.php # vue/package-lock.json # vue/webpack.common.js
- Allows to copy and paste screen capture and upload it to “Talk” folder.
* Add gentle ring. * Add ability to edit last message in a given room.
� Conflicts: � js/app.js � js/merged.json
* Implement /isActorBelongTo endpoint. * Check first if actor is allowed to edit last message.
* Add /deleteTempComments endpoint. * Add css style for fire icon. * Add ui event listeners and functions respectively. * Add fire icon in the template. * Load temp msg feature. * Change ringing audio file path. * Add and load temp msg script. * Accept isTemp field by default. * Add logic for saving and deleting temp comment. * Support isTemp field and implement temp comment logic.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref #1129 (comment)