mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 05:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
21480 commits 208 branches 547 tags 609 MiB
Commit graph

21480 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zoe
e54d34090a
Merge pull request #4056 from matrix-org/foldleft/12221-temp-remove 
quick fix for cross-signing reset bug
 2020-02-11 13:44:02 +00:00
Zoe
cbb0ad6621 god i hate the i18n linter 2020-02-11 13:20:27 +00:00
Zoe
8c36792840
Merge pull request #4055 from matrix-org/foldleft/12288-correct-feedback-order 
Fix error message rendering for key entry
 2020-02-11 13:19:18 +00:00
Zoe
627ced3838 quick fix for cross-signing reset bug 2020-02-11 13:17:18 +00:00
Zoe
9a5663056d lint 2020-02-11 12:06:40 +00:00
Zoe
a677780889 i18n 2020-02-11 12:05:58 +00:00
Zoe
6b6d612041 Fix error message rendering for key entry 
Relates to https://github.com/vector-im/riot-web/issues/12288
 2020-02-11 12:02:12 +00:00
Michael Telatynski
67aa241ee5
Merge pull request #4052 from matrix-org/t3chguy/recaptcha_protocol 
Fix recaptcha blocked by CSP for non-SSL origins
 2020-02-11 10:18:44 +00:00
Michael Telatynski
36fa6261cf
Merge pull request #4054 from matrix-org/t3chguy/showTypingNotifications 
Fix watcher for showTypingNotifications setting
 2020-02-11 10:11:20 +00:00
Michael Telatynski
ee819dfdf8 fix call to SettngsStore.watchSetting, it takes a roomID 2020-02-11 09:32:09 +00:00
Michael Telatynski
f381099f2a
Merge pull request #4053 from matrix-org/t3chguy/server_enter 
Allow custom hs url submission on enter
 2020-02-11 09:30:29 +00:00
Bruno Windels
1e94929b88
Merge pull request #4045 from matrix-org/bwindels/qrcodetuning 
Support keepSecretStoragePassphraseForSession at the config level too
 2020-02-11 08:19:29 +00:00
Michael Telatynski
f01b4fe241 Allow custom hs url submission on enter 2020-02-10 20:47:27 +00:00
Michael Telatynski
86306e3da3 Recaptcha should always be loaded over https 2020-02-10 20:41:16 +00:00
Michael Telatynski
b9db0ad013
Merge pull request #4047 from matrix-org/t3chguy/hide_typing_notifs 
Add setting to allow hiding of typing indicator
 2020-02-10 18:01:52 +00:00
Zoe
d47d13256f
Merge pull request #4041 from matrix-org/foldleft/12221-reset-cross-signing 
Button to reset cross-signing and SSSS keys
 2020-02-10 17:14:05 +00:00
Zoe
2d42505124 and re-run yarn i18n 2020-02-10 17:00:03 +00:00
Zoe
4f4b52d666
Update src/components/views/settings/CrossSigningPanel.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-10 16:59:17 +00:00
Travis Ralston
ea7cb6ba0b Support keepSecretStoragePassphraseForSession at the config level too 2020-02-10 17:15:08 +01:00
Zoe
69dc725006 rename button 2020-02-10 15:43:02 +00:00
Michael Telatynski
ffb40d90da
Merge pull request #3974 from matrix-org/t3chguy/password_completion 
Use forms to wrap password fields so Chrome doesn't go wild
 2020-02-10 11:55:51 +00:00
Michael Telatynski
74af4fd764 disabled submit button be disabled 2020-02-09 15:07:07 +00:00
Michael Telatynski
2230e746aa sprinkle preventDefaults on form submission handlers 2020-02-09 15:03:28 +00:00
Michael Telatynski
0393a57b5a fix submit button disabled breaking async task 2020-02-09 14:49:54 +00:00
Michael Telatynski
150f2b3f84 Merge branches 'develop' and 't3chguy/password_completion' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/password_completion 2020-02-09 14:19:44 +00:00
Michael Telatynski
a8da4a3028 allow hiding of who is typing tile 2020-02-08 21:21:30 +00:00
Zoe
a260d7a147 manual lint 2020-02-07 15:53:43 +00:00
Zoe
b08c5d8410 lint 2020-02-07 15:46:31 +00:00
Travis Ralston
3c49515e08
Merge pull request #4001 from matrix-org/travis/qr-code-request-based 
Update QR code rendering to support VerificationRequests
 2020-02-07 15:37:53 +00:00
