d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-31 18:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
3842 commits 62 branches 46 tags 30 MiB
Commit graph

703 commits

Author SHA1 Message Date
Nicolas Werner
18ff58edb3
Fix use after free from Qml widget 2021-05-30 00:23:57 +02:00
Nicolas Werner
2174f6507f
Fix warning 2021-05-28 23:50:04 +02:00
Nicolas Werner
03d30a2abc
Delete old room list 2021-05-28 23:25:57 +02:00
Nicolas Werner
298822baea
Move currentRoom/timeline handling to roomlist 2021-05-28 22:14:59 +02:00
Nicolas Werner
e2765212fb
Reimplement room context menus 2021-05-28 17:25:46 +02:00
Nicolas Werner
c290b0747f
Reenable invites 2021-05-24 14:04:07 +02:00
Nicolas Werner
d307f24adf
Fix leaving rooms 2021-05-22 11:23:16 +02:00
Nicolas Werner
f3d956aebc
Fix emoji in new RoomList 2021-05-22 10:16:42 +02:00
Nicolas Werner
beeb60e4a1
Sort the room list 2021-05-22 00:57:14 +02:00
Nicolas Werner
cd67046f60
Make roomlist look nice 2021-05-21 21:19:03 +02:00
Nicolas Werner
10fd2752f9
Some basic room list 2021-05-19 19:34:10 +02:00
Nicolas Werner
39a43ad4ab
Reorganize TimelineView to prepare porting the room list 2021-05-14 15:23:40 +02:00
Nicolas Werner
22afa122c4
Move openLink to Nheko globals 2021-05-13 08:53:56 +02:00
Nicolas Werner
a7f8b23b52
Make palette global in Qml 2021-05-13 08:23:56 +02:00
Nicolas Werner
b60d6f4d58
Mark unsent events as uneditable 
fixes #574
 2021-05-09 13:02:41 +02:00
Nicolas Werner
0d0709ccd3
Show verification status next to messages 2021-05-07 17:01:57 +02:00
Nicolas Werner
ab0baf5d9e
Only show actions, when you have permissions to do them 2021-05-02 18:06:56 +02:00
Nicolas Werner
986b561c34
Fix crash when you have no rooms and open the profile as well as not rendering rooms without groups 2021-04-30 15:33:17 +02:00
Nicolas Werner
f626de0447
Copy link to message 
fixes #499
 2021-04-29 21:46:49 +02:00
Nicolas Werner
82fa8ab292
Highlight navigated to message 2021-04-29 19:09:16 +02:00
Nicolas Werner
620b6e8838
Fix some encoding issues when translating matrix.to to matrix: 2021-04-29 13:12:09 +02:00
Nicolas Werner
dbf23fafbf
Make pagination logic slightly more robust 2021-04-29 10:23:50 +02:00
Nicolas Werner
76a9240076
Rewrite matrix.to links to matrix uris and handle them the same way 2021-04-28 20:03:52 +02:00
Nicolas Werner
2b253ead9e
Make forward messages a bit more readable 2021-04-27 11:33:46 +02:00
Nicolas Werner
8236f6ba72
Merge branch 'forward_message_feature' of https://github.com/Jedi18/nheko into Jedi18-forward_message_feature 2021-04-24 14:35:21 +02:00
targetakhil
ddb1983c63 fix macos build error 2021-04-22 11:06:19 +05:30
Nicolas Werner
d6109b95fb
Escape html in topics and show line breaks in the settings 2021-04-19 11:20:52 +02:00
Nicolas Werner
c2e625756c
Use one CompletionProxy for everything including EmojiPicker 2021-04-18 21:53:39 +02:00
Joseph Donofry
a402e85a0f
Fix display name referenced for incorrect event types 2021-04-18 15:32:28 -04:00
targetakhil
ab83c7c3a8 change display name wording 2021-04-18 11:43:02 +05:30
targetakhil
2dfa40e017 strip reply fallbacks from forwarded message 2021-04-18 11:22:44 +05:30
targetakhil
06e12a0a16 move detection code to nheko namespace and fix a few other bugs 2021-04-17 22:58:04 +05:30
targetakhil
eb13f7c169 directly upload old file object and reuse old message 2021-04-17 22:28:17 +05:30
targetakhil
9934004702 remove unused function and set position to center of timeline view 2021-04-15 22:37:47 +05:30
targetakhil
6893e3a8d5 show forward menu item only for relevant events, changes to ui 2021-04-15 22:37:47 +05:30
targetakhil
603ff33ea6 added basic forwarding 2021-04-15 22:37:41 +05:30
LordMZTE
2e597263a2 add notice and rainbownotice commands 2021-04-11 21:47:20 +02:00
Nicolas Werner
ff449c705c
Fix crash on exit 2021-04-09 01:47:13 +02:00
Nicolas Werner
ec6f0f9296
Don't use direct image response objects anymore 2021-04-05 13:58:00 +02:00
Nicolas Werner
8719d59e22
Fix rainbow replies and add rainbowme 2021-04-01 17:51:30 +02:00
DeepBlueV7.X
326f48d87f
Merge pull request #535 from LordMZTE/feature/rainbow 
add /rainbow command
 2021-03-28 18:23:50 +00:00
