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

19600 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
0dfb0f5468 fix lint 2019-11-22 16:25:30 +01:00
Bruno Windels
8cb362002b show a toast instead of dialog when feature flag is enabled 2019-11-22 16:08:27 +01:00
Bruno Windels
c705752317 add toast for verification requests 
this uses a verification requests as emitted by the js-sdk with
the `crypto.verification.request` rather than a verifier as emitted
by `crypto.verification.start` as this works for both to_device and
timeline events with the changes made in the js-sdk pr.
 2019-11-22 16:08:27 +01:00
Bruno Windels
f1c62e7dab make colors slightly more opaque than in design 
as it is very light otherwise
 2019-11-22 16:04:51 +01:00
Bruno Windels
66cc68bae4 add new-styled button 
might merge it later on with accessible button
 2019-11-22 16:04:51 +01:00
Bruno Windels
e86d2b616e add ToastContainer 2019-11-22 16:04:51 +01:00
David Baker
d5011f9382
Merge pull request #3660 from matrix-org/dbkr/fix_m.room.create_upgrade_notice_rel 
Show m.room.create event before the ELS on room upgrade
 2019-11-22 13:43:46 +00:00
Michael Telatynski
5ec4b6efcd Show m.room.create event before the ELS on room upgrade 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-22 13:42:27 +00:00
Weblate
b073e2b9de Merge branch 'origin/develop' into Weblate. 2019-11-22 13:41:41 +00:00
David Baker
7df8ef2f91
Merge pull request #3655 from matrix-org/t3chguy/fix_m.room.create_upgrade_notice 
Show m.room.create event before the ELS on room upgrade
 2019-11-22 13:41:36 +00:00
David Baker
cc79afb99d
Merge pull request #3659 from matrix-org/dbkr/matchmedia_conditional_events_rel 
Make addEventListener conditional
 2019-11-22 13:20:50 +00:00
David Baker
9bb486781b
Merge pull request #3658 from matrix-org/dbkr/fixe2eicons_rel 
Fix e2e icons
 2019-11-22 13:20:33 +00:00
Weblate
f149962ce0 Merge branch 'origin/develop' into Weblate. 2019-11-22 13:20:03 +00:00
David Baker
ee40c7891b
Merge pull request #3656 from matrix-org/dbkr/messagepanel_react_class 
Convert MessagePanel to React class
 2019-11-22 13:19:57 +00:00
David Baker
521cbbac74 Make addEventListener conditional 
Safari doesn't support addEventListener
 2019-11-22 13:15:32 +00:00
Bruno Windels
35877a06a3 use correct icons with borders 2019-11-22 13:13:59 +00:00
Bruno Windels
9c234d9317 dont make e2e icons themable, as they have multiple colors 2019-11-22 13:13:53 +00:00
Bruno Windels
de645a32a8 remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn 2019-11-22 13:13:48 +00:00
Bruno Windels
d1501a1651 reduce margin on e2e icon in room header 2019-11-22 13:13:38 +00:00
David Baker
25ba4c5f71 Fix read markers 
init code needs to be a constructor or its run too late
 2019-11-22 13:11:36 +00:00
Weblate
7f11869444 Merge branch 'origin/develop' into Weblate. 2019-11-22 13:09:13 +00:00
Szimszon
fed1ed3b50 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-11-22 13:09:12 +00:00
Kévin C
27c64db613 Translated using Weblate (French) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-11-22 13:09:11 +00:00
Jeff Huang
936c36dd58 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1918 of 1918 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-11-22 13:09:08 +00:00
David Baker
abdf3c4a58
Merge pull request #3657 from matrix-org/dbkr/matchmedia_conditional_events 
Make addEventListener conditional
 2019-11-22 13:09:01 +00:00
David Baker
0dbb639aea Accidentally committed 2019-11-22 13:06:35 +00:00
David Baker
3f5a8faf37 PropTypes should be static 2019-11-22 13:01:56 +00:00
David Baker
fd5a5e13ee Make addEventListener conditional 
Safari doesn't support addEventListener
 2019-11-22 12:59:51 +00:00
David Baker
6d4abeef45 Convert MessagePanel to React class 
I was about to add the getDerivedStateFromProps function to change
how read markers worked, but doing that in an old style class
means the statics object, so let;s just convert the thing.
 2019-11-22 12:07:25 +00:00
Michael Telatynski
a02a285058 Show m.room.create event before the ELS on room upgrade 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-22 10:24:51 +00:00
Weblate
69062adde3 Merge branch 'origin/develop' into Weblate. 2019-11-21 19:01:24 +00:00
Matthew Hodgson
e77cf2b87e
Merge pull request #3653 from matrix-org/bwindels/fixe2eicons 
Fix e2e icons
 2019-11-21 19:01:17 +00:00
Weblate
82ace51f90 Merge branch 'origin/develop' into Weblate. 2019-11-21 17:43:19 +00:00
David Baker
1a7d298319
Merge pull request #3654 from matrix-org/dbkr/call_crash_workaround 
Workaround for soft-crash with calls on startup
 2019-11-21 17:43:14 +00:00
David Baker
b239fde32d Workaround for soft-crash with calls on startup 
Fixes https://github.com/vector-im/riot-web/issues/11458
 2019-11-21 17:31:57 +00:00
Weblate
c1aa5f16db Merge branch 'origin/develop' into Weblate. 2019-11-21 17:29:30 +00:00
David Baker
53edbc743a
Merge pull request #3652 from matrix-org/dbkr/catch_play_failures 
Catch exceptions when we can't play audio
 2019-11-21 17:29:25 +00:00
Bruno Windels
f75e45a715 reduce margin on e2e icon in room header 2019-11-21 18:17:55 +01:00
Bruno Windels
854f27df3f remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn 2019-11-21 18:16:10 +01:00
Weblate
785f00e6d0 Merge branch 'origin/develop' into Weblate. 2019-11-21 17:14:05 +00:00
Travis Ralston
9d5f3ce32d
Merge pull request #3650 from matrix-org/travis/widget-integration-copy 
Rename section heading for integrations in settings
 2019-11-21 10:13:59 -07:00
Weblate
f532d625f8 Merge branch 'origin/develop' into Weblate. 2019-11-21 17:13:52 +00:00
Travis Ralston
9089744f07
Merge pull request #3651 from matrix-org/travis/widget-encryption-copy 
Update copy for widgets not using message encryption
 2019-11-21 10:13:47 -07:00
Bruno Windels
cb0e6ca5d2 dont make e2e icons themable, as they have multiple colors 2019-11-21 18:13:01 +01:00
Bruno Windels
3cddcad5de use correct icons with borders 2019-11-21 18:12:32 +01:00
David Baker
5d8476185f Catch exceptions when we can't play audio 
...or try to: the chrome debugger still breakpoints, even when we
catch the exception.

Related to, but probably does not fix https://github.com/vector-im/riot-web/issues/7657
 2019-11-21 17:11:17 +00:00
Weblate
8819d5cf0c Merge branch 'origin/develop' into Weblate. 2019-11-21 16:28:10 +00:00
Szimszon
08e08376a2 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1922 of 1922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-11-21 16:28:10 +00:00
David Baker
834e6819d5
Merge pull request #3649 from matrix-org/dbkr/ignore_media_keys 
Ignore media actions
 2019-11-21 16:28:03 +00:00
Travis Ralston
a55e5f7759 Update copy for widgets not using message encryption 
Misc design update
 2019-11-21 09:12:07 -07:00