Travis Ralston
f6abd369ca Fix comments 2020-02-07 15:36:57 +00:00
Travis Ralston
bdeb9cccc4 Rename estimatedTargetDevice to targetDevice 2020-02-07 15:34:45 +00:00
Zoe
8fdae73e03 Button to reset cross-signing and SSSS keys 2020-02-07 14:55:01 +00:00
Bruno Windels
720450f372
Merge pull request #4038 from matrix-org/bwindels/4sunlockpurpose 
Differentiate AccessSecretStorageDialog dismiss dialog based on which key we want to read
 2020-02-07 08:58:53 +00:00
J. Ryan Stinnett
a160fbf0cc
Merge pull request #4039 from matrix-org/jryans/rvs-spam 
Only emit in RoomViewStore when state actually changes
 2020-02-06 21:12:54 +00:00
J. Ryan Stinnett
c916ef4534 Only emit in RoomViewStore when state actually changes 
This adds a shallow state check to attempt to only emit a store update when
something actually changes.

Fixes https://github.com/vector-im/riot-web/issues/12256
 2020-02-06 17:57:17 +00:00
Bruno Windels
cd65cab2e2
Merge pull request #4029 from matrix-org/bwindels/onlyexplicitdismissmodal 
Mark AccessSecretStorageDialog to not be closed by clicking background
 2020-02-06 16:09:11 +00:00
Bruno Windels
02d169060d differentiate dismiss dialog based on name passed from js-sdk 
also make dialog a bit nicer with more descriptive button
 2020-02-06 16:51:02 +01:00
Bruno Windels
a8958458aa fix lint, add jsdoc 2020-02-06 15:29:35 +01:00
Bruno Windels
cf7ad725a6 copy and i18n 2020-02-06 15:18:25 +01:00
J. Ryan Stinnett
a4228907a6
Merge pull request #4037 from matrix-org/jryans/scroll-up-pointer 
Let pointer events fall through to scroll button
 2020-02-06 13:52:14 +00:00
J. Ryan Stinnett
c3f4eaf4e5
Merge pull request #4035 from matrix-org/jryans/seshat-rooms-i18n 
Improve event indexing status strings for translation
 2020-02-06 12:53:10 +00:00
Bruno Windels
4cd4110a52 fixup: this is already done in _buildModal 2020-02-06 13:13:37 +01:00
Bruno Windels
70a4d3415e confirm to close the passphrase dialog if it was done by backgroundClick 
as it is easy to do by accident
 2020-02-06 13:11:24 +01:00
Bruno Windels
c44ebef06f add onBeforeClose option to Modal 
so we can throw up another "are you sure" dialog
in the cases we want to do so. This also
passes a reason so we can only do so for ways of
dismissing (like backgroundClick)
that are easy to do by accident.
 2020-02-06 13:10:06 +01:00
Bruno Windels
7e07a42dc1 resolve finished promise when closing dialog by clicking background 
... by calling the same close method as otherwise and not
have a special path that just calls the onFinished callback.
This will also not close all the dialogs anymore,
but that sort of seems like the intented behaviour?
 2020-02-06 13:07:13 +01:00
Michael Telatynski
4d0d6cdaa4
Merge branch 'develop' into t3chguy/password_completion 2020-02-05 20:24:37 +00:00
J. Ryan Stinnett
b522d78533 Let pointer events fall through to scroll button 
This makes it easier to click the entire visible area of the scroll button,
including the green circle at the top.
 2020-02-05 12:43:50 +00:00
Bruno Windels
a0c2a39dc7 make a static dialog close again if background is clicked 2020-02-05 13:43:30 +01:00
Travis Ralston
73b177d075
Merge pull request #4024 from TestardR/develop 
Button size reviewed for word consuming languages & Settings showing devices are a bit too tight
 2020-02-05 10:43:03 +00:00
Michael Telatynski
d8d8dd4508
Merge pull request #4034 from matrix-org/t3chguy/s1 
Only enumerate settings handlers which are supported
 2020-02-05 10:16:03 +00:00