mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 20:41:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
33575 commits 219 branches 562 tags 474 MiB
Commit graph

26698 commits

Author SHA1 Message Date
Michael Telatynski
6e25e42e66 Show subspace rooms count even if it is 0 for consistency 2021-05-19 13:00:46 +01:00
Michael Telatynski
a9d0699488
Merge pull request #6062 from matrix-org/t3chguy/fix/17280 
Show DMs in space for invited members too, to match Android impl
 2021-05-19 12:41:46 +01:00
Michael Telatynski
f985918859
Merge pull request #6057 from matrix-org/t3chguy/fix/17350 
Support filtering by alias in add existing to space dialog
 2021-05-19 12:29:00 +01:00
Michael Telatynski
bde95e313d
Merge pull request #6064 from matrix-org/t3chguy/fix/rs5084 
Fix issue when a room without a name or alias is marked as suggested
 2021-05-19 12:28:41 +01:00
Michael Telatynski
9b01e1575d
Merge pull request #6055 from matrix-org/t3chguy/fix/17332 
Fix space room hierarchy not updating when removing a room
 2021-05-19 12:28:11 +01:00
J. Ryan Stinnett
d597781919
Merge pull request #6060 from matrix-org/revert-6024-travis/roomlist-corruption 
Revert "Try putting room list handling behind a lock"
 2021-05-19 12:25:44 +01:00
