Commit Graph

18551 Commits (53332018234fc9067c6200babb794ab3538a0791)

Author SHA1 Message Date
J. Ryan Stinnett 5333201823 Change back to develop branch for deps 2019-10-18 16:12:20 +01:00
RiotRobot d05ef40694 Merge branch 'master' into develop 2019-10-18 14:49:40 +01:00
RiotRobot 86a564b2f0 v1.7.0 2019-10-18 14:48:34 +01:00
RiotRobot 2557d89385 Prepare changelog for v1.7.0 2019-10-18 14:48:33 +01:00
RiotRobot 21bb1dc837 Upgrade to JS SDK v2.4.2 2019-10-18 14:43:08 +01:00
Travis Ralston 96db855e48
Merge pull request #3551 from maunium/fix-edit-reply-fallback
Fix reply fallback being included in edit m.new_content
2019-10-17 18:24:33 +02:00
Tulir Asokan 2555fcb38f Fix reply fallback being included in edit m.new_content
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-13 13:32:09 +03:00
Bruno Windels 385e83fdbc
Merge pull request #3548 from matrix-org/bwindels/composer-features-doc
Document composer features
2019-10-11 15:08:29 +00:00
Travis Ralston e0ce844f58
Merge pull request #3547 from matrix-org/travis/fix-unban
Correctly update the banned users list when a user is unbanned
2019-10-11 15:54:13 +01:00
Bruno Windels 52dbcdb701 add readme explaining the purpose of this directory 2019-10-11 14:21:46 +02:00
Bruno Windels a6892e7bac document the composer features 2019-10-11 14:19:00 +02:00
Travis Ralston 61cc6c8293 Correctly update the banned users list when a user is unbanned
Fixes https://github.com/vector-im/riot-web/issues/11123

Error wasn't actually the user being unbanned twice - it was a React error about "cannot call enqueueForceUpdate of undefined", which was a binding problem with onUnbanned. However, fixing that didn't do the intended thing - the user was still shown in the settings. We now just listen for membership and  fix it that way.
2019-10-11 12:56:48 +01:00
Michael Telatynski 6e33cc0650
Merge pull request #3433 from matrix-org/t3chguy/nvl/react16/EventListSummary
Summarise state events after room creation
2019-10-11 09:53:26 +01:00
Michael Telatynski dcc948f43d
Merge pull request #3543 from matrix-org/t3chguy/timeline_keyboard_focus
Don't intercept TAB on the app outside of the composer, fix tabIndex > 0
2019-10-10 17:52:10 +01:00
David Baker c663a57dff Add some type checking on event body 2019-10-10 17:49:21 +01:00
David Baker c2a5253479
Merge pull request #3546 from matrix-org/dbkr/malformed_events
Add some type checking on event body
2019-10-10 17:46:26 +01:00
Bruno Windels 7900e2292d
Merge pull request #3545 from matrix-org/bwindels/fix-edit-unmount-when-no-selection-release
Fix: edit unmount when no selection
2019-10-10 16:45:44 +00:00
David Baker 847acff894 Add some type checking on event body 2019-10-10 17:36:22 +01:00
Bruno Windels 004c3900a9 don't persist caret when selection is missing
so caret will be put back at end of editor when remounting
2019-10-10 18:35:04 +02:00
Bruno Windels 9dd93c52b0 safeguard if the offsetnode is null when determining caret position 2019-10-10 18:35:04 +02:00
Bruno Windels 4fa165ceea
Merge pull request #3544 from matrix-org/bwindels/fix-edit-unmount-when-no-selection
Fix: crash while canceling editing an event when no selection
2019-10-10 14:57:18 +00:00
Bruno Windels f8a610687f don't persist caret when selection is missing
so caret will be put back at end of editor when remounting
2019-10-10 16:40:03 +02:00
Bruno Windels 905aa81bf8 safeguard if the offsetnode is null when determining caret position 2019-10-10 16:39:41 +02:00
Michael Telatynski 5643743167 Don't intercept TAB on the app outside of the composer, fix tabIndex > 0
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-10 14:13:29 +01:00
Travis Ralston c141335b6a
Merge pull request #3542 from matrix-org/travis/t3chguy/settings-flags-release
"SettingsFlag always run ToggleSwitch fully controlled" to release
2019-10-10 14:10:52 +01:00
Michael Telatynski 7160922b77
Merge pull request #3541 from matrix-org/t3chguy/fix_150rc1
SettingsFlag always run ToggleSwitch fully-controlled
2019-10-10 09:39:33 +01:00
Michael Telatynski 61654a338c
Merge pull request #3540 from matrix-org/t3chguy/use_Keyboard.Key
Use Keyboard Key consts instead of hardcoded strings
2019-10-10 09:13:05 +01:00
Michael Telatynski 55f4a0cb44 remove SettingsFlag manualSave altogether
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 23:27:37 +01:00
Michael Telatynski c1b591dfa2 actually always run fully controlled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 23:27:31 +01:00
Michael Telatynski 537bd3700d SettingsFlag always run ToggleSwitch fully-controlled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 23:27:27 +01:00
Michael Telatynski 0d42b8629e remove SettingsFlag manualSave altogether
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 23:20:59 +01:00
Michael Telatynski 685c2f494a actually always run fully controlled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 22:33:14 +01:00
Michael Telatynski 2b9c102f07 SettingsFlag always run ToggleSwitch fully-controlled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 22:27:49 +01:00
Michael Telatynski 58317b1608 Use Keyboard Key variables instead of hardcoded strings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 19:59:11 +01:00
RiotRobot 558a8b72f8 v1.7.0-rc.1 2019-10-09 16:57:14 +01:00
RiotRobot d86cf434f7 Prepare changelog for v1.7.0-rc.1 2019-10-09 16:57:14 +01:00
RiotRobot bd7e909699 js-sdk rc.1 2019-10-09 16:54:05 +01:00
David Baker 84e71297ef
Merge pull request #3539 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-10-09 16:37:05 +01:00
Weblate 5fba897754 Merge branch 'origin/develop' into Weblate. 2019-10-09 15:26:28 +00:00
Szimszon 3771b9fd60 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1830 of 1830 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-09 15:26:28 +00:00
Tentarial fddf13aa49 Translated using Weblate (German)
Currently translated at 84.0% (1537 of 1830 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-10-09 15:26:28 +00:00
jadiof ef6f722d2c Translated using Weblate (German)
Currently translated at 84.0% (1537 of 1830 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-10-09 15:26:27 +00:00
Michael Telatynski ff18a04da1
Merge pull request #3529 from matrix-org/t3chguy/react16_cleanup2
React error/warning cleanup
2019-10-09 16:26:24 +01:00
Weblate ab21265b81 Merge branch 'origin/develop' into Weblate. 2019-10-09 11:38:46 +00:00
J. Ryan Stinnett 93ff43f7e1
Merge pull request #3535 from matrix-org/jryans/tag-react-soft-crashes
Add label to rageshakes for React soft crashes
2019-10-09 12:38:42 +01:00
Michael Telatynski aae5bb9f39 Use new React Shallow renderer with hooks support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 13:08:16 +02:00
Weblate eefcbecd78 Merge branch 'origin/develop' into Weblate. 2019-10-09 11:02:11 +00:00
송태섭 642e58b2c1 Translated using Weblate (Korean)
Currently translated at 100.0% (1828 of 1828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-10-09 11:02:11 +00:00
Kévin C 8ce810830a Translated using Weblate (French)
Currently translated at 100.0% (1828 of 1828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-09 11:02:11 +00:00
Jeff Huang 17dc3aa093 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1828 of 1828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-10-09 11:02:10 +00:00