LordMZTE
4b45c61024 run formatter 2021-03-28 17:37:36 +02:00
DeepBlueV7.X
3317d4582d
Update src/timeline/InputBar.cpp 2021-03-28 14:00:13 +00:00
DeepBlueV7.X
463dd20682
Use QRegularExpression 2021-03-28 13:59:47 +00:00
LordMZTE
6c31bb6ddc fix command parsing 2021-03-28 15:36:46 +02:00
LordMZTE
ff2e7bb989 commands now also work with newline after them 2021-03-28 14:49:34 +02:00
LordMZTE
4e6150f28e implement requested changes 2021-03-28 14:00:35 +02:00
Loren Burkholder
ea2fb7f8df Add part/leave command 2021-03-25 20:19:48 -04:00
LordMZTE
44bd3376ce add /rainbow command 2021-03-26 00:42:46 +01:00
Nicolas Werner
e5d75c814b
Clean up notification code a bit 2021-03-17 19:18:07 +01:00
Loren Burkholder
fda6d7629a
Switch readImage to take a reference instead of a pointer 
There was nowhere that an actual pointer was passed, and I wanted to do references for something else.
 2021-03-17 19:18:06 +01:00
Loren Burkholder
39576fea96
Create function for processing whether a message is a reply 2021-03-17 19:17:15 +01:00
Loren Burkholder
09303ca49f
make lint 2021-03-17 19:17:13 +01:00
Loren Burkholder
c74e68c945
Parse markdown overrides during replies 
I apparently missed this when I originally added the overrides.
 2021-03-17 19:17:13 +01:00
Nicolas Werner
8ca3a8b607
Don't send markdown links in body 
fixes #422
 2021-03-15 20:59:18 +01:00
DeepBlueV7.X
6548b84e29
Merge pull request #523 from Jedi18/master 
Fix windows video bug
 2021-03-15 15:51:10 +00:00
targetakhil
a4b7966d21 prepend file:// for linux and macos 2021-03-15 09:03:06 +05:30
Nicolas Werner
9b8e6c7f5c
Remove some more allocations 2021-03-14 15:34:18 +01:00
Nicolas Werner
7a356f3832
Merge branch 'quickswitcher_qml' of git://github.com/Jedi18/nheko into Jedi18-quickswitcher_qml 2021-03-13 23:45:05 +01:00
Nicolas Werner
27fe0a45b6
Disable room pings in replies 2021-03-12 17:14:17 +01:00
Jedi18
8870455f9d change allowed mistakes, fix minor style issues, remove old completer function from inputbar 2021-03-07 00:18:24 +05:30
Nicolas Werner
1be42045ee
fix linting 2021-03-05 15:26:07 +01:00
DeepBlueV7.X
56c44d0454
Merge pull request #505 from Nheko-Reborn/license-headers 
License headers
 2021-03-05 01:04:36 +00:00