Michael Telatynski
78a8c9e10e Fix issue when a room without a name or alias is marked as suggested 2021-05-19 10:46:11 +01:00
Fake Mail
575e27ea0e Translated using Weblate (Bulgarian) 
Currently translated at 87.6% (2601 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
 2021-05-19 09:36:59 +00:00
Hivaa
5ea4f91654 Translated using Weblate (Persian) 
Currently translated at 20.2% (602 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2021-05-19 09:36:47 +00:00
jelv
9f4c75fd4f Translated using Weblate (Dutch) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-05-19 09:36:46 +00:00
Germain
f7d0afcd28
Performance monitoring measurements (#6041) 2021-05-19 10:07:02 +01:00
Jaiwanth
e78206301f Modify to avoid forceUpdate 2021-05-19 14:31:04 +05:30
Michael Telatynski
73b24ae225 move WatchManager over to an ES6 Map 2021-05-19 09:24:46 +01:00
Michael Telatynski
cf501371fa move Settings monitors over to an ES6 Map 2021-05-19 09:11:14 +01:00
Michael Telatynski
cb2ee0451d move Settings watchers over to an ES6 Map 2021-05-19 09:06:01 +01:00
Michael Telatynski
e18120f412 Show DMs in space for invited members too, to match Android impl 2021-05-19 08:55:56 +01:00
Jaiwanth
0d8a7eabc7 Update MemberList on invite permission change 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-19 12:49:55 +05:30
Travis Ralston
ec7c1ab9f0
Revert "Try putting room list handling behind a lock" 2021-05-18 15:40:09 -06:00
Hivaa
da3e0a4cb4 Translated using Weblate (Persian) 
Currently translated at 20.2% (601 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2021-05-18 16:57:23 +00:00
LinAGKar
90c660a74f Translated using Weblate (Swedish) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-05-18 16:57:22 +00:00
Thibault Martin
8eb0a8b3b5 Translated using Weblate (French) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-18 16:57:20 +00:00
libexus
00024c794c Translated using Weblate (German) 
Currently translated at 99.6% (2958 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-18 16:57:18 +00:00
Germain
cf384c2a54
Merge pull request #6052 from matrix-org/gsouquet/decrypt-relations 2021-05-18 17:21:13 +01:00
J. Ryan Stinnett
fc6ff86173 Add error detail when languges fail to load 
This will at least log the path that's failing with status code, so we can
better confirm the issue.

Related to https://github.com/vector-im/element-web/issues/9422
 2021-05-18 16:34:01 +01:00
Germain Souquet
0e221ae548 Start decryption process if needed 2021-05-18 16:24:38 +01:00
Michael Telatynski
edb2026780 Support any alias not just first 2021-05-18 13:31:53 +01:00
Michael Telatynski
655010844a Switch to using QueryMatcher for add existing to space dialog 
This helps it support filtering by alias
 2021-05-18 13:27:34 +01:00
Germain Souquet
f9f10de0da use renamed decrypt event method 2021-05-18 13:01:38 +01:00
Michael Telatynski
367ad1583d
Merge pull request #6053 from matrix-org/t3chguy/fix/17338 
Add space invaders chat effect
 2021-05-18 12:14:40 +01:00
Michael Telatynski
177adb9684 fix copy-pasta 2021-05-18 11:58:15 +01:00
Michael Telatynski
16b60d1524
Merge pull request #6051 from matrix-org/t3chguy/fix/17313 
Create SpaceProvider and hide Spaces from the RoomProvider autocompleter
 2021-05-18 11:55:20 +01:00
Michael Telatynski
2732280923 Fix space room hierarchy not updating when removing a room 2021-05-18 11:54:45 +01:00
Germain Souquet
1cfd4b6e1a Use client.decryptEvent to avoid accessing js-sdk private members 2021-05-18 11:41:20 +01:00
J. Ryan Stinnett
b6d9c4e6ad
Merge pull request #6049 from aaronraimist/redacted-unread 
Don't mark a room as unread when redacted event is present
 2021-05-18 11:00:42 +01:00
Michael Telatynski
b5a612cd0f Add space invaders chat effect 2021-05-18 10:29:10 +01:00
Michael Telatynski
afd9843722 Fix broken string interpolation in chat effects warning 2021-05-18 10:28:37 +01:00
Michael Telatynski
1166e76928 Extract and deduplicate chat effect interfaces 2021-05-18 10:28:15 +01:00
Germain Souquet
871c48f69b stop assuming that decryption happens ahead of time 2021-05-18 10:02:21 +01:00
Michael Telatynski
f87f0704b9 i18n 2021-05-18 09:42:35 +01:00
Michael Telatynski
19a94d55bd Create SpaceProvider and hide Spaces from the RoomProvider autocompleter 2021-05-18 09:39:01 +01:00
Aaron Raimist
3a2c1af70c
Don't mark a room as unread when redacted event is present 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-05-18 00:01:11 -05:00
Travis Ralston
6ccb0d487a Merge branch 'develop' into travis/msc2873 2021-05-17 16:27:20 -06:00
Travis Ralston
3308368ac6
Merge pull request #5960 from matrix-org/travis/msc2876 
Support UI for MSC2762: Widgets reading events from rooms
 2021-05-17 16:26:53 -06:00
Trendyne
34f902229e Translated using Weblate (Icelandic) 
Currently translated at 22.1% (656 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
 2021-05-17 19:50:30 +00:00
XoseM
f3e8d137de Translated using Weblate (Galician) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-05-17 19:50:05 +00:00
waclaw66
0e2ddec7a3 Translated using Weblate (Czech) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-17 19:50:03 +00:00
Kaede
af5bc71602 Translated using Weblate (Japanese) 
Currently translated at 77.4% (2300 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2021-05-17 19:49:59 +00:00
Andrejs
3c526be5de Translated using Weblate (Latvian) 
Currently translated at 49.5% (1470 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lv/
 2021-05-17 19:49:54 +00:00
Jeff Huang
0aa666693f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-05-17 19:49:52 +00:00
LinAGKar
fc4ee0df4b Translated using Weblate (Swedish) 
Currently translated at 99.9% (2966 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-05-17 19:49:48 +00:00
jelv
5e0db72582 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-05-17 19:49:40 +00:00
Thibault Martin
b48be43a2f Translated using Weblate (French) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-17 19:49:37 +00:00
Thomas Citharel
9d538614c4 Translated using Weblate (French) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-17 19:49:36 +00:00
iaiz
ba5a769a60 Translated using Weblate (Spanish) 
Currently translated at 99.9% (2966 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-05-17 19:49:33 +00:00
libexus
fa77bd91bb Translated using Weblate (German) 
Currently translated at 98.9% (2937 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-17 19:49:29 +00:00
Robin Townsend
d3f1754dfd Fix crash on opening notification panel 
The check for pending edits needed a null guard, since the notification
panel uses MessagePanel but is not associated with a specific room.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-17 12:24:41 -04:00
Germain Souquet
7e846b8532 remove unused import 2021-05-17 15:05:20 +01:00
Germain Souquet
c67f31144f remove custom LoggedInView::shouldComponentUpdate logic 2021-05-17 14:45:41 +01:00
Michael Telatynski
6e5847ea6b Fix right clicking on add reactions prompt button behaviour 2021-05-17 10:01:56 +01:00
Michael Telatynski
a22a1918e1 Fix add reactions prompt button showing up even if all reactions have been removed 2021-05-17 10:01:43 +01:00
Robin Townsend
555b2e3266 Reuse Spinner styles for InlineSpinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:00:54 -04:00
Robin Townsend
74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Michael Telatynski
b06514273f
Merge pull request #6043 from SimonBrandner/fix/add-ids 
Add ids to homeserver and passphrase fields
 2021-05-15 15:22:27 +01:00
Šimon Brandner
bdf7837044
Add mx to homeserverInput 2021-05-15 16:13:26 +02:00
Šimon Brandner
ce4439e118
Add mx to passPhraseInput 2021-05-15 16:13:02 +02:00
Šimon Brandner
37348375a2
Add id for passpharase 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-15 15:07:35 +02:00
Šimon Brandner
fef081c736
Add id for homeserver field 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-15 15:07:15 +02:00
Michael Telatynski
1b8402f39c
Merge pull request #6042 from matrix-org/t3chguy/fix/17304 
Update space order field validity requirements to match msc update
 2021-05-14 23:19:52 +01:00
Michael Telatynski
a48d786547 Update space order field validity requirements to match msc update 2021-05-14 22:59:03 +01:00
Travis Ralston
89933d779c Merge branch 'develop' into travis/msc2873 2021-05-14 14:22:53 -06:00
Travis Ralston
56097e55c4 We're ELEMENT 2021-05-14 14:22:31 -06:00
Travis Ralston
5093657c71 Remove "read" level language for new API scope 2021-05-14 14:17:10 -06:00
Travis Ralston
98b2e120a7 Merge branch 'develop' into travis/msc2876 2021-05-14 14:09:57 -06:00
Aaron Raimist
b834ac8a08 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-05-14 17:19:12 +00:00
Priit Jõerüüt
159693fc47 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-05-14 17:19:12 +00:00
Trendyne
779972ea51 Translated using Weblate (Icelandic) 
Currently translated at 16.2% (481 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
 2021-05-14 17:19:08 +00:00
Aaron Raimist
bf5e07db88 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2961 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-05-14 17:18:58 +00:00
Besnik Bleta
7e1f5625fa Translated using Weblate (Albanian) 
Currently translated at 99.7% (2961 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-05-14 17:18:57 +00:00
Aaron Raimist
9cc2465787 Translated using Weblate (Galician) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-05-14 17:18:49 +00:00
XoseM
126077a678 Translated using Weblate (Galician) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-05-14 17:18:48 +00:00
Aaron Raimist
d862df9f05 Translated using Weblate (Czech) 
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-14 17:18:45 +00:00
Aaron Raimist
1b67e68061 Translated using Weblate (Italian) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-05-14 17:18:43 +00:00
random
00508faf9d Translated using Weblate (Italian) 
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-05-14 17:18:43 +00:00
Aaron Raimist
fc3d56cdc3 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-05-14 17:18:39 +00:00
Aaron Raimist
6e47f968fa Translated using Weblate (Swedish) 
Currently translated at 98.4% (2922 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-05-14 17:18:37 +00:00
Aaron Raimist
57d3c525e2 Translated using Weblate (Dutch) 
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-05-14 17:18:35 +00:00
Aaron Raimist
6def74a418 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2965 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-05-14 17:18:34 +00:00
Szimszon
59144ac935 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2965 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-05-14 17:18:33 +00:00
Aaron Raimist
d74ab2a4f9 Translated using Weblate (French) 
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-14 17:18:30 +00:00
Aaron Raimist
796306fa8f Translated using Weblate (Spanish) 
Currently translated at 99.4% (2953 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-05-14 17:18:28 +00:00
Aaron Raimist
2d74ee722a Translated using Weblate (English (United States)) 
Currently translated at 19.7% (585 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/en_US/
 2021-05-14 17:18:26 +00:00
Aaron Raimist
0642952d5f Translated using Weblate (German) 
Currently translated at 98.8% (2935 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-14 17:18:26 +00:00
libexus
08d855c8b9 Translated using Weblate (German) 
Currently translated at 98.8% (2935 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-14 17:18:25 +00:00
Travis Ralston
01491f4cba
Merge pull request #6024 from matrix-org/travis/roomlist-corruption 
Try putting room list handling behind a lock
 2021-05-14 11:06:19 -06:00
Travis Ralston
336904cef8
Apply suggestions from code review 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-05-14 11:05:49 -06:00
Travis Ralston
55eddae096
Merge pull request #6035 from matrix-org/travis/voicemessages/playback-time 
Improve progress bar progression for smaller voice messages
 2021-05-14 10:17:35 -06:00
Michael Telatynski
49b24408bb
Merge pull request #6039 from matrix-org/t3chguy/public-space-no-invite 
Fix share space edge case where space is public but not invitable
 2021-05-14 16:46:50 +01:00
Travis Ralston
6df079a5bd
Merge pull request #6033 from matrix-org/travis/rel-imageview 
Add missing 'rel' to image view download button
 2021-05-14 08:12:11 -06:00
Travis Ralston
8066e5402c
Merge pull request #6034 from matrix-org/travis/voicemessages/waveform-noise 
Improve visible waveform for voice messages
 2021-05-14 08:12:01 -06:00
Michael Telatynski
882000dfcb
Merge pull request #6040 from matrix-org/t3chguy/fix/17296 
Fix roving tab index intercepting home/end in space create menu
 2021-05-14 15:07:34 +01:00
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276 
Decorate room avatars with publicity in add existing to space flow
 2021-05-14 11:23:46 +01:00
Michael Telatynski
d0458332d5 fix roving tab index intercepting home/end in space create menu 2021-05-14 11:22:20 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674 
Improve Spaces "Just Me" wizard
 2021-05-14 10:58:55 +01:00
Michael Telatynski
6f9c2f05a2 remove unused vars/imports 2021-05-14 10:49:53 +01:00
Michael Telatynski
034bd9cb02
Merge pull request #6029 from matrix-org/t3chguy/fix/17275 
Show alternative button during space creation wizard if no rooms
 2021-05-14 10:48:39 +01:00
Michael Telatynski
e1df62472d remove unused imports and run i18n 2021-05-14 10:48:24 +01:00
Michael Telatynski
f31f7b243d Fix share space edge case where space is public but not invitable 2021-05-14 10:46:09 +01:00
Weblate
14aa5c20d0 Merge branch 'origin/develop' into Weblate. 2021-05-14 04:37:46 +00:00
Trendyne
3f9ef015c7 Translated using Weblate (Icelandic) 
Currently translated at 13.7% (407 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
 2021-05-14 04:37:45 +00:00
XoseM
c5093cafad Translated using Weblate (Galician) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-05-14 04:37:44 +00:00
random
7248f28278 Translated using Weblate (Italian) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-05-14 04:37:36 +00:00
libexus
f595813e21 Translated using Weblate (German) 
Currently translated at 99.1% (2935 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-14 04:37:29 +00:00
Travis Ralston
ddf9027daa Improve progress bar progression for smaller voice messages 
Instead of chunking the thing, we'll improve our precision and clock accuracy. Clock accuracy is improved by flagging the "load time" of the clip in the context, which can be about 500ms (or more) off the context's start line. The precision is just a number in the PlaybackWaveform component.
 2021-05-13 22:35:43 -06:00
Travis Ralston
df7b598ca7 Improve visible waveform for voice messages 
This tries to prioritize actual voice to decide the waveform, and clamps noise to zero to ensure the waveform doesn't have a perceptually noisy base.

In theory this better matches the overall voice message content.
 2021-05-13 22:20:08 -06:00
Jaiwanth
26dd6d5510 Swap rotate left and right buttons 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-14 08:26:29 +05:30
Travis Ralston
b9f775d969 Add missing 'rel' to image view download button 
We're supposed to have this on every link off-site.
 2021-05-13 20:55:14 -06:00
Travis Ralston
e38d27f64e
Merge pull request #5915 from aaronraimist/initialisation 
Typo: initilisation -> initialisation
 2021-05-13 20:15:08 -06:00
Travis Ralston
2d2c0d54c0
Merge pull request #6001 from jaiwanth-v/save-edited-state-messages 
Save edited state of a message when switching rooms
 2021-05-13 20:06:31 -06:00
Michael Telatynski
9dd9dafce1
Merge pull request #6022 from matrix-org/t3chguy/fix/16622 
Fix shield icon in Untrusted Device Dialog
 2021-05-13 19:10:59 +01:00
Germain
cad173ea24
Merge pull request #6028 from matrix-org/gsouquet/do-not-decrypt-breadcrumb 
Do not eagerly decrypt breadcrumb rooms
 2021-05-13 17:22:45 +01:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Michael Telatynski
2e86d53cd1
Merge pull request #6027 from matrix-org/t3chguy/fix/i80 
Encourage more diverse reactions to content
 2021-05-13 16:01:28 +01:00
Germain Souquet
a37f415a21 Do not eagerly decrypt breadcrumb rooms 2021-05-13 14:26:22 +01:00
Michael Telatynski
6aa477f0f5 Decorate room avatars with publicity in add existing to space flow 2021-05-13 14:23:28 +01:00
Michael Telatynski
f6e8d38b87 Remove redundant tag prop 2021-05-13 14:23:10 +01:00
Michael Telatynski
a41d76b588 fix typos 2021-05-13 14:14:01 +01:00
Michael Telatynski
76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00
Michael Telatynski
87ae47bd61 tweak reactions row some more, third try lucky 2021-05-13 13:59:10 +01:00
Michael Telatynski
36633ec025 Tweak alignment of reactions row, move add reaction to right and only show on hover 2021-05-13 13:32:38 +01:00
Michael Telatynski
2f28de8472 Show alternative button during space creation wizard if user opted to create 0 rooms 2021-05-13 13:22:50 +01:00
Michael Telatynski
b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Michael Telatynski
dd04b479a1 Wrap decodeURIComponent in try-catch to protect against malformed URIs 2021-05-13 10:20:27 +01:00
Michael Telatynski
423c515708 Consolidate AddExistingToSpace between Dialog and Just Me integrated flow 2021-05-13 09:46:45 +01:00
Travis Ralston
deab424c93 Appease the linter 2021-05-12 21:19:31 -06:00
Travis Ralston
9beb2b8d78 Try putting room list handling behind a lock 
Some of the logs relating to room list corruption appear to be badly timed race conditions so we'll try to linearize them here.
 2021-05-12 21:15:17 -06:00
Priit Jõerüüt
68fcc259d0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-05-12 20:28:27 +00:00
waclaw66
3169f75e90 Translated using Weblate (Czech) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-12 20:28:19 +00:00
Jeff Huang
9e981ae118 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-05-12 20:28:11 +00:00
jelv
7be918f527 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-05-12 20:28:03 +00:00
Szimszon
61f90cdc45 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-05-12 20:27:55 +00:00
Thibault Martin
93ca9e6891 Translated using Weblate (French) 
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-12 20:27:48 +00:00
iaiz
bf9dd05b3c Translated using Weblate (Spanish) 
Currently translated at 99.8% (2956 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-05-12 20:27:41 +00:00
libexus
c9988d59a1 Translated using Weblate (German) 
Currently translated at 99.3% (2939 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-12 20:27:33 +00:00
Travis Ralston
f98eee318e Fill out fields for MSC2873 values 
As required by https://github.com/matrix-org/matrix-widget-api/pull/36
 2021-05-12 14:10:02 -06:00
Travis Ralston
3aef3b72b5 Move language handling into languageHandler 2021-05-12 14:08:32 -06:00
Michael Telatynski
52420feab0
Merge pull request #6021 from matrix-org/t3chguy/fix/17268 
Iterate beta feedback dialog
 2021-05-12 17:42:42 +01:00
Michael Telatynski
654ce95c74 Progress from adding existing rooms to new space upon completion 2021-05-12 17:31:55 +01:00
Michael Telatynski
236fcecf9c i18n 2021-05-12 17:13:23 +01:00
Michael Telatynski
5430f44c27 Convert verification and UntrustedDeviceDialog to TS 2021-05-12 17:08:44 +01:00
Michael Telatynski
565e41c3df Extract UntrustedDeviceDialog and fix e2ee icon 2021-05-12 17:04:24 +01:00
Michael Telatynski
607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski
2c89be312a Disable space fields whilst their form is busy 2021-05-12 13:30:00 +01:00
J. Ryan Stinnett
23869cdaa7 Add missing space on beta feedback dialog 2021-05-12 12:32:39 +01:00
Germain
91133ed35b
Prioritise and reduce the amount of events decrypted on application startup (#5980) 2021-05-12 12:19:53 +01:00
Germain
bd2917aa69
Add a limit option for autocomplete results (#6016) 2021-05-12 12:18:56 +01:00
Michael Telatynski
2c2d95560b Linkify topics in space room directory results 2021-05-12 10:05:53 +01:00
Travis Ralston
7bd1a2b87f
Merge pull request #5972 from SimonBrandner/fix/17164/remember-collapsed-state 
Persistent space collapsed states
 2021-05-11 23:23:48 -06:00
Šimon Brandner
262fc40afb
Move comment to the correct place 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-12 07:12:00 +02:00
Travis Ralston
9842bcde50
Merge pull request #6010 from ndarilek/develop 
Catch another instance of unlabeled avatars.
 2021-05-11 21:44:15 -06:00
Michael Telatynski
ea9be0dd4c
Merge pull request #6012 from matrix-org/t3chguy/fix/17238 
Add feedback mechanism for beta features, namely Spaces
 2021-05-11 17:46:21 +01:00
Michael Telatynski
7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Travis Ralston
b1cb2b1d93 Fix bad merge 2021-05-11 10:19:09 -06:00
Travis Ralston
d8e3458c55 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/resample2 2021-05-11 10:15:37 -06:00
Travis Ralston
92e30f0607 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev 2021-05-11 10:13:21 -06:00
Travis Ralston
d1cfde6f12
Merge pull request #5989 from matrix-org/travis/voicemessages/safari 
Support voice messages on Safari
 2021-05-11 10:12:31 -06:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Weblate
350b5e37d3 Merge branch 'origin/develop' into Weblate. 2021-05-11 15:26:43 +00:00
Michael Telatynski
bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Nolan Darilek
006aa2d5b9 Catch another instance of unlabeled avatars. 
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
 2021-05-11 09:39:06 -05:00
Michael Telatynski
6ece4ef2ab i18n 2021-05-11 14:08:09 +01:00
Jaiwanth
240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Michael Telatynski
df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-05-11 14:07:47 +01:00
Michael Telatynski
2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-05-11 13:40:28 +01:00
Michael Telatynski
f0342b0ea7
Merge pull request #6009 from matrix-org/t3chguy/fix/15359 
Improve permissions error when adding new server to room directory
 2021-05-11 12:36:40 +01:00
Michael Telatynski
b0f23aa65b Improve permissions error when adding new server to room directory 2021-05-11 12:20:18 +01:00
Michael Telatynski
2b2e74b65e
Merge pull request #6006 from matrix-org/t3chguy/fix/17227 
Allow user to progress through space creation & setup using Enter
 2021-05-11 12:02:14 +01:00
c-cal
5b9b878808 Translated using Weblate (French) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-11 10:34:32 +00:00
Germain Souquet
da1df70557 Improve comments and explainer for new decryption approach 2021-05-11 10:18:53 +01:00
Šimon Brandner
1b877f2b7c
Make SpaceTreeLevelLayoutStore into a singleton 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:16:14 +02:00
Šimon Brandner
4115fd8695
Rewrite SpaceTreeLevelLayoutStore to save paths 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:13:13 +02:00
Michael Telatynski
23001cb10d remove unused import 2021-05-11 10:11:51 +01:00
Germain Souquet
be236309c5 use arrayFastClone instead of slice 2021-05-11 10:08:57 +01:00
Michael Telatynski
de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
J. Ryan Stinnett
f3f6bf7c8f
Merge pull request #6007 from matrix-org/jryans/cheerio-upgrade 
Upgrade `cheerio` and resolve type errors
 2021-05-11 09:35:48 +01:00
Michael Telatynski
5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Šimon Brandner
965af1a642
Initial SpaceTreeLevelLayoutStore implementation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 08:08:02 +02:00
Jaiwanth
87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Šimon Brandner
bc0ff5bbea
Merge branch 'develop' into fix/17164/remember-collapsed-state 2021-05-11 07:38:08 +02:00
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-05-11 10:37:53 +05:30
Travis Ralston
7ac12d14af
Merge pull request #5865 from jaiwanth-v/edit-slashcommands 
Add slash commands support to edit message composer
 2021-05-10 20:16:44 -06:00
Travis Ralston
12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston
beef07bdef Merge branch 'develop' into err 2021-05-10 20:08:19 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Travis Ralston
379d19e2e0
Lint 2021-05-10 19:56:30 -06:00
J. Ryan Stinnett
7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Germain Souquet
c96f11db7d appease linter 2021-05-10 17:22:33 +01:00
J. Ryan Stinnett
9c8e89ff79 Fix importing 2021-05-10 16:55:27 +01:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1 
Switch the Home Space out for an All rooms space
 2021-05-10 16:26:05 +01:00
Michael Telatynski
95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name 
Show device ID in UserInfo when there is no device name
 2021-05-10 16:19:56 +01:00
J. Ryan Stinnett
f41fc7e46c Upgrade cheerio and resolve type errors 
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
 2021-05-10 16:10:39 +01:00
Michael Telatynski
c96bb374ea Allow user to progress through space setup wizard using Enter/Return 2021-05-10 16:06:23 +01:00
Germain Souquet
f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +01:00
Germain Souquet
d0d2907a07 Decrypt events ahead of storing them in the index 2021-05-10 15:19:46 +01:00
Michael Telatynski
3a75eb1226 Fix handling of enter/return in space creation menu 2021-05-10 14:39:10 +01:00
J. Ryan Stinnett
4311d91372
Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta 
Don't use the event's metadata to calc the scale of an image
 2021-05-10 13:06:08 +01:00
J. Ryan Stinnett
45acf70b00
Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype 
Adjust MIME type of upload confirmation if needed
 2021-05-10 10:21:35 +01:00
Jaiwanth
1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30
Jaiwanth
6f98aa06c4 Save edited state when switching rooms 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-09 13:42:01 +05:30
Besnik Bleta
7bd06d5d3a Translated using Weblate (Albanian) 
Currently translated at 99.5% (2919 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-05-08 08:35:06 +00:00
XoseM
91e05b9152 Translated using Weblate (Galician) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-05-08 08:35:03 +00:00
Šimon Brandner
4b49281aaa Translated using Weblate (Czech) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-08 08:34:59 +00:00
waclaw66
60091a663f Translated using Weblate (Czech) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-08 08:34:59 +00:00
random
ee86a87ba2 Translated using Weblate (Italian) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-05-08 08:34:57 +00:00
sebmod78
0faaf3ce82 Translated using Weblate (Polish) 
Currently translated at 71.7% (2103 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-05-08 08:34:54 +00:00
Jeff Huang
39e754e41f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-05-08 08:34:52 +00:00
LinAGKar
b04109df2f Translated using Weblate (Swedish) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-05-08 08:34:48 +00:00
jelv
42d6032d64 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-05-08 08:34:45 +00:00
Szimszon
a7744c5153 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-05-08 08:34:42 +00:00
Thibault Martin
28fbe32ba7 Translated using Weblate (French) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-08 08:34:38 +00:00
iaiz
d27b4ee9ce Translated using Weblate (Spanish) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-05-08 08:34:35 +00:00
libexus
f4052fe487 Translated using Weblate (German) 
Currently translated at 99.5% (2919 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-08 08:34:31 +00:00
Travis Ralston
389e0b8e8e wrong const 2021-05-07 21:11:31 -06:00
Travis Ralston
90798c2c8e copy/paste will end me one day 2021-05-07 21:09:10 -06:00
Travis Ralston
b007ea81b2 Rescale and smooth playback waveform to better match expectation 2021-05-07 21:06:07 -06:00
Travis Ralston
aac1f4330d Remove "in development" flag from voice messages 2021-05-07 19:36:29 -06:00
Aaron Raimist
fa307ee14c
Update src/components/views/right_panel/UserInfo.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-05-07 18:41:47 -05:00
Robin Townsend
119c14c3f9 Forbid redaction of encryption events 
Redacting m.room.encryption events will leave the room in a broken
state, and so we shouldn't allow the user to do this.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-07 12:49:37 -04:00
Germain Souquet
6e3f8d6a0a Decrypt last events first to avoid shifts when scrolling up 2021-05-07 15:26:16 +01:00
Germain Souquet
fa30285c6b Decrypt messages on when used on a timeline 2021-05-07 15:16:54 +01:00
Ayush PS
32edbc155f Merge remote-tracking branch 'origin/develop' into err 2021-05-07 19:16:00 +05:30
Michael Telatynski
74bcb921ff
Merge pull request #5990 from matrix-org/t3chguy/ts/parse5 
Add dev dependency for parse5 typings
 2021-05-07 13:49:13 +01:00
Germain Souquet
5bd4120920 Decrypt breadcrumb events for better UX 2021-05-07 12:58:37 +01:00
Michael Telatynski
cb13200c2d last minute copy tweak 2021-05-07 11:56:41 +01:00
Michael Telatynski
1fc591628a i18n 2021-05-07 11:51:37 +01:00
Michael Telatynski
a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
 2021-05-07 11:50:49 +01:00
Michael Telatynski
6338ced8a3
Merge pull request #5977 from matrix-org/t3chguy/fix/17176 
Iterate Spaces admin UX around room management
 2021-05-07 11:47:45 +01:00
Germain Souquet
17099c656b Call renamed room::decryptAllEvents method 2021-05-07 11:25:25 +01:00
Michael Telatynski
f0e61e6286 short circuit automatic switch to related space behaviour and fix tests 2021-05-07 11:08:18 +01:00
Michael Telatynski
57be074811 i18n 2021-05-07 10:48:03 +01:00
Michael Telatynski
6137162786 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1 
 Conflicts:
	src/stores/room-list/RoomListStore.ts
 2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski
6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs 
Guard all isSpaceRoom calls behind the labs flag
 2021-05-07 10:28:14 +01:00
Michael Telatynski
db5c0012c2 Add dev dependency for parse5 typings 2021-05-07 10:11:56 +01:00
Travis Ralston
65f591b69b Make the tests happier 
Here we just override the workers because we're not expecting to be able to test them this way. The code paths involved shouldn't be touched.
 2021-05-06 22:08:00 -06:00
Travis Ralston
f65773ef95 Appease the linter 2021-05-06 21:49:53 -06:00
Travis Ralston
b08e47bfe1 Support compatibility points for Safari 
Tested on MacOS Big Sur, Safari 14.0.3
 2021-05-06 21:43:17 -06:00
Travis Ralston
b61fe2f8e6 Improve error recovery when starting a recording 
This helps return the microphone access to the user.
 2021-05-06 21:43:17 -06:00
Aaron Raimist
1f2895dbe9 Merge branch 'develop' into blank-device-name 2021-05-06 20:19:49 -05:00