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

29405 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aleks Kissinger
8233ce77cb fixed duplicate import from merge 2020-11-10 18:26:09 +00:00
Aleks Kissinger
5f3af7863a Merge branch 'develop' into katex 2020-11-10 18:19:20 +00:00
Aleks Kissinger
839bae21ae made single and double $ default delimiters 2020-11-10 18:18:53 +00:00
Michael Telatynski
0766519467
Merge pull request #5398 from matrix-org/t3chguy/fix/8141 
Improvements around new room empty space interactions
 2020-11-10 13:09:59 +00:00
Michael Telatynski
80bb091cc5 Iterate PR 2020-11-10 10:00:55 +00:00
David Baker
50bce642d5
Merge pull request #5366 from matrix-org/dbkr/call_hold 
Implement call hold
 2020-11-10 08:41:34 +00:00
Michael Telatynski
a67da01419
Merge pull request #5407 from matrix-org/t3chguy/fix/15670 
Fix Skeleton UI showing up when not intended.
 2020-11-10 01:34:33 +00:00
Michael Telatynski
a5d827c446
Update src/components/views/rooms/RoomList.tsx 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-11-10 01:22:30 +00:00
Michael Telatynski
73eb43d32a
Merge pull request #5406 from matrix-org/t3chguy/fix/home-button-ctx-menu 
Close context menu when user clicks the Home button
 2020-11-10 01:19:33 +00:00
Michael Telatynski
0b10ab6ef2
Merge pull request #5410 from matrix-org/t3chguy/fix/11684 
Skip e2ee warn logout prompt if user has no megolm sessions to lose
 2020-11-10 01:18:40 +00:00
RiotRobot
46e01196f0 Reset matrix-js-sdk back to develop branch 2020-11-09 16:33:48 +00:00
RiotRobot
318ff1914a Merge branch 'master' into develop 2020-11-09 16:33:01 +00:00
RiotRobot
8edbc7c654 v3.8.0 2020-11-09 16:31:48 +00:00
RiotRobot
e8d18b8b11 Prepare changelog for v3.8.0 2020-11-09 16:31:47 +00:00
RiotRobot
6f3cdadcdb Upgrade matrix-js-sdk to 9.1.0 2020-11-09 16:26:36 +00:00
Michael Telatynski
5bed02b6e8 Skip e2ee warn logout prompt if user has no megolm sessions to lose 2020-11-09 15:50:35 +00:00
Michael Telatynski
27d276715e Fix Skeleton UI showing up when not intended. 2020-11-09 13:53:28 +00:00
Michael Telatynski
462be2b6a0 Close context menu when user clicks the Home button 2020-11-09 13:45:33 +00:00
Michael Telatynski
e404934794
Merge pull request #5405 from aaronraimist/translate-country-names 
Allow country names to be translated
 2020-11-09 10:48:29 +00:00
Aaron Raimist
d121f8a357
Allow country names to be translated 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-11-08 22:33:15 -06:00
David Baker
a7e6d8e7f0
Merge pull request #5396 from matrix-org/dbkr/query_for_phone_numbers 
Support thirdparty lookup for phone numbers
 2020-11-06 15:22:53 +00:00
David Baker
cf2d8d2f1f Wrench createNewMatrixCall straight out of call 
rather than importing browser-index
 2020-11-05 17:59:02 +00:00
Michael Telatynski
252484fcd9 add key to make React happier 2020-11-05 17:01:20 +00:00
Michael Telatynski
4997676f5d fix last remaining broken test 2020-11-05 16:57:51 +00:00
Michael Telatynski
ae2d9941ff fix more tests 2020-11-05 16:54:25 +00:00
Michael Telatynski
423068b502 Merge remote-tracking branch 'origin/t3chguy/fix/8141' into t3chguy/fix/8141 2020-11-05 16:27:56 +00:00
Michael Telatynski
54e41b5f32 fix tests 2020-11-05 16:27:41 +00:00
Michael Telatynski
602232a524
Update res/css/views/messages/_CreateEvent.scss 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-11-05 16:08:36 +00:00
Michael Telatynski
81f1e1d8d7 delint 2020-11-05 15:54:21 +00:00
Michael Telatynski
c269577037 i18n 2020-11-05 15:51:36 +00:00
Michael Telatynski
664079a127 Use MiniAvatarUploader for the new NewRoomIntro component 2020-11-05 15:50:42 +00:00
Michael Telatynski
6aeea3e38e Extract MiniAvatarUploader into a reusable component 2020-11-05 15:42:45 +00:00
Michael Telatynski
0a42853a25 Fix centering of bubble event tile 2020-11-05 15:39:37 +00:00
Michael Telatynski
2594ff8e80 Remove old isAlone checker 2020-11-05 15:39:22 +00:00
David Baker
6953aed70a
Copyright 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-11-05 09:51:02 +00:00
David Baker
9f456a2acf accidentally committed commenting 2020-11-05 09:50:12 +00:00
David Baker
5cccb2848e make quotes consistent 2020-11-05 09:49:14 +00:00
David Baker
9be3ce928f explicitly retuen null 
and also sort out formatting from a different time
 2020-11-05 09:47:43 +00:00
David Baker
90bbc082dc
Copyright 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-11-05 09:25:52 +00:00
Travis Ralston
cbd568a1e8
Merge pull request #5371 from resynth1943/change-password-to-new-password-in-forgot-password 
Change "Password" to "New Password"
 2020-11-04 12:15:49 -07:00
Michael Telatynski
2fdfe9346f Update copy on the Encryption Enabled bubble tile and room creation ELS to cater better in general but specifically for DMs 2020-11-04 17:50:59 +00:00
Bruno Windels
067b4ca93e
Merge pull request #5397 from matrix-org/bwindels/customise-dehydration-key 
Add customisation point for dehydration key
 2020-11-04 17:25:52 +00:00
Michael Telatynski
af71b0735d Change icon for the Create Event bubble tile 2020-11-04 17:24:03 +00:00
Michael Telatynski
4e2d9c28f5 Convert EncryptionEvent to Typescript 2020-11-04 17:21:25 +00:00
Michael Telatynski
ff25a9b45d Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth 2020-11-04 17:06:38 +00:00
Bruno Windels
41cb51e044 add interface import 2020-11-04 17:09:21 +01:00
Bruno Windels
f3743f3ca1 fix spelling 2020-11-04 16:53:58 +01:00
Bruno Windels
625e03cde3 allow customising the source of dehydration key 2020-11-04 16:51:45 +01:00
David Baker
333b13802f Support thirdparty lookup for phone numbers 
As per MSC2845. Hidden behind /query for now, until we hook it up
to a dial pad.
 2020-11-04 15:32:21 +00:00
Travis Ralston
971ade57bc
Merge pull request #5386 from matrix-org/travis/element-permalink 
Rebrand Riot -> Element in the permalink classes
 2020-11-04 08:14:26 -07:00