Joseph Donofry
4b12b53133
Fix linting 2021-03-04 19:11:08 -05:00
Nicolas Werner
a6f0d2ea7d
Update license headers 2021-03-05 01:04:07 +01:00
Nicolas Werner
67ab204050
Fix reply relating to the wrong id of edited event 2021-03-03 17:42:41 +01:00
Nicolas Werner
345dc1e61f
Fix text input restoring after edits 2021-02-25 00:50:17 +01:00
Nicolas Werner
f6b5b24d64
Allow editing via up and down arrows 2021-02-24 23:51:05 +01:00
Jedi18
ee232c5c60 fix timeline focus 2021-02-23 00:46:40 +05:30
Jedi18
b1dec6f6ac enter key now works, fix room highlighting and add overlay 2021-02-23 00:18:31 +05:30
Jedi18
0922a8e4c7 add room alias delegate, fix some quickswitcher ui problems 2021-02-22 00:01:50 +05:30
Jedi18
32d419d14f add quick switcher qml file and moved completerFor from inputbar to timeline view class 2021-02-21 23:10:21 +05:30
DeepBlueV7.X
99efe2f06b
Merge pull request #479 from Jedi18/add_rooms_model_completer 
Add rooms completion model
 2021-02-19 14:03:42 +00:00
DeepBlueV7.X
744feabeca
Merge pull request #474 from Jedi18/room_settings_qml 
Shifted Room Settings Dialog to QML
 2021-02-19 08:43:03 +00:00
Nicolas Werner
b8c6c716be Make inline images work a bit better 2021-02-17 22:14:19 +01:00
Nicolas Werner
c9393fe3f6 Fix crash from logging unset indices (leftover after debugging) 2021-02-17 18:47:59 +01:00
Jedi18
0b6c82dfff added bool to choose between showing only rooms with aliases and all of the rooms 2021-02-17 19:58:41 +05:30
Jedi18
19dbbb2c6c add rooms model, add room delegate for completer 2021-02-16 00:50:28 +05:30
Akhil Nair
8400540428
Merge branch 'master' into room_settings_qml 2021-02-14 00:04:27 -05:00
Nicolas Werner
d43607d01c Fix hover handling in the timeline 2021-02-14 01:28:28 +01:00
Jedi18
1a406f79e6 replaced with togglebutton using qtquickcontrols2 2021-02-13 23:59:42 +05:30
Nicolas Werner
7ddcab3902 Mark messages as read, when Nheko gets focused 
fixes #235
 2021-02-13 01:41:09 +01:00
Nicolas Werner
3c91b5b47b Fix crash when editing an edited message pointing to itself 2021-02-12 16:11:11 +01:00
Jedi18
35aa0126ac added changing of name through edit modal, removed old roomsettings 2021-02-12 12:48:12 +05:30
Jedi18
f044e2d2a1 fix avatar update on timeline sync 2021-02-11 23:50:45 +05:30
Jedi18
7401bd13b2 added notifications and encryption for the new roomsettings 2021-02-11 19:54:09 +05:30
Nicolas Werner
0db4d71ec2 Prevent edits of unsent messages 2021-02-10 21:13:57 +01:00
Jedi18
b70f37194f ui almost looks the same, midway between transition from old room settings to new room settings 2021-02-10 21:22:42 +05:30
Nicolas Werner
2606568376 Fix messages sometimes not being rendered, when they are too large 2021-02-10 15:24:00 +01:00
Nicolas Werner
a62276c289 Fix UI allowing edits of foreign messages in some cases 2021-02-10 14:32:16 +01:00
Nicolas Werner
bdb6e6b79e Fix stuck notifications because of edits 
Does not fix the read status yet, for that we need to compare read
receipts for all events after the last visible event.
 2021-02-10 01:03:20 +01:00
Nicolas Werner
9b7d33e847 Implement message editing 
The UI still looks ugly, but I have no good idea atm.

fixes #134
 2021-02-09 20:22:53 +01:00
Nicolas Werner
00fd4eecec Display edits correctly 2021-02-09 20:22:49 +01:00
Nicolas Werner
faeaf9dc6b Fix edited replies 2021-02-09 20:22:02 +01:00
Nicolas Werner
d6504812c7 Render edits 2021-02-09 20:22:02 +01:00
Nicolas Werner
2e77a1554f Switch to new relations format 2021-02-09 20:22:02 +01:00
Jedi18
37679ac57e added room settings qml 2021-02-09 23:11:39 +05:30
DeepBlueV7.X
23a9306383
Merge pull request #459 from Jedi18/minor_fixes 
Fix emoji related issues
 2021-02-09 16:25:37 +01:00
