Michael Telatynski
bfb5706b4a
don't consume all keys
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:51:21 +00:00
Michael Telatynski
29b59dde5b
undo unrelated change
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:44:08 +00:00
Travis Ralston
37ec7e6f7e
Ensure the settings page accurately represents theme choices
...
Fixes https://github.com/vector-im/riot-web/issues/11518
This also fixes a bug where the the theme logic can incorrectly get stuck in the light theme - the ThemeController was overriding *all* values, not just supposed themes. Null values aren't overridden so that the various theme logic bits don't assume the user has chosen the light theme explicitly.
2019-11-28 13:40:28 -07:00
Michael Telatynski
811454462d
fix Stickerpicker and MessageContextMenu
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:38:58 +00:00
Michael Telatynski
3847996b5b
transition Tooltips over to deprecated code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 20:26:09 +00:00
Michael Telatynski
2daf3a96bf
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 18:42:38 +00:00
Michael Telatynski
6c5b777a77
Consolidate all except tooltips
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 18:16:59 +00:00
Michael Telatynski
5a540f5949
Migrate MemberStatusMessageAvatar over to new Context Menus
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 16:40:45 +00:00
Michael Telatynski
ecf51a0569
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-28 16:28:53 +00:00
Michael Telatynski
6d69ec17d9
Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus
...
Conflicts:
src/components/views/context_menus/RoomTileContextMenu.js
2019-11-28 16:25:59 +00:00
Travis Ralston
b833a030e7
Invite invited members too
2019-11-28 09:24:02 -07:00
Weblate
503aeac21f
Merge branch 'origin/develop' into Weblate.
2019-11-28 16:16:59 +00:00
Travis Ralston
25809c54a7
Merge pull request #3682 from matrix-org/travis/fix-calltype-i18n
...
Improve translatable strings for calls
2019-11-28 09:16:52 -07:00
Weblate
064df930c8
Merge branch 'origin/develop' into Weblate.
2019-11-28 16:10:49 +00:00
Travis Ralston
01ba4aca45
Merge pull request #3680 from matrix-org/travis/fix-list-diff
...
Don't assume that diffs will have an appropriate child node
2019-11-28 09:10:43 -07:00
Travis Ralston
fde116458c
Words are hard
2019-11-28 09:08:24 -07:00
Weblate
d652e182aa
Merge branch 'origin/develop' into Weblate.
2019-11-28 16:06:55 +00:00
Weblate
92e95d0c07
Merge branch 'origin/develop' into Weblate.
2019-11-28 16:06:51 +00:00
random
dc152a5409
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1921 of 1921 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-11-28 16:06:51 +00:00
Samu Voutilainen
94f19cbc2e
Translated using Weblate (Finnish)
...
Currently translated at 100.0% (1921 of 1921 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-11-28 16:06:50 +00:00
Travis Ralston
90a1cb68eb
Merge pull request #3681 from matrix-org/travis/fix-jitsi
...
Fix persisted widgets getting stuck at loading screens
2019-11-28 09:06:44 -07:00
Travis Ralston
c1d5d20b86
Merge pull request #2959 from matrix-org/t3chguy/clear_notifications
...
Add button to clear all notification counts, sometimes stuck in historical
2019-11-28 09:06:35 -07:00
Aaron Raimist
1bb55d4fa1
Hide Remove button in message editing history if you don't have permission to redact
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-27 22:30:39 -06:00
Travis Ralston
b9559ecf82
Appease the linter
2019-11-27 20:34:31 -07:00
Travis Ralston
f020929345
Add an option to invite users to upgraded private rooms
...
The option doesn't show up on public room upgrades.
2019-11-27 20:29:11 -07:00
Travis Ralston
96ffe94876
Merge remote-tracking branch 'origin/develop' into t3chguy/clear_notifications
2019-11-27 19:27:52 -07:00
Weblate
8c6056a90f
Merge branch 'origin/develop' into Weblate.
2019-11-28 00:06:28 +00:00
thilobuchholz
ff90ae1972
Translated using Weblate (German)
...
Currently translated at 80.6% (1548 of 1921 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-11-28 00:06:28 +00:00
Travis Ralston
ac8afe6dd1
Merge pull request #3679 from matrix-org/travis/fix-invite-errors
...
Fix multi-invite error dialog messaging
2019-11-27 17:06:19 -07:00
Travis Ralston
3b5aa5e9b8
Update src/RoomInvite.js
...
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
2019-11-27 16:57:44 -07:00
Travis Ralston
97515511ce
Improve translatable strings for calls
...
Fixes https://github.com/vector-im/riot-web/issues/11507
2019-11-27 13:03:51 -07:00
Travis Ralston
7b013ecc69
Fix persisted widgets getting stuck at loading screens
...
The widget itself is rendered underneath the loading screen, so we just have to disable the loading state.
This commit also removes the "is" attribute because React 16 includes unknown attributes: https://reactjs.org/blog/2017/09/08/dom-attributes-in-react-16.html
Fixes https://github.com/vector-im/riot-web/issues/11536
2019-11-27 12:54:31 -07:00
Travis Ralston
673e6c3162
Don't assume that diffs will have an appropriate child node
...
Fixes https://github.com/vector-im/riot-web/issues/11497
This is a regression from react-sdk v1.5.0 where the diff feature was added in the first place. It only affects lists.
2019-11-27 12:26:43 -07:00
Travis Ralston
275bd33a6c
Move the description into the relevant branch
2019-11-27 10:48:05 -07:00
Travis Ralston
d6821ecb99
Fix multi-invite error dialog messaging
...
Fixes https://github.com/vector-im/riot-web/issues/11515
2019-11-27 10:44:36 -07:00
Weblate
ace950691b
Merge branch 'origin/develop' into Weblate.
2019-11-27 14:52:12 +00:00
Travis Ralston
fbba55ab05
Merge pull request #3670 from matrix-org/travis/toggle-communities
...
Make the communities button behave more like a toggle
2019-11-27 07:52:05 -07:00
Weblate
326aedea82
Merge branch 'origin/develop' into Weblate.
2019-11-27 13:31:58 +00:00
Kévin C
b52b8b4848
Translated using Weblate (French)
...
Currently translated at 100.0% (1921 of 1921 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-11-27 13:31:57 +00:00
J. Ryan Stinnett
54d6b6aa73
Flip JS SDK back to develop
2019-11-27 13:31:44 +00:00
David Baker
c9b972116a
Remove broken velocity-ui animation
...
The deactivate account dialog tried to shake the password box on
an incorrect password but it didn't work because we don't import
velocity-ui anywhere. Looks like we forgot to import it in
DeactivateAccountDialog.js and were relying on it being imported
elsewhere (so probably broke when BottomLeftMenu got removed).
Either way, we no longer use the field-shake animation anywhere else,
so just remove it.
2019-11-27 11:47:57 +00:00
Weblate
e4b7b0766a
Merge branch 'origin/develop' into Weblate.
2019-11-27 10:40:58 +00:00
RiotRobot
6223ca8243
Merge branch 'master' into develop
2019-11-27 10:39:33 +00:00
RiotRobot
1a98c0d04e
v1.7.4
2019-11-27 10:38:35 +00:00
RiotRobot
25b5921ddf
Prepare changelog for v1.7.4
2019-11-27 10:38:35 +00:00
RiotRobot
d9e322bbca
Upgrade to JS SDK 2.4.5
2019-11-27 10:32:21 +00:00
Weblate
c13fefa1a2
Merge branch 'origin/develop' into Weblate.
2019-11-27 09:19:08 +00:00
Samu Voutilainen
b54ec3d708
Translated using Weblate (Finnish)
...
Currently translated at 97.5% (1873 of 1921 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-11-27 09:19:08 +00:00
Jeff Huang
c3dd491eac
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1921 of 1921 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-11-27 09:19:01 +00:00
David Baker
dd7b08ec25
Merge pull request #3674 from matrix-org/dbkr/read_marker_css_transition
...
Change read markers to use CSS transitions
2019-11-27 09:18:53 +00:00