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

25208 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
3c922329fe
Merge pull request #4672 from matrix-org/matthew/emoji13 
upgrade to twemoji 13.0.0
 2020-06-03 17:09:32 +01:00
Jorik Schellekens
5bc756cba1 Fix checkbox bleed 2020-06-03 16:48:05 +01:00
Michael Telatynski
9c417cfbad Don't clear MAU toasts when a successful sync comes in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 16:17:31 +01:00
Michael Telatynski
030cc5cdea
Merge pull request #4666 from matrix-org/t3chguy/image-view-focuslock 
Apply FocusLock to ImageView to capture Escape handling
 2020-06-03 15:37:18 +01:00
David Baker
caea153962
Merge pull request #4689 from matrix-org/dbkr/fix_complete_security 
Fix the 'complete security' screen
 2020-06-03 14:44:06 +01:00
David Baker
ddcd3fb806 Fix the 'complete security' screen 
https://github.com/matrix-org/matrix-react-sdk/pull/4655 removed
the check for cross-signing account data where the cross-signing
labs flag was enabled if you had an existing cross-signing setup.
This also sent the user to the 'complete security' view rather than
the 'E2E Setup' view though, which meant new logins should always
see the E2E setup screen (ie. be prompted to upgrade encryption).

NB. We need to change this check for SSSS keys in account data
(https://github.com/vector-im/riot-web/issues/13894) but we should
put this back the way it was in the meantime.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4655
 2020-06-03 14:31:34 +01:00
Michael Telatynski
d92f742205 Fix Jitsi wellknown hooks some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 14:09:45 +01:00
Michael Telatynski
a674131a8c Fix Jitsi wellknown hooks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 13:58:17 +01:00
Michael Telatynski
5156388fc6 Change well known poll period to 2 hours to match existing Jitsi poll 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 12:25:57 +01:00
Michael Telatynski
6d11b4f99b
Merge pull request #4688 from matrix-org/t3chguy/autocomplete-scrollintoview 
add null-guard for Autocomplete containerRef
 2020-06-03 10:59:14 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD 
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
 2020-06-03 10:45:47 +01:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing 
Remove feature_cross_signing
 2020-06-03 10:42:13 +01:00
Michael Telatynski
b120488857 add null-guard for Autocomplete containerRef 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 10:39:28 +01:00
Michael Telatynski
7cfeda96d0
Merge pull request #4670 from matrix-org/t3chguy/autocomplete-scrollintoview 
Autocomplete: use scrollIntoView for auto-scroll to fix it
 2020-06-03 09:55:00 +01:00
Travis Ralston
6d96d66c03 Split the left panel into new and old for new room list designs 
Though we consider the "room list" to mean the RoomList component specifically, the room list is actually the entire left panel as far as the user is concerned. 

The new proposed designs for the room list modify the whole left panel, so we had might as well break it into new and old now instead of later. This "new" left panel is a bare-bones implementation and meant to only provide the absolute basic feature set to function for those who enable the experimental room list, for whatever reason. This is not intended to be a final implementation, or even remotely close to what it could be. An example of this is the lack of breadcrumbs. Given they are likely to change, they are excluded from this temporary skeleton completely.

This also includes a purple/pink bar between the tag panel and left panel. This is so we can, if needed, differentiate between people who made the mistake of turning on the experimental room list while the overall aesthetic makes it indistinguishable. Once the designs are moderately approved, we can (and definitely should) remove the hideous indicator.
 2020-06-02 19:26:07 -06:00
Travis Ralston
1f1f613777 Add a focus_composer dispatcher action 
and use it
 2020-06-02 19:07:46 -06:00
Michael Telatynski
170acef796 Fix sizing of the security warning icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 21:54:38 +01:00
Michael Telatynski
d99babfe05 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-02 21:51:05 +01:00
Michael Telatynski
48c535e578 hide setup encryption toasts on an e2ee-default:false config 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 21:40:32 +01:00
Jorik Schellekens
c0ac44e471 Change internal font size from from 15 to 20. 2020-06-02 17:10:22 +01:00
Michael Telatynski
113a9d71b5 Fix login loop where the sso flow returns to #/login 
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 16:26:07 +01:00
RiotRobot
ec35445bf0 v2.7.0-rc.2 2020-06-02 14:37:47 +01:00
RiotRobot
c31cfbd3eb Prepare changelog for v2.7.0-rc.2 2020-06-02 14:37:47 +01:00
Michael Telatynski
8a93a9dda7
Merge pull request #4684 from matrix-org/t3chguy/emoji_picker_composer 
Rewire the Sticker button to be an Emoji Picker to release
 2020-06-02 14:29:58 +01:00
Michael Telatynski
b50046f1ab
Merge pull request #3747 from matrix-org/t3chguy/emoji_picker_composer 
Rewire the Sticker button to be an Emoji Picker
 2020-06-02 14:13:08 +01:00
Michael Telatynski
3fbfb62bc9 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 2020-06-02 14:00:37 +01:00
RiotRobot
039c42dc09 v2.7.0-rc.1 2020-06-02 13:59:10 +01:00
RiotRobot
5880297055 Prepare changelog for v2.7.0-rc.1 2020-06-02 13:59:10 +01:00
RiotRobot
98a6dd88e3 Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 13:53:13 +01:00
Michael Telatynski
ef1d682683 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 13:51:58 +01:00
Michael Telatynski
3020e395c1 iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 13:48:08 +01:00
J. Ryan Stinnett
a140f5219e
Merge pull request #4683 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-06-02 13:32:40 +01:00
LinAGKar
8672e4849e Translated using Weblate (Swedish) 
Currently translated at 64.4% (1482 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2020-06-02 12:29:56 +00:00
Weblate
9b975820a3 Merge branch 'origin/develop' into Weblate. 2020-06-02 09:14:19 +00:00
XoseM
833732e732 Translated using Weblate (Galician) 
Currently translated at 52.3% (1204 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-02 09:14:19 +00:00
Slavi Pantaleev
2794bf3c00 Translated using Weblate (Bulgarian) 
Currently translated at 95.6% (2201 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-06-02 09:14:18 +00:00
J. Ryan Stinnett
0717c7749e
Merge pull request #4347 from MTRNord/fix-register-auth-with-new-spec 
Make auth argument in the register request compliant with r0.6.0
 2020-06-02 10:14:09 +01:00
Weblate
945ebfc45c Merge branch 'origin/develop' into Weblate. 2020-06-02 06:22:20 +00:00
Travis Ralston
25ce71a4b8
Merge pull request #4682 from matrix-org/revert-4494-auxpanel-scrolling-persisted 
Revert "Prevent PersistedElements overflowing scrolled areas"
 2020-06-02 00:22:15 -06:00
Travis Ralston
613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas" 2020-06-02 00:21:31 -06:00
Travis Ralston
73a8e77d32 Add initial filtering support to new room list 
For https://github.com/vector-im/riot-web/issues/13635

This is an incomplete implementation and is mostly dumped in this state for review purposes. The remainder of the features/bugs are expected to be in more bite-sized chunks.

This exposes the RoomListStore on the window for easy access to things like the new filter functions (used in debugging).

This also adds initial handling of "new rooms" to the client, though the support is poor.

Known bugs:
* [ ] Regenerates the entire room list when a new room is seen.
* [ ] Doesn't handle 2+ filters at the same time very well (see gif. will need a priority/ordering of some sort).
* [ ] Doesn't handle room order changes within a tag yet, despite the docs implying it does.
 2020-06-01 16:49:22 -06:00
Michael Telatynski
5025de5525 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-01 23:28:21 +01:00
Michael Telatynski
d3523afd29 delint scss and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:11:47 +01:00
Michael Telatynski
2dda93bf1a delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:09:57 +01:00
Michael Telatynski
702bbe3bcd Add e2ee-default:false notice to Setting>Security 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:09:14 +01:00
Michael Telatynski
a2fb96eb8f Update Create Room Dialog microcopy for e2ee-default:false 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 22:59:14 +01:00
Michael Telatynski
366c60cb2d fix ee listener add 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 22:57:51 +01:00
Weblate
42a3dda39d Merge branch 'origin/develop' into Weblate. 2020-06-01 21:44:10 +00:00
Travis Ralston
3d8e9f9edb
Merge pull request #4680 from matrix-org/travis/rm-tagbuttons 
Remove unused TagPanelButtons
 2020-06-01 15:44:06 -06:00