Nicolas Werner
375e20462b Native rendering breaks kerning 2021-02-07 02:01:44 +01:00
Jedi18
4aefac08a4 focus message input on adding emoji/reacting to a message 2021-02-05 22:42:08 +05:30
DeepBlueV7.X
a7150b5666
Merge branch 'master' into avatar_username_feature 2021-02-03 03:17:28 +01:00
Jedi18
cd3f719e43 add loading indicator 2021-02-02 17:24:08 +05:30
Jedi18
d535cc5e75 add error message and update avatars on avatar change in timeline and user profile dialog 2021-02-02 13:30:47 +05:30
Joseph Donofry
53c653a228
Merge remote-tracking branch 'nheko-im/master' into privacy_screen 2021-02-01 18:42:38 -05:00
DeepBlueV7.X
2b7bd09ad3
Merge pull request #431 from Jedi18/avatar_username_feature 
Username editing (room specific and global)
 2021-02-01 19:14:57 +01:00
Loren Burkholder
c3fa592018 make lint 2021-01-29 18:17:44 -05:00
Loren Burkholder
cd998d1c35 Center user info dialog on the screen 2021-01-29 18:16:50 -05:00
Jedi18
9b5a287d14 made requeste changes 2021-01-29 11:55:24 +05:30
Jedi18
fa7ad4f234 Shifted fetching of global username fom timeline model to user profile 2021-01-29 00:09:11 +05:30
Jedi18
3b82b2ff97 fix linting 2021-01-28 23:53:56 +05:30
Jedi18
b3f29f592b Changed edit method from double clicking to an edit button 2021-01-28 23:35:02 +05:30
Jedi18
87490c29cd Username can be edited by double clicking on text, added global user profile menu action in user info widget 2021-01-28 20:03:50 +05:30
Nicolas Werner
50564985cc Fix crash, when keys for no events were requested 2021-01-27 21:30:06 +01:00
Nicolas Werner
5fbf17f6ec Fix request key loops 2021-01-27 20:29:06 +01:00
Jedi18
5e3f513655 update room specific username from userprofile 2021-01-27 11:03:08 +05:30
Joseph Donofry
bfeb766a91
Implement Privacy Screen 
* Add handles for window focus gained / focus lossed and connect to timer
* Clean up some of the PrivacyScreen.qml code
* Connect settings to PrivacyScreen visibility
 2021-01-26 17:23:28 -05:00
Nicolas Werner
f0102c1e55 Fix old messages being played back after limit reset 2021-01-24 20:02:24 +01:00
DeepBlueV7.X
a5944ab047
Merge pull request #406 from rnhmjoj/open-in 
Add "open in external program" action
 2021-01-24 05:52:44 +01:00
rnhmjoj
c569ab24bc
Add "open in external program" action 2021-01-24 01:50:23 +01:00
Nicolas Werner
7bc57f76f7 Request unknown message indices 2021-01-23 20:08:59 +01:00
DeepBlueV7.X
a082a98ede
Merge pull request #393 from LorenDB/mdCommands 
Markdown setting override commands
 2021-01-23 02:02:59 +01:00
DeepBlueV7.X
f956d012a9
Remove useless parentheses 2021-01-23 00:51:29 +00:00
Nicolas Werner
97340bed13 Fix font tags showing up in playable media messages 2021-01-23 00:49:28 +01:00
Loren Burkholder
06f6a5bcca Clarify how markdown is determined 2021-01-20 21:12:07 -05:00
Loren Burkholder
1d93570814 Make lint 2021-01-20 18:22:24 -05:00
Loren Burkholder
91155bf803 Add commands to override Markdown setting 2021-01-20 18:22:24 -05:00
Nicolas Werner
32a20a5f8c Simplify section handling a bit 2021-01-19 23:58:40 +01:00
Nicolas Werner
42b08257ec Make read markers a bit less confusing 2021-01-16 13:54:56 +01:00
Nicolas Werner
31881e14d9 Make it easier to understand, what button to click for verification from profile 2021-01-12 15:00:59 +01:00
Nicolas Werner
2a19783f99 Fix timeline becoming corrupted on backfill 
Fixes #273
 2021-01-12 00:02:18 +01:00
