mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-29 22:17:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
21112 commits 206 branches 549 tags 622 MiB
Commit graph

21112 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
3d47e25955 improve PropTypes for better rageshakes 2020-01-29 07:53:45 +00:00
Michael Telatynski
83fdeeb180 Fix MemberInfo handling User objects without crashing 2020-01-29 07:53:23 +00:00
Michael Telatynski
2fbda42374 Fix buttons in right panel verif 2020-01-29 07:53:06 +00:00
Michael Telatynski
5c44ff8f8a other PR iteration based on feedback 2020-01-28 23:48:00 +00:00
Michael Telatynski
2fb6e73794 speed up user info verification css transitions by 2x 2020-01-28 23:43:27 +00:00
Michael Telatynski
c632c72f25 tidy up right-panel if-else-if statement 2020-01-28 23:43:09 +00:00
Michael Telatynski
b002806639 Use DialogButtons because reusability :(( 2020-01-28 17:42:39 +00:00
Michael Telatynski
76e61b9948 Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 2020-01-28 17:19:59 +00:00
Michael Telatynski
58df4127d3 Update propTypes and remove todo 2020-01-28 17:14:48 +00:00
Travis Ralston
dc1405c3b3
Merge pull request #3961 from matrix-org/travis/legacy-decorators 
Switch back to legacy decorators
 2020-01-28 16:54:13 +00:00
Travis Ralston
330b489fd5 Switch back to legacy decorators 
Empirically the build is fine with these, but it is unfortunate that we have to reply on deprecated semantics. TypeScript should help fix this.
 2020-01-28 16:44:30 +00:00
Will Hunt
cf2538fbed
Merge pull request #3894 from matrix-org/hs/bridge-info-pretty 
Style bridge settings tab according to design
 2020-01-28 16:15:49 +00:00
Half-Shot
bfaa9d56fb prefixes 2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684 Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty 2020-01-28 16:01:50 +00:00
Travis Ralston
145d2bb16b
Merge pull request #3957 from matrix-org/travis/babel-skinning 
Fix skinning and babel targets
 2020-01-28 14:50:19 +00:00
Half-Shot
85bcad0ea0 Styling for Nad 2020-01-28 14:46:22 +00:00
Travis Ralston
720b9a92fe Merge branch 'develop' into travis/babel-skinning 2020-01-28 14:41:51 +00:00
Travis Ralston
894568bf7a Stop using deprecated stuff 2020-01-28 14:19:06 +00:00
Travis Ralston
a4778cc7e3 Remove legacy 2020-01-28 14:18:12 +00:00
J. Ryan Stinnett
a19cdc9077
Merge pull request #3956 from matrix-org/jryans/trigger-cs-lab-4s 
Enable cross-signing lab when key in storage
 2020-01-28 14:13:04 +00:00
Travis Ralston
d0c28adfb1 Appease the linter 2020-01-28 12:53:37 +00:00
Travis Ralston
21405b8f25 Fix skinning and babel tagets 2020-01-28 12:47:38 +00:00
J. Ryan Stinnett
9cf59ab16d Enable cross-signing lab when key in storage 
When we're starting a new session and find the cross-signing keys in secret
storage, auto-enable the lab for the new session.

Fixes https://github.com/vector-im/riot-web/issues/12100
 2020-01-28 12:30:41 +00:00
J. Ryan Stinnett
dea919f6ee
Merge pull request #3953 from matrix-org/jryans/verif-toast-details-2 
Add new session verification details dialog
 2020-01-28 11:50:03 +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
Michael Telatynski
c93b080434 delint 2020-01-28 11:17:53 +00:00
Half-Shot
785277d4b8 Review bits for travis 2020-01-28 11:17:51 +00:00
Michael Telatynski
657457c14b Apply remainder of ux 2020-01-28 11:13:09 +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
J. Ryan Stinnett
67358e06bf Use annotations and imports 2020-01-28 10:10:37 +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
J. Ryan Stinnett
d014c5239b Add new session verification details dialog 
This gives more info on the session you're about to verify, including device
name and ID.

Fixes https://github.com/vector-im/riot-web/issues/11977
 2020-01-27 23:16:26 +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
Michael Telatynski
db1d3c091e Error handle the no QR verif case better 2020-01-27 17:21:31 +00:00
Michael Telatynski
ca5d4d88a2 Style the QR code 2020-01-27 17:17:05 +00: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
Michael Telatynski
50b491d7e5 post merge fix 2020-01-27 15:48:19 +00:00
Michael Telatynski
ddb0f06005 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
 2020-01-27 15:46:38 +00: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