ffa75ef48c
Wire up all the dialog parts for SSO, using device deletion as a POC
2020-03-30 20:03:46 -06:00
bbb9a67ced
use new method for checking key
2020-03-30 17:28:01 -04:00
b35356833f
Merge branch 'develop' into travis/sso-uia
2020-03-30 14:56:52 -06:00
690b5945d0
Pass new secret storage key to bootstrap path
...
This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.
Fixes https://github.com/vector-im/riot-web/issues/12867
2020-03-30 21:40:11 +01:00
9cf82d8743
Updated strings
...
I added a new string for the /html command and had to regerate strings
for i18
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-03-30 11:44:34 -07:00
dd4331cd18
Added the /html command
...
This command lets you send html messages through riot. This is
incredibly useful for doing advanced formatting not supported by
markdown and lets riot support even more html tags.
Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
2020-03-30 11:44:08 -07:00
930f93b974
Merge branch 'poljar/event-index-log-skipped-events' into develop
2020-03-30 20:12:51 +02:00
6517ed07bd
Merge pull request #4307 from matrix-org/t3chguy/fixes1111
...
Field: mark id as optional in propTypes
2020-03-30 19:08:29 +01:00
147e7bc57e
Field: mark id as optional in propTypes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 18:42:47 +01:00
ca5d540311
Remove underscore from Jitsi conference names
...
Fixes https://github.com/vector-im/riot-web/issues/12929
Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
2020-03-30 10:40:26 -06:00
a3555cacea
Merge remote-tracking branch 'origin/develop' into jryans/id-change-red
2020-03-30 14:52:22 +01:00
4e8cec354d
Merge pull request #4290 from matrix-org/foldleft/12484-user-shields
...
Refactor shield display logic; changed rules for DMs
2020-03-30 14:23:13 +01:00
559b8e174b
undo accidental changes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 14:13:08 +01:00
c6d69f3d3f
de-tslint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 14:09:10 +01:00
8c2b910c03
rework SlashCommands to better expose aliases
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-30 13:59:08 +01:00
836b348bff
EventIndex: Add a trailing comma.
2020-03-30 14:49:28 +02:00
4371006c58
EventIndex: Better logging on how many events are added.
...
This adds a bit more info to how many events are added, how many skipped
and if they are skipped because they are undecryptable.
2020-03-30 14:49:28 +02:00
90b8d87a39
Merge pull request #4297 from matrix-org/t3chguy/kbd11
...
Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
2020-03-30 10:30:38 +01:00
057ca35c24
Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog
...
Field: make id optional, generate one if not provided
2020-03-30 10:30:19 +01:00
5375f888ea
Merge pull request #4293 from matrix-org/t3chguy/fix_scrollbars
...
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
2020-03-30 10:29:56 +01:00
403d70897d
Merge pull request #4274 from matrix-org/foldleft/reset-refactor
...
rename secret storage force-reset variable to avoid confusion
2020-03-30 10:22:24 +01:00
098df07c67
review feedback
2020-03-30 10:18:47 +01:00
55c2d98571
Fix Field ctor
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 23:16:57 +01:00
19aae087e0
Field: make id optional, generate one if not provided
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 22:59:15 +01:00
167f953ac7
Document Composer:Escape to cancel a reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:35:35 +01:00
acc41585ab
Fix CmdOrCtrl+K for collapsed LHS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:27 +01:00
2a54a8aa85
Escape should cancel a reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:01 +01:00
2ff16844e5
Make ELS somewhat more accessible
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:12:10 +01:00
b2d905ef2c
Make FormatButton use AccessibleButtons
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:07:32 +01:00
f586aaab35
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-28 00:51:01 +00:00
37619dd127
Show red shield for users that become unverified
...
For any users that we previously verified but that are not unverified, we will
now mark them and rooms they are in with a red shield.
Fixes https://github.com/vector-im/riot-web/issues/12808
2020-03-28 00:21:18 +00:00
1e30bdb739
Early proof of concept for SSO UIA
...
It works well enough to start doing design.
2020-03-27 14:39:59 -06:00
984f9ea4aa
Fix fallback auth link to act and look like a link
2020-03-27 13:44:32 -06:00
29bb7e38fe
fix undismissable toasts
2020-03-27 16:45:46 +01:00
9d0ed6e800
fix copy-pasta error
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:19:43 +00:00
de0895b881
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:06:21 +00:00
6664535a26
change welcome page placeholders
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:32 +00:00
f4d3cc8ee6
revert stale changes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:14 +00:00
db6f88c66a
Welcome page, support $ssoUrl and $casUrl placeholders
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:02:32 +00:00
1f0d7923d7
with output type
2020-03-27 13:51:30 +00:00
5b7e7f49d1
lint
2020-03-27 13:50:03 +00:00
5d7adef0a2
Factor out shield display rules into one file
2020-03-27 13:45:35 +00:00
0f2e2ea069
Update shield display rules
2020-03-27 13:44:54 +00:00
548e918437
only auto-sso when disable_custom_urls is true
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 12:01:10 +00:00
a02731f632
Merge branch 'develop' into foldleft/reset-refactor
2020-03-27 10:50:05 +00:00
cf4f595f79
Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar
...
blank out UserInfo avatar when changing between members
2020-03-27 10:21:53 +00:00
2278a724aa
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel
...
Add cancel button to verification panel
2020-03-27 10:20:02 +00:00
528c820a2b
Merge pull request #4284 from matrix-org/bwindels/showverifreqinsteadofmember
...
Show ongoing verification request straight away when navigating to member
2020-03-27 10:19:31 +00:00
a2737899c1
Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars
...
Fix: allow scrolling while window is not focused & remove scrollbar hack
2020-03-27 10:16:53 +00:00
98f9f1e956
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 09:59:43 +00:00
a974f0fe46
blank out UserInfo avatar when changing between members
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 09:59:18 +00:00
1f12d16b70
Merge pull request #4287 from matrix-org/dbkr/show_backup_key_cached
...
Show whether backup key is cached
2020-03-27 09:31:03 +00:00
7fbfd73e11
Show modal on "instant SSO"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 01:17:42 +00:00
ccb3283fd3
Show whether backup key is cached
...
in cross signing debug panel
2020-03-26 18:50:31 +00:00
2bf4513b44
Merge pull request #4285 from matrix-org/bwindels/renameunverifiedsessiontoast
...
Rename unverified session toast
2020-03-26 17:12:25 +00:00
e3e40ace81
Fix: pick last active DM for verification request
2020-03-26 17:45:59 +01:00
ce77593cf9
rename toast title
2020-03-26 17:37:44 +01:00
abf12a3ddf
Show EncryptionPanel straight away when there is an ongoing verification request for a user
2020-03-26 17:31:31 +01:00
a6fbb98252
only show close button when not in a dialog, which already has one
2020-03-26 17:02:32 +01:00
34b0c1b1e7
fix lint & other cleanup
2020-03-26 16:54:31 +01:00
9b54d15fcd
add cancel button to verification panel
2020-03-26 16:53:46 +01:00
053a5a5ff4
Merge pull request #4269 from ThobyV/thobyv/hide-formatBar-on-highlight-backspacing-message
...
Fix formatBar not hidden after highlight and backspacing some text
2020-03-26 13:19:06 +00:00
1713006958
recommit bwindels commited changes to refactor check logic after rebase mistake
2020-03-26 14:03:38 +01:00
6d90307ff7
Merge pull request #4277 from matrix-org/dbkr/trust_cross_signing_flag
...
Add a flag to control whether cross-signing signatures are trusted
2020-03-26 12:19:14 +00:00
b2fbee0ffd
Merge branch 'origin/develop' into Weblate.
2020-03-26 12:05:03 +00:00
e2bb0a3b46
Merge pull request #4281 from matrix-org/dbkr/ssss_upgrade_copy
...
Update copy on SSSS symmetric upgrade toast
2020-03-26 12:04:58 +00:00
26ffcb2669
Merge branch 'origin/develop' into Weblate.
2020-03-26 12:04:56 +00:00
091e094759
Merge pull request #4270 from matrix-org/dbkr/wait_for_upgrade_to_complete
...
Wait for SSSS upgrade to complete
2020-03-26 12:04:52 +00:00
8fbdcbadb5
Merge branch 'origin/develop' into Weblate.
2020-03-26 11:55:41 +00:00
39fdde627d
Merge pull request #4278 from matrix-org/t3chguy/e2e_copy
...
Update cross-signing verification copy and fix i18n
2020-03-26 11:55:36 +00:00
2bd112ca7c
add delete support and to keyboard shortcuts
2020-03-26 12:40:31 +01:00
c95b23f3ec
fix formatBar not hidden after highlight-backspacing text partially
2020-03-26 12:40:31 +01:00
f7e9cf4552
i18n
2020-03-26 11:15:07 +00:00
8a64caa925
Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy
2020-03-26 11:14:33 +00:00
95828ce751
Remove duplicate import
2020-03-26 11:13:57 +00:00
8532c72fce
Update copy on SSSS symmetric upgrade toast
...
Fixes https://github.com/vector-im/riot-web/issues/12881
2020-03-26 11:12:00 +00:00
4586971a82
Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete
2020-03-26 11:10:07 +00:00
7f87f9674d
Merge branch 'origin/develop' into Weblate.
2020-03-26 10:55:05 +00:00
9c20bf22ce
Fix soft-crash on bad permalinks
...
Fixes https://github.com/vector-im/riot-web/issues/12880
2020-03-26 10:45:26 +00:00
785d0e99fb
remove some remaining dead code
2020-03-26 11:17:35 +01:00
75cbc1dc07
Adjust IndicatorScrollbar to not rely on AutoHideScrollbar for overflow
2020-03-26 11:17:35 +01:00
0436507574
use transparent scrollbars on not hover to emulate scrolbar on hover
...
allows us to get rid of the margin-right hack as well
2020-03-26 11:17:35 +01:00
fced02e1f8
Merge branch 'origin/develop' into Weblate.
2020-03-26 10:08:30 +00:00
883b0afea0
Translated using Weblate (Hungarian)
...
Currently translated at 97.1% (2167 of 2231 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-26 10:08:30 +00:00
7d92430831
Translated using Weblate (Esperanto)
...
Currently translated at 99.8% (2227 of 2231 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-03-26 10:08:27 +00:00
f448f456e1
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2231 of 2231 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-26 10:08:22 +00:00
44ce5b5764
Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip
...
Fix: make self-verification wait for incoming request
2020-03-26 10:08:15 +00:00
a9e7bf9899
Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag
2020-03-26 09:40:09 +00:00
c41b39488b
Automatically redirect to SSO when the user clicks through to Login
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 23:35:36 +00:00
7ca6a4b777
Iterate copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 23:00:46 +00:00
be3167c870
always show Devices section
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 22:44:09 +00:00
d098c91c30
Update cross-signing verification copy and fix i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-25 22:38:11 +00:00
327b3c860b
Adding the files would help
2020-03-25 18:47:57 +00:00
25e7bde7bc
Add a flag to control whether cross-signing signatures are trusted
...
Fixes: https://github.com/vector-im/riot-web/issues/12616
2020-03-25 18:38:12 +00:00
bd91420366
Merge branch 'origin/develop' into Weblate.
2020-03-25 17:56:56 +00:00
2c1fbfb69c
Translated using Weblate (German)
...
Currently translated at 75.5% (1685 of 2231 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-25 17:56:56 +00:00
0fb4c51b2c
Translated using Weblate (German)
...
Currently translated at 75.5% (1685 of 2231 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-03-25 17:56:56 +00:00
0fb96fda6e
Merge pull request #4272 from matrix-org/bwindels/safaripersisted
...
Fall back to non-standard persisted api for Safari
2020-03-25 17:56:47 +00:00
0097134ade
Update src/utils/StorageManager.js
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-03-25 17:56:35 +00:00
8ad7ef42e9
Merge branch 'origin/develop' into Weblate.
2020-03-25 16:28:15 +00:00
Travis Ralston