trilene
3572c111f3 Fix call invite declined on another device 2021-01-10 12:23:58 -05:00
trilene
9bbade37de Fix call answered on another device 2021-01-07 14:04:54 +01:00
trilene
07ac7b7e85 Port PlaceCall dialog to Qml 2021-01-07 14:04:50 +01:00
trilene
7124024977 Make call invites less intrusive 2021-01-07 14:04:21 +01:00
trilene
ac410f46f2 Move call-related properties to CallManager 2021-01-07 14:04:21 +01:00
Nicolas Werner
4b4c321397 Allow inline replies from notifications on linux 2021-01-07 10:44:59 +01:00
Nicolas Werner
3a41bb9fff Fix typing notifications flickering sometimes 2021-01-05 22:38:21 +01:00
Nicolas Werner
904cafcd39 lint 2020-12-25 04:11:47 +01:00
Nicolas Werner
01e38d12ed Fix some compiler warnings 2020-12-25 00:08:06 +00:00
Nicolas Werner
7b46aa2a6e Store secrets in keychain 2020-12-16 22:10:09 +01:00
Nicolas Werner
7abeb1f1a4 React with arbitrary strings via /react 2020-12-13 16:23:04 +01:00
DeepBlueV7.X
95667edb14
Merge pull request #347 from kamathmanu/avatarFullViewSupport 
Add support for viewing avatar images in full size
 2020-11-30 21:25:42 +01:00
kamathmanu
69997a3d74 Lint code 2020-11-30 15:10:59 -05:00
kamathmanu
0edd75949b Lint code 2020-11-30 14:56:39 -05:00
kamathmanu
e36b090c5b Add support for viewing avatar images in full size 2020-11-30 10:05:24 -05:00
Nicolas Werner
2ce129e6b6 Properly share and rotate sessions on member and device changes 2020-11-30 01:54:53 +01:00
Nicolas Werner
c24f9a22a5 Load sessions lazily from db 2020-11-30 01:54:53 +01:00
Nicolas Werner
233a8a5dad Fix variable shadowing 2020-11-26 16:09:53 +01:00
Nicolas Werner
c31b9e2793 Fix race when reading members from db 2020-11-25 23:54:25 +01:00
Nicolas Werner
08e9461611 Fix input focus when pressing reply button 2020-11-25 19:05:12 +01:00
Nicolas Werner
c74077a41f Implement Qml drag and drop 2020-11-25 19:05:12 +01:00
Nicolas Werner
c2eea5cb55 Fix mimetype of media messages 2020-11-25 19:05:12 +01:00
Nicolas Werner
094c0b09ab Qml emoji completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
add5903fb0 Working User completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
cabeb1464c WIP Qml completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
d14a5f8067 Reimplement message history 2020-11-25 19:05:12 +01:00
Nicolas Werner
921379a4cc Send typing updates from QML 2020-11-25 19:05:12 +01:00
Nicolas Werner
d1af1a8669 Move calls to new input bar 2020-11-25 19:05:12 +01:00
Nicolas Werner
a31d3d0816 Add file uploading 2020-11-25 19:05:12 +01:00
Nicolas Werner
0bb4885632 Basic text input in qml 2020-11-25 19:05:12 +01:00
Nicolas Werner
7a74b86340 Pasteable textinput 2020-11-25 19:05:11 +01:00
DeepBlueV7.X
27bf654d92
Merge pull request #320 from trilene/webrtc-video 
Video calls: add local webcam view
 2020-11-09 21:49:26 +01:00
trilene
d391404b79 Video calls: add local webcam view 2020-11-09 10:51:17 -05:00
DeepBlueV7.X
5fb3d4ede8
Merge pull request #310 from MayeulC/fix-typo 
Improve wording in multiple strings.
 2020-10-31 22:28:40 +01:00
Mayeul Cantan
eea7aecc04 Wording: replace "encrypted room" with "encrypted private chat" 
This is for consistency with "Start a private chat", and is more
specific.
 2020-10-31 22:23:55 +01:00
