Commit Graph

12552 Commits

Author SHA1 Message Date
Michael Telatynski b386f0c73b Merge pull request #5657 from matrix-org/t3chguy/usercontent
Remove redundant lockOrigin parameter from usercontent
2021-02-16 18:23:55 +00:00
Michael Telatynski 6cb3381df5 Remove redundant lockOrigin parameter from usercontent
now that each Element has its own, and not usercontent.riot.im
it only has to permit its own origin
2021-02-16 18:03:12 +00:00
J. Ryan Stinnett 234f1bf2c4 Test domains in config directly 2021-02-15 17:38:11 +00:00
J. Ryan Stinnett d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Michael Telatynski da6f1e559b Merge pull request #5634 from jaiwanth-v/add-loading-TextInputDialog
Added loading and disabled the button while searching for server
2021-02-11 12:22:27 +00:00
Jaiwanth 20dc8dbb32 Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:39:12 +05:30
Jaiwanth 61c6033de7 Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:58 +05:30
Jaiwanth 6c252a87a1 Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:46 +05:30
Jaiwanth 3fc6d73158 Added loading and disabled the button while searching for server
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-02-11 17:28:02 +05:30
J. Ryan Stinnett fa5df314a1 Merge pull request #5450 from matrix-org/jaywink/hosting-provider-iframe
Add host signup modal with iframe
2021-02-10 13:53:15 +00:00
Šimon Brandner 6b0b46b917 Fix duplication caused by highlighting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:20:19 +01:00
Šimon Brandner 895be6e7a6 Added second comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:02:45 +01:00
Šimon Brandner 5cf126dea3 Added comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:41:24 +01:00
Šimon Brandner b97d8979c7 Remove nested for loop
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:18:23 +01:00
Jason Robinson 23140a84ff Remove host signup config strings, make translatable instead
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
Jason Robinson dc549a9e4b Address some more pr feedback 2021-02-09 22:41:40 +02:00
Šimon Brandner 4a7bc74e99 Fix duplication of codeblock elements
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 19:46:30 +01:00
Jason Robinson 2197c1e519 Address some of the PR feedback 2021-02-09 20:13:58 +02:00
Jason Robinson a4a478cf72 Remove host signup link from UserMenu.tsx
It duplicates the new host signup modal dialog.
2021-02-09 20:01:45 +02:00
Michael Telatynski 59069f95e9 Merge pull request #5631 from SimonBrandner/avoid-delay-on-screen-share
Avoid delayed displaying of sources in source picker
2021-02-09 12:26:29 +00:00
Šimon Brandner 27b2b5b65d Make componentDidMount async
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:19:12 +01:00
Šimon Brandner 98e602f544 Avoid delayed displaying of sources
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:07:23 +01:00
Jason Robinson c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson ad5b40b5ba Allow popups from host signup dialog 2021-02-09 12:29:23 +02:00
Jason Robinson e31b89b952 Restructure host signup terms dialog documents config and dialog 2021-02-09 12:23:27 +02:00
Jason Robinson 2aa4fce1c5 Remove unused types 2021-02-09 11:42:58 +02:00
Jason Robinson 5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
Marco Zehe 890bb5b9eb Give breadcrumbs toolbar an accessibility label.
Fixes vector-im/element-web#16406.

Signed-off-by: Marco Zehe <marco@marcozehe.de>
2021-02-08 16:58:18 +01:00
Šimon Brandner 84eba59afa Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
David Baker cf5ec7720c Merge pull request #5525 from SimonBrandner/fix-screen-sharing
Fix desktop Matrix screen sharing and add a screen/window picker
2021-02-08 13:54:51 +00:00
J. Ryan Stinnett 811ae9ba82 Merge pull request #5616 from dangwynne/develop
Close current modal when session is logged out
2021-02-08 12:56:00 +00:00
J. Ryan Stinnett 5abced7049 Merge pull request #5551 from weeman1337/fix-15347-explore-rooms-spacing
Switch room explorer list to CSS grid
2021-02-08 11:18:01 +00:00
Michael Weimann f0f6e4678e switch room explorer list to css grid
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-02-06 14:40:16 +01:00
Michael Telatynski 1d1a3e72ca Improve SSO login start screen and 3pid invite handling somewhat 2021-02-05 17:18:13 +00:00
J. Ryan Stinnett 295cf12cf8 Merge pull request #5621 from SimonBrandner/fix-jump-on-reaction
Don't jump to bottom on reaction
2021-02-05 14:28:25 +00:00
Šimon Brandner 69e81119e9 Don't jump to bottom on reaction
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 15:15:20 +01:00
J. Ryan Stinnett 81bd919a18 Port avatar restore to user profile settings 2021-02-05 14:11:57 +00:00
J. Ryan Stinnett bccfdde4ac Normalise cancel behaviour for room avatar
This normalises the behaviour of the "Cancel" button for the room profile so
that it _always_ restores the existing value for all of room name, topic, and
avatar, instead of performing a mix of restore and remove.

Fixes https://github.com/vector-im/element-web/issues/16375
2021-02-05 13:58:28 +00:00
J. Ryan Stinnett bffce8689a Allow saving room topic or name only
This changes the room profile settings to support saving _only_ the room topic or
name in case you have limited access to set one but not the other.

Fixes https://github.com/vector-im/element-web/issues/16375
2021-02-05 13:34:06 +00:00
dangwynne 12f6272ab4 implement qa feedback for closing modals when logging out 2021-02-05 09:24:12 +00:00
Šimon Brandner ec73f2ec49 Change comment styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:30:54 +01:00
Šimon Brandner 77248725ed Added onHeightChanged call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:29:24 +01:00
Šimon Brandner ad5c8fe7e4 Revert "Rerender MessagePanel"
This reverts commit c7e61ac71d.
2021-02-05 08:27:07 +01:00
Šimon Brandner 9bd8fef6b3 Change comment styling
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-05 08:22:02 +01:00
Jason Robinson f5f8050172 Add minimize button to HostSignupDialog.tsx 2021-02-04 23:09:58 +02:00
Jason Robinson fd55b99a26 Remove a comment that is not true anymore 2021-02-04 23:05:24 +02:00
J. Ryan Stinnett 15a4032be0 Merge pull request #5530 from aaronraimist/option-hide-stickers
Add option to hide the stickers button in the composer
2021-02-04 17:01:23 +00:00
Šimon Brandner 9db86a38f6 Update src/components/views/messages/TextualBody.js
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-04 17:58:21 +01:00
Jason Robinson b50ac0c096 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-04 18:32:16 +02:00
J. Ryan Stinnett 4a73f3c504 Merge pull request #5598 from SimonBrandner/fix-confusing-right-panel
Fix confusing right panel button behaviour
2021-02-04 16:30:41 +00:00