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

20082 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
bd0a96f2b2 Merge branches 'develop' and 't3chguy/fix_react_complaining' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_react_complaining 
 Conflicts:
	src/components/views/elements/Pill.js
 2020-01-06 09:35:59 +00:00
Michael Telatynski
ac1d9b03bf undo one of the "fixes" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 09:35:14 +00:00
Travis Ralston
4ab7b9ba92
Merge pull request #3809 from aaronraimist/pinned-msg-display-name 
Use display name when pinned messages are changed
 2020-01-05 22:18:21 -07:00
Aaron Raimist
98ede6437e Use display name when pinned messages are changed 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-01-05 23:04:46 -06:00
Travis Ralston
92fb6fcdc2
Merge pull request #3790 from justin-sleep/fix-dark-diff-highlighting 
Fix inverted diff line highlighting in dark theme
 2020-01-05 17:08:38 -07:00
Travis Ralston
781b69f4e3
Merge pull request #3693 from matrix-org/hs/bridge-info 
Bridge info settings tab
 2020-01-05 17:03:15 -07:00
Justin Sleep
8ec8a7c015 Comment rationale for swapping dark theme colors 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2020-01-05 17:58:07 -06:00
Justin Sleep
dcdf68d7e1 Explicitly define diff colors in light theme 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2020-01-05 17:35:39 -06:00
Will Hunt
7f0ed05ee1
Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Michael Telatynski
449efec1a1
Merge pull request #3805 from matrix-org/t3chguy/rageshake_enabled_labs 
Send the labs flags the client is running with in rageshake
 2020-01-05 21:46:32 +00:00
Michael Telatynski
814c0aa4c2 Send enabled_labs over rageshake as comma delimited list 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 20:52:54 +00:00
Will Hunt
2ccc8caa69
Fix indent 2020-01-05 15:50:06 +00:00
Travis Ralston
65954b1e1b
Merge pull request #3792 from matrix-org/travis/ftue/user-lists/1-initial 
Initial implementation of FTUE user lists design
 2020-01-03 10:32:24 -07:00
Travis Ralston
752482964a Purify the components 2020-01-03 10:24:07 -07:00
J. Ryan Stinnett
76f3a08909
Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s 
Update key backup creation and recovery paths for SSSS
 2020-01-03 16:32:02 +00:00
David Baker
9bf5449f33
Merge pull request #3798 from matrix-org/dbkr/dont_fail_if_logs_empty 
Don't fail if logs exists and is an empty dir
 2020-01-03 16:04:02 +00:00
David Baker
e9fa6032af
Merge pull request #3799 from matrix-org/dbkr/comment_remaining_non_cross_signing_components 
Comment remaining non-cross-signing-compliant components
 2020-01-03 16:03:53 +00:00
J. Ryan Stinnett
e12ed04da8 Remove unused import 2020-01-03 15:59:14 +00:00
David Baker
2125bcf5a6 Comment remaining non-cross-signing-compliant components 
Fixes https://github.com/vector-im/riot-web/issues/11748
 2020-01-03 15:38:59 +00:00
J. Ryan Stinnett
b8683462e8 Update backup creation paths for SSSS 
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
 2020-01-03 15:34:05 +00:00
David Baker
f9216ea590
Merge pull request #3797 from matrix-org/dbkr/remove_unverify 
Remove 'unverify' from UserInfoPanel
 2020-01-03 15:23:52 +00:00
David Baker
2970a9faaf Don't fail if logs exists and is an empty dir 2020-01-03 15:16:02 +00:00
David Baker
5faae1d2f2 i18n 2020-01-03 15:05:41 +00:00
David Baker
5897c8ca7f Remove 'unverify' from UserInfoPanel 
It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
 2020-01-03 15:00:51 +00:00
David Baker
23dffb69ac
Merge pull request #3795 from matrix-org/dbkr/key_backup_checkdevicetrust 
Use deviceTrust when displaying key backup trust status
 2020-01-03 14:52:40 +00:00
