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

25547 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Baker
b83ecb1781 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-02 18:53:54 +01:00
David Baker
0046e204a0 Make the continue button actually work 2020-06-02 18:30:37 +01:00
David Baker
397b95c5fa lint 2020-06-02 18:03:32 +01:00
David Baker
5624cf5ceb Add option to reset keys to the encryption setup screen 2020-06-02 17:55:27 +01:00
Jorik Schellekens
c0ac44e471 Change internal font size from from 15 to 20. 2020-06-02 17:10:22 +01:00
David Baker
e06ba2003b Prompt for recovery key on login rather than passphrase 
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
 2020-06-02 16:32:15 +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
Travis Ralston
4dda573527 i18n 2020-06-01 15:43:29 -06:00
Travis Ralston
5b6118dad4 Remove the unused GroupsButton too 2020-06-01 15:39:22 -06:00
Michael Telatynski
3f72a590f5 move e2ee-default switch to well-known from config.json 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 22:37:12 +01:00
Michael Telatynski
cbc2aee746 Add js-sdk mechanism for polling client well-known for config 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 22:35:16 +01:00
Travis Ralston
ad617f9e3a Remove unused TagPanelButtons 
This isn't used, and is just confusing. The feedback dialog is still used by the top left menu.
 2020-06-01 15:35:08 -06:00
Weblate
f2b33f7577 Merge branch 'origin/develop' into Weblate. 2020-06-01 21:00:56 +00:00
Jorik Schellekens
c66a277409
Merge pull request #4679 from JorikSchellekens/joriks/fix-irc-resize-save 
Pass roomId to IRCTimelineProfileResizer
 2020-06-01 22:00:51 +01:00
Michael Telatynski
8848a2ea64 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/InviteDialog.js
 2020-06-01 21:42:31 +01:00
Jorik Schellekens
5bba62c28b Pass roomId to IRCTimelineProfileResizer 2020-06-01 18:27:10 +01:00
Weblate
0d075fc8ad Merge branch 'origin/develop' into Weblate. 2020-06-01 17:22:27 +00:00
Jorik Schellekens
5caae2051b
Merge pull request #4678 from JorikSchellekens/joriks/draggable-cleanup-console 
Remove logging to console for irc name resize
 2020-06-01 18:22:23 +01:00
Weblate
0b95080356 Merge branch 'origin/develop' into Weblate. 2020-06-01 17:12:09 +00:00
Jorik Schellekens
85faa8ac23
Merge pull request #4677 from JorikSchellekens/joriks/fix-dark-theme-selection 
Use arrow functions instead of binding `this`
 2020-06-01 18:12:05 +01:00