PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
19758 commits 1 branch 0 tags 338 MiB
Commit graph

19758 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
e47752ff8d Match room upgrade warning to the new design 
See https://github.com/matrix-org/matrix-react-sdk/pull/3684#issuecomment-560514872
 2019-12-02 17:21:53 -07:00
Michael Telatynski
857f086501 Fix ?via= args in SpecPermalinkConstructor.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-03 00:05:19 +00:00
Weblate
340714841b Merge branch 'origin/develop' into Weblate. 2019-12-03 00:03:37 +00:00
Tirifto
0d4f6d6c22 Translated using Weblate (Esperanto) 
Currently translated at 97.1% (1870 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-12-03 00:03:37 +00:00
Travis Ralston
4d5f133b17
Merge pull request #3684 from matrix-org/travis/auto-invite-upgrades 
Add an option to invite users to upgraded private rooms
 2019-12-02 17:03:25 -07:00
Michael Telatynski
901e402a5c apply renames suggested in PR review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 23:23:11 +00:00
Michael Telatynski
757f811126 s/ContextualMenu/ContextMenu/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 23:21:59 +00:00
Michael Telatynski
a062fe0096 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus 2019-12-02 23:20:47 +00:00
Weblate
87163735dc Merge branch 'origin/develop' into Weblate. 2019-12-02 11:37:31 +00:00
Michael Telatynski
a17df6dd38
Merge pull request #3689 from matrix-org/t3chguy/dont_trap_context_menu_keyboard 
Do not trap Key ContextMenu into composer for keyboard a11y
 2019-12-02 11:37:24 +00:00
Weblate
4dba269025 Merge branch 'origin/develop' into Weblate. 2019-12-02 10:28:33 +00:00
random
9466ce330c Translated using Weblate (Italian) 
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-12-02 10:28:32 +00:00
Samu Voutilainen
811ba17d71 Translated using Weblate (Finnish) 
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-12-02 10:28:31 +00:00
Jeff Huang
198ff306d4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-12-02 10:28:30 +00:00
Slavi Pantaleev
6f485d0989 Translated using Weblate (Bulgarian) 
Currently translated at 96.3% (1854 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-12-02 10:28:30 +00:00
Osoitz
a0493b03ae Translated using Weblate (Basque) 
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-12-02 10:28:28 +00:00
Michael Telatynski
947753b04a
Merge pull request #3690 from matrix-org/t3chguy/case_insensitive_emoji_picker_filtering 
Make EmojiPicker filtering case-insensitive
 2019-12-02 10:28:10 +00:00
Michael Telatynski
7a3b8a522f Make EmojiPicker filtering case-insensitive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 10:18:02 +00:00
Michael Telatynski
e2733a27c4 add null-guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 10:06:58 +00:00
Michael Telatynski
3ad4b0fb64 Do not trap Key ContextMenu into composer for keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 10:01:08 +00:00
Weblate
c60149db47 Merge branch 'origin/develop' into Weblate. 2019-11-29 22:14:01 +00:00
Szimszon
1e9021d831 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-11-29 22:14:01 +00:00
Travis Ralston
f4b1c4f360 Remove useless file 2019-11-29 15:13:46 -07:00
Weblate
6df78e4be2 Merge branch 'origin/develop' into Weblate. 2019-11-29 17:18:04 +00:00
Slavi Pantaleev
778e14f716 Translated using Weblate (Bulgarian) 
Currently translated at 95.7% (1843 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-11-29 17:18:04 +00:00
Travis Ralston
9cae685e22
Merge pull request #3686 from matrix-org/travis/theme-fix 
Ensure the settings page accurately represents theme choices
 2019-11-29 10:17:55 -07:00
Weblate
b767d3c15c Merge branch 'origin/develop' into Weblate. 2019-11-29 14:41:56 +00:00
Travis Ralston
1c766d8594
Merge pull request #3688 from matrix-org/travis/rr-fix 
Ensure read receipts end up with a valid reference to checkUnmounting
 2019-11-29 07:41:49 -07:00
Weblate
be9f1ce64a Merge branch 'origin/develop' into Weblate. 2019-11-29 14:41:26 +00:00
Kévin C
69d82bef67 Translated using Weblate (French) 
Currently translated at 100.0% (1926 of 1926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-11-29 14:41:26 +00:00
Travis Ralston
7b1ee944c8
Merge pull request #3687 from matrix-org/travis/rr-velocity 
Convert Velociraptor component to a class
 2019-11-29 07:41:17 -07:00
Weblate
ba24e64f47 Merge branch 'origin/develop' into Weblate. 2019-11-29 05:07:55 +00:00
Samu Voutilainen
70aeafa77b Translated using Weblate (Finnish) 
Currently translated at 100.0% (1925 of 1925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-11-29 05:07:54 +00:00
Jeff Huang
cd7bbd2dc6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1925 of 1925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-11-29 05:07:53 +00:00
Travis Ralston
5aad914c25
Merge pull request #3675 from aaronraimist/labs-explain 
Add a link to the labs feature documentation
 2019-11-28 22:07:47 -07:00
Aaron Raimist
4c50ac0e56
Improve wording 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-11-28 22:22:42 -06:00
Travis Ralston
36f9fab474 Ensure read receipts end up with a valid reference to checkUnmounting 
Fixes https://github.com/vector-im/riot-web/issues/11496
Fixes https://github.com/vector-im/riot-web/issues/11385
Fixes https://github.com/vector-im/riot-web/issues/10007
Fixes https://github.com/vector-im/riot-web/issues/9769

React does (kinda) bind `this._isUnmounting` for us in the context of the EventTile, but the EventTile then passes the function straight through to the ReadReceiptMarker component, which then binds it in the context of EventTile. This results in `this._mounted` being falsey all the time, preventing the ReadReceiptMarker from hitting the code where it updates rrInfo in its unmount. 

The velocity stuff is smart enough to realize that it has a read receipt and shuffles everything over by one, but when it goes to check the starting height (which will be null/undefined because the RRMarker didn't update it) it assumes it has never seen the receipt before and appends it again - this is what causes some holes/stacking.

By forcefully binding the `this._isUnmounting` function we ensure that the `this._mounted` variable is correctly referenced in the context of the MessagePanel, allowing the RRMarker to update its position, and therefore allowing the velocity behaviour to be consistent.
 2019-11-28 19:45:37 -07:00
Travis Ralston
24843cf25e Convert Velociraptor to a class 2019-11-28 19:36:30 -07:00
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