Half-Shot
50e19ba43d User may not be a bot, therefore do not imply it. 2020-01-03 14:04:59 +00:00
Half-Shot
831053de11 Make bridge info cards more obvious 2020-01-03 13:58:07 +00:00
Half-Shot
668479d94a Tweak as per git review 2020-01-03 13:57:59 +00:00
J. Ryan Stinnett
4211ec5063 Fix DOM structure in RoomRecoveryReminder 
Buttons (which end up as <div>s) aren't allowed inside <p>s.
 2020-01-03 13:51:45 +00:00
J. Ryan Stinnett
d5a82a5fc2 Finish sentence in accessSecretStorage docs 2020-01-03 13:45:57 +00:00
David Baker
43e4f2dcc0 Use deviceTrust when displaying key backup trust status 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138
 2020-01-03 13:34:43 +00:00
J. Ryan Stinnett
99559c5121 Update backup restore paths for SSSS 
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
 2020-01-03 13:33:36 +00:00
David Baker
bcece7dc10
Merge pull request #3793 from matrix-org/dbkr/keyreq_dont_crash_if_removed 
Don't crash if a keyshare request is removed
 2020-01-03 13:08:47 +00:00
David Baker
b0ca8f24d4
Merge pull request #3794 from matrix-org/dbkr/slashverify_checkdevicetrust 
Convert /verify to checkDeviceTrust
 2020-01-03 13:08:24 +00:00
David Baker
c2723176e4 Convert /verify to checkDeviceTrust 
Also de-promiseify the code a bit
 2020-01-03 12:08:35 +00:00
David Baker
557669b08e Don't crash if a keyshare request is removed 
...during the time the dialog is displayed.

Fixes https://github.com/vector-im/riot-web/issues/11745 (hopefully)
 2020-01-03 11:12:55 +00:00
Travis Ralston
6f1525c1f3 Appease the scss linter 2020-01-02 17:47:26 -07:00
Travis Ralston
3488eaba3c Appease the linter 2020-01-02 17:44:19 -07:00
Travis Ralston
4de0f7257a Initial implementation of FTUE user lists design 
This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR.

Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be.

Closes https://github.com/vector-im/riot-web/issues/11197
 2020-01-02 17:40:18 -07:00
David Baker
560cff0ae1
Merge pull request #3791 from matrix-org/dbkr/remove_e2etile_onclick 
Remove E2eIcon onClick
 2020-01-02 17:16:25 +00:00
David Baker
89ac476281 Unused import 2020-01-02 16:59:46 +00:00
David Baker
39777620a3 order copyright lines by date 2020-01-02 16:58:00 +00:00
David Baker
ffba19bd61 Remove E2eIcon onClick 
It displayed the Encrypted Event Info dialog, but this full of
super advanced debug information and base64 strings that no normal
users should ever have to see. It's still accessible via the comtext
menu (ie. the same place as 'View Source').
 2020-01-02 16:52:25 +00:00
Travis Ralston
c88efa5c2c
Merge pull request #3778 from bit/master 
support channel names with slash in name/alias
 2020-01-02 09:19:02 -07:00
Will Hunt
fa9fd97a4e
missing } 2020-01-02 09:41:50 +00:00
Will Hunt
fb94be4abd
No trailing space 2019-12-30 16:11:59 +00:00
Will Hunt
0a8cc416bf
Merge branch 'develop' into hs/bridge-info 2019-12-30 17:09:05 +01:00
Will Hunt
b1c2887087
line length 2019-12-30 16:08:24 +00:00
j
9eed423994 support channel names with slash in name/alias 
Signed-off-by: Jan Gerber <j@mailb.org>
 2019-12-29 12:10:31 +01:00
Justin Sleep
d0b8565f54 Fix inverted diff line highlighting in dark theme 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2019-12-28 23:56:44 -06:00