30600 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Telatynski	62712159f6	Merge pull request #5578 from matrix-org/t3chguy/sso_fixes ... Improve SSO auth flow	2021-01-29 13:28:53 +00:00
Michael Telatynski	0eb0d242d5	Apply suggestions from code review ... Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>	2021-01-29 13:05:09 +00:00
Michael Telatynski	0167c3cefb	Iterate SSO auth ux styling	2021-01-29 13:04:05 +00:00
Michael Telatynski	1eb88c988c	Add tooltips to mini sso buttons	2021-01-29 12:05:15 +00:00
Michael Telatynski	2c2cf4c073	Update google branding	2021-01-29 11:42:34 +00:00
J. Ryan Stinnett	b8e3908ee2	Merge pull request #5586 from matrix-org/jryans/maybe-mobile ... Add optional mobile guide toast	2021-01-29 11:18:08 +00:00
J. Ryan Stinnett	241955f7c2	Merge pull request #5588 from 2580ayush2580/ayush25807 ... Fix invisible text after logging out in the dark theme	2021-01-29 10:38:17 +00:00
Michael Telatynski	e839ac0f06	Merge pull request #5591 from SimonBrandner/fix-escape-to-quit-reply ... Fix escape for cancelling replies	2021-01-29 10:26:42 +00:00
Ayush Kumar	6b56d0b987	change value #2e2f32 to -primary-color	2021-01-29 15:54:40 +05:30
J. Ryan Stinnett	8d2deec3e1	Merge pull request #5589 from matrix-org/travis/update-deps/wapi-12 ... Update widget-api to beta.12	2021-01-29 10:12:59 +00:00
Šimon Brandner	4f065ad822	Fix escape for cancelling replies ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-29 10:31:59 +01:00
Travis Ralston	5d4c38188c	Update widget-api to beta.12	2021-01-28 20:42:48 -07:00
Ayush Kumar	512ac5ef3b	fixed invisible text after logging out in the dark theme	2021-01-29 03:58:05 +05:30
J. Ryan Stinnett	2996ceca52	Add optional mobile guide toast ... This adds an optional toast which Element deployments can enable to nudge users towards the mobile apps once they are inside the app. Part of https://github.com/vector-im/element-web/issues/16283	2021-01-28 17:21:36 +00:00
J. Ryan Stinnett	f113748520	Merge pull request #5540 from SimonBrandner/dm-conversion-commands ... Add commands for DM conversion	2021-01-28 16:17:07 +00:00
Travis Ralston	310a2e9b2a	Merge pull request #5580 from matrix-org/travis/widgets/oidc-verif-diag ... Run a UI refresh over the OIDC Exchange confirmation dialog	2021-01-28 07:47:11 -07:00
Travis Ralston	d6dbe5596a	Merge pull request #5581 from matrix-org/travis/widgets/sticker-picker ... Allow stickerpickers the legacy "visibility" capability	2021-01-28 07:46:17 -07:00
J. Ryan Stinnett	4920614ca5	Merge pull request #5529 from SimonBrandner/hide-local-feed ... Hide local video if it is muted	2021-01-28 12:49:52 +00:00
J. Ryan Stinnett	5758cd8bcc	Merge pull request #5518 from blattersturm/pr/irc-layout-width ... Don't use name width in reply thread for IRC layout	2021-01-28 12:44:36 +00:00
J. Ryan Stinnett	60eade5008	Merge pull request #5554 from czeidler/code-style-update ... Update code_style.md	2021-01-28 12:42:50 +00:00
J. Ryan Stinnett	6cbff674d3	Merge pull request #5569 from SimonBrandner/fix-czech-letters ... Fix Czech capital letters like ŠČŘ...	2021-01-28 12:35:22 +00:00
J. Ryan Stinnett	5431dc7331	Merge pull request #5548 from SimonBrandner/add-search-shortcut ... Add optional search shortcut	2021-01-28 12:33:32 +00:00
J. Ryan Stinnett	08d495eee8	Merge pull request #5584 from 2580ayush2580/ayush25805 ... Fix Sudden 'find a room' UI shows up when the only room moves to favourites	2021-01-28 12:25:47 +00:00
Michael Telatynski	fd4109b8ad	fix tests by reverting if removal	2021-01-28 11:00:04 +00:00
Michael Telatynski	1761a4ec80	Improve SSO UIA ... Fixes Fallback UIA postmessage interface Auto-closes SSO UIA tab when the user has completed the flow within it Error for when auth stage is restarted because it failed	2021-01-28 10:45:29 +00:00
Travis Ralston	41068c7849	Merge pull request #5568 from SimonBrandner/fix-15221 ... Increase PersistedElement's z-index	2021-01-27 20:37:11 -07:00
Travis Ralston	41682fa8d2	Update src/components/views/elements/PersistedElement.js	2021-01-27 20:37:04 -07:00
Travis Ralston	61f6fa0633	Merge pull request #5582 from matrix-org/travis/widgets/fix-jitsi-unpin ... Remove check that prevents Jitsi widgets from being unpinned	2021-01-27 14:59:34 -07:00
Travis Ralston	3229b1fb4e	Merge pull request #5583 from matrix-org/travis/widgets/jitsi-crash ... Fix Jitsi widgets causing localized tile crashes	2021-01-27 14:59:27 -07:00
Travis Ralston	c1b33d3e2c	Fix Jitsi widgets causing localized tile crashes ... Seems to be that as part of the layout work the timing sequence for when `.getRoom().widgets` will work changed. We can get around this with `initIfNeeded` which will no-op in the worst case. This also includes a copy change to make ended conferences stop lying about where to find the widget. This is work towards https://github.com/vector-im/element-web/issues/15739	2021-01-27 14:40:04 -07:00
Ayush Kumar	2c11f0bb7c	Added condition to hide the 'find a room' UI unless the user is explicitly filtering the list	2021-01-28 03:09:52 +05:30
Travis Ralston	08b067fd68	Remove check that prevents Jitsi widgets from being unpinned ... Later in the code we do a conditional on the widget type to auto-pin the widget, so we don't need this one to force the widget higher. Fixes https://github.com/vector-im/element-web/issues/16280	2021-01-27 14:31:48 -07:00
Travis Ralston	edb363b751	Allow stickerpickers the legacy "visibility" capability ... Fixes https://github.com/vector-im/element-web/issues/16237	2021-01-27 14:22:55 -07:00
Travis Ralston	db346d129b	Run a UI refresh over the OIDC Exchange confirmation dialog	2021-01-27 13:13:44 -07:00
Michael Telatynski	34ae766893	Wire up MSC2858 brand attribute ... For better brand adherance. Also removes old support for https IdP icons.	2021-01-27 16:15:47 +00:00
David Baker	33a86f6cbe	Merge pull request #5573 from matrix-org/dbkr/callstats ... Log candidates for calls	2021-01-27 16:01:06 +00:00
J. Ryan Stinnett	de507b80f7	Merge pull request #5579 from matrix-org/jryans/upgrade-deps-2021-01 ... Upgrade deps 2021-01	2021-01-27 14:01:47 +00:00
J. Ryan Stinnett	51aab9ca08	Fix import style for commonmark	2021-01-27 13:06:59 +00:00
Michael Telatynski	e6673bca1b	Improve SSO auth flow ... Use replaceState instead of a redirect to strip the loginToken Put user into the same post-auth flows of E2ESetup Skip UIA prompt in this post-auth flow, happy path is a server grace period	2021-01-27 12:50:12 +00:00
J. Ryan Stinnett	d78bc98521	Resolve linting errors after upgrades	2021-01-27 12:42:39 +00:00
J. Ryan Stinnett	84b1f2e6c6	Resolve typing errors after TypeScript upgrade	2021-01-27 12:42:37 +00:00
J. Ryan Stinnett	ea706189a2	Nested upgrades via yarn upgrade	2021-01-27 12:34:10 +00:00
J. Ryan Stinnett	0cb266eda2	lolex renamed to @sinonjs/fake-timers	2021-01-27 12:31:37 +00:00
J. Ryan Stinnett	ca08475498	Apply all simple major version upgrades	2021-01-27 12:31:37 +00:00
J. Ryan Stinnett	f8816e0bda	Pin React types to 16.x for now ... This avoids type conflicts from other deps that depends on just `*`. Type deps needs to be de-duplicated down to a single version to avoid errors (unlike code deps).	2021-01-27 12:31:37 +00:00
J. Ryan Stinnett	12c671045d	Upgrade to latest minor versions of deps	2021-01-27 12:31:37 +00:00
David Baker	9ac31747f6	This was missing a break somehow	2021-01-27 10:36:40 +00:00
J. Ryan Stinnett	048a3f6ec8	Merge pull request #5566 from 2580ayush2580/ayush25803 ... Fix "Continuing without email" dialog bug	2021-01-27 00:02:26 +00:00
RiotRobot	4dbdeb46ad	Reset matrix-js-sdk back to develop branch	2021-01-26 12:11:47 +00:00
RiotRobot	e21514cea0	Merge branch 'master' into develop	2021-01-26 12:08:24 +00:00