trilene
fd479a91be Merge remote-tracking branch 'upstream/master' into webrtc-video 2020-10-28 16:08:17 -04:00
Nicolas Werner
70f35de449 Don't pass around empty timeline 2020-10-28 13:06:28 +01:00
trilene
d9ca5309ac Merge remote-tracking branch 'upstream/master' into webrtc-video 2020-10-27 15:29:53 -04:00
trilene
d1f3a3ef40 Support video calls 2020-10-27 13:14:06 -04:00
Nicolas Werner
12fff7408e Optimize build 2020-10-27 17:45:28 +01:00
Nicolas Werner
4797b9fa96 Fix infinite pagination properly now. 2020-10-23 19:42:23 +02:00
Nicolas Werner
cea7f4574f Clean up key requests + autoreload 2020-10-20 19:46:37 +02:00
Nicolas Werner
983690c94f Share code for sending encrypted olm messages 2020-10-20 18:10:09 +02:00
Nicolas Werner
aa9b453f81 Store timestamp with olm sessions 2020-10-20 13:46:05 +02:00
Nicolas Werner
bd0deb7213 Fix crash on exit 2020-10-17 00:57:29 +02:00
Nicolas Werner
392d7d5568 Try to fix windows build 2020-10-08 20:07:43 +02:00
Nicolas Werner
e5fb9a25ea Try to please the CI gods 2020-10-08 18:16:30 +02:00
Nicolas Werner
08d5a84cbd Fix issues with old qt and bump to 5.10 2020-10-08 17:26:07 +02:00
Nicolas Werner
99ba1f17d3 Merge remote-tracking branch 'origin/master' into cross-signing 2020-10-08 16:57:03 +02:00
Nicolas Werner
7b6fab3373 Calculate verification status from cross-signing sigs and update dynamically 2020-10-08 00:20:12 +02:00
Nicolas Werner
64d5a193f1 Fix in room verification 2020-10-06 17:02:41 +02:00
Nicolas Werner
8a4d85f801 Show different verification errors 2020-10-05 22:58:07 +02:00
Nicolas Werner
bca29a4227 Make steps in verification flow explicit 2020-10-05 22:12:10 +02:00
Nicolas Werner
2a79cd2b6b Don't fail on missing key for a device and /rotate-megolm-session command 2020-10-03 18:38:28 +02:00
Nicolas Werner
abff61bb6c Fix nullopt when iterating reactions 2020-10-03 17:23:59 +02:00
Nicolas Werner
94690ebd4c Clean up verification and key cache a bit 2020-10-02 01:14:42 +02:00
trilene
3f73853e4b Move ActiveCallBar Qml to separate file 2020-09-25 10:26:36 -04:00
Nicolas Werner
4802c34009 Merge remote-tracking branch 'origin/master' into cross-signing 2020-09-24 21:36:43 +02:00
trilene
44cfc8d22a clang-format 2020-09-22 12:14:15 -04:00
trilene
da27670cbe Port ActiveCallBar to Qml 2020-09-22 12:07:36 -04:00
Nicolas Werner
54db9c89ed Simplify outbound session setup 
Don't send inbound session to self and claim and send all keys at once.
 2020-09-20 23:07:02 +02:00
Nicolas Werner
4b36585e47 Fix typo in encryption error message 2020-09-19 15:45:23 +02:00
Nicolas Werner
b05c101021 Fix null errors in qml 2020-09-16 23:49:17 +02:00
Nicolas Werner
77e241b9e5 Reenable top bar room settings menus on avatar or title clicks 
Also fixes a bug with an empty room settings window introduced in the
port.
 2020-09-16 23:49:17 +02:00
Nicolas Werner
640b0ee405 Port top bar to Qml 
Also fixes some resize issues with stupid workarounds to our resize
logic. This really needs to be cleaned up at some point!
 2020-09-16 23:49:17 +02:00
CH Chethan Reddy
8eb74daf76 Split qml part of Device Verification 2020-09-14 17:27:49 +05:30
Chethan2k1
2b5deabbdc Fix breaking while using qmlRegisterSingletonInstance 2020-09-10 14:50:10 +05:30
Chethan2k1
898be090af Add support non-encrypted room-verification messages 2020-09-10 11:08:39 +05:30
Chethan2k1
e8eeb480d5 Fix Wrong Emojis Issue in Room Verification 2020-09-04 12:02:24 +05:30
DeepBlueV7.X
657f4073e9
Merge branch 'master' into device-verification 2020-09-03 18:11:17 +00:00