mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 23:31:28 +03:00
Code Issues Projects Releases Packages Wiki Activity
21077 commits 217 branches 561 tags 443 MiB
Commit graph

21077 commits

This branch
This branch
All branches
Author SHA1 Message Date
Half-Shot
85bcad0ea0 Styling for Nad 2020-01-28 14:46:22 +00:00
Half-Shot
71233a5aff liney liney come back we need you 2020-01-28 11:33:51 +00:00
Half-Shot
7c0a461cbb Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty 2020-01-28 11:22:02 +00:00
Half-Shot
785277d4b8 Review bits for travis 2020-01-28 11:17:51 +00:00
Zoe
06f7842afa
Merge pull request #3949 from matrix-org/foldleft/12079-fix-warnings-on-self 
Fix issue where we don't notice if our own devices shouldn't be trusted
 2020-01-28 10:16:27 +00:00
Half-Shot
bdaf9fd06d i18n 2020-01-28 10:05:42 +00:00
J. Ryan Stinnett
6a9786e202
Merge pull request #3951 from matrix-org/jryans/comp-sec-body 
Add separate component for post-auth security flows
 2020-01-28 10:01:13 +00:00
Travis Ralston
a168461e8b
Merge pull request #3952 from matrix-org/travis/settings-unwatch 
Add more logging to settings watchers
 2020-01-27 22:39:47 +00:00
Travis Ralston
2a1407a531 Add more logging to settings watchers 
To try and track leaks versus spam.

Fixes https://github.com/vector-im/riot-web/issues/12094 (it's not leaking, probably)
 2020-01-27 15:36:12 -07:00
J. Ryan Stinnett
89f110f60a Add separate component for post-auth security flows 
Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs.
 2020-01-27 22:28:07 +00:00
J. Ryan Stinnett
f3fc95296e
Merge pull request #3944 from stoically/develop 
Use https for recaptcha for all non-http protocols
 2020-01-27 19:55:23 +00:00
stoically
ff195381e9
Use https for recaptcha for all non-http protocols 
Signed-off-by: stoically <stoically@protonmail.com>
 2020-01-27 18:56:55 +01:00
Zoe
1964e18315 Fix issue where we don't notice if our own devices shouldn't be trusted 2020-01-27 16:40:56 +00:00
Damir Jelić
e2dd2bd950 Merge branch 'poljar/seshat-ui-pr' into develop 2020-01-27 17:18:17 +01:00
J. Ryan Stinnett
805e9abb39 Flip back to develop 2020-01-27 16:00:25 +00:00
Damir Jelić
ab8ea52266 EventIndexPanel: Make sure links get opened in a new tab. 2020-01-27 16:50:33 +01:00
Damir Jelić
e38f1191a5 ManageEventIndex: Clarify that we're currently not downloading any messages. 2020-01-27 15:51:19 +01:00
Half-Shot
5851b10f72 strings 2020-01-27 14:44:11 +00:00
Half-Shot
4d83288f4e linting 2020-01-27 14:42:46 +00:00
Damir Jelić
7e0ab2f0a3 DisableEventIndexDialog: Turn the cancel button red. 2020-01-27 15:28:43 +01:00
Zoe
0eb49c4c72
Merge pull request #3948 from matrix-org/foldleft/12035-room-decoration-design-pass-2 
Remove DM icons if `feature_cross_signing` is enabled; hide padlocks in DM room headers
 2020-01-27 14:15:32 +00:00
Half-Shot
c0d1298c4f Factor out into BridgeTile 2020-01-27 14:05:22 +00:00
Zoe
e224150190 detail pass on DMs 2020-01-27 12:17:12 +00:00
RiotRobot
7a79b78292 Merge branch 'master' into develop 2020-01-27 11:46:56 +00:00
RiotRobot
8c56c59922 v2.0.0 2020-01-27 11:44:10 +00:00
RiotRobot
976ac328e1 Prepare changelog for v2.0.0 2020-01-27 11:44:10 +00:00
RiotRobot
692c993a34 js-sdk v4.0.0 2020-01-27 11:40:05 +00:00
David Baker
1ab91d1d74
Merge pull request #3943 from matrix-org/dbkr/kill_lingering_verification_toast 
Stop rogue verification toast if you verify during login
 2020-01-27 11:17:55 +00:00
David Baker
6737523b1c
Merge pull request #3942 from matrix-org/dbkr/show_incoming_verifications_in_complete_security 
Show incoming verification requests in the 'complete security' phase
 2020-01-27 11:17:16 +00:00
Half-Shot
c9a0e93a74 tidy up borders 2020-01-27 11:14:32 +00:00
David Baker
11de92b9a9 hopefully informative comment 2020-01-27 11:07:55 +00:00
David Baker
1356b61276
Merge pull request #3941 from matrix-org/dbkr/dismiss_logged_out_device_toasts 
Dismiss logged out device toasts
 2020-01-27 10:25:20 +00:00
David Baker
e50ed95edf
English 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-27 10:17:16 +00:00
David Baker
d5ac37a4ab
Merge pull request #3940 from matrix-org/dbkr/e2e_upgrade_toast 
Verification nag toasts
 2020-01-27 10:16:18 +00:00
David Baker
8b214d20b5
Merge pull request #3947 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-01-27 10:16:07 +00:00
David Baker
8c4c79adde i18n 2020-01-27 10:05:42 +00:00
David Baker
43173824d3
Capitalisation 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-27 09:44:39 +00:00
David Baker
ebb70ca9fb
English 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-27 09:44:12 +00:00
Weblate
d418ab8e64 Merge branch 'origin/develop' into Weblate. 2020-01-27 09:43:40 +00:00
David Baker
08b685d04f
Merge pull request #3939 from matrix-org/dbkr/remember_password_bootstrap 
Remember password for e2e bootstrapping
 2020-01-27 09:43:35 +00:00
Weblate
3ba56f8c94 Merge branch 'origin/develop' into Weblate. 2020-01-27 09:42:52 +00:00
catborise
ca774f45fe Translated using Weblate (Turkish) 
Currently translated at 73.8% (1513 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-27 09:42:52 +00:00
Tirifto
13ba90a054 Translated using Weblate (Esperanto) 
Currently translated at 90.1% (1848 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-01-27 09:42:52 +00:00
Michael Telatynski
acf09a004f
Merge pull request #3946 from matrix-org/t3chguy/emoji 
fix compound emoji
 2020-01-27 09:42:44 +00:00
Michael Telatynski
a4bbe2ba64 fix compound emoji 2020-01-26 22:17:31 +00:00
Besnik Bleta
49cdbc9ebe Translated using Weblate (Albanian) 
Currently translated at 99.7% (2043 of 2050 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-01-26 17:23:20 +00:00
David Baker
086e43e584 comments ftw 2020-01-25 21:30:42 +00:00
David Baker
f851f976e7 Stop rogue verification toast if you verify during login 
Fixes https://github.com/vector-im/riot-web/issues/12057
 2020-01-25 21:26:43 +00:00
David Baker
9e38c62791 Show incoming verification requests in the 'complete security' phase 
If you click to verify your new sign in on another device, actually
show the verification request on the 'complete security' screen.
 2020-01-25 20:42:45 +00:00
David Baker
7169a84449 Dismiss toasts for logged out devices 2020-01-25 17:08:31 +00:00