Commit Graph

27939 Commits (9b12355b2a30831e56abc9a1bb9f6a3159dc0937)

Author SHA1 Message Date
Travis Ralston 9b12355b2a Appease the linter 2020-09-02 08:59:24 -06:00
Travis Ralston 92c184385c Merge branch 'develop' into travis/communities/proto/userinfo 2020-09-01 10:51:42 -06:00
RiotRobot 0d290c9bd2 Reset matrix-js-sdk back to develop branch 2020-09-01 17:39:09 +01:00
RiotRobot 52691a1a42 Merge branch 'master' into develop 2020-09-01 17:38:21 +01:00
RiotRobot 9df5371dca Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2020-09-01 17:37:52 +01:00
RiotRobot d1d823dcc7 v3.3.0 2020-09-01 17:36:21 +01:00
RiotRobot 69e5ed56ae Prepare changelog for v3.3.0 2020-09-01 17:36:20 +01:00
RiotRobot bb248670a6 Upgrade matrix-js-sdk to 8.2.0 2020-09-01 17:02:49 +01:00
Michael Telatynski 7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts
Fix eslint ts override tsx matching and delint
2020-09-01 16:44:22 +01:00
Michael Telatynski d668f8018b undo some delint 2020-09-01 15:59:19 +01:00
Michael Telatynski 6c39213116 remove unused class TextHighlighter 2020-09-01 15:37:07 +01:00
Michael Telatynski a13cc0ce6a
Merge pull request #5159 from matrix-org/t3chguy/react-err
Fix react error about functional components can't take refs
2020-09-01 09:13:42 +01:00
Michael Telatynski 3b68da5f42
Merge pull request #5156 from matrix-org/t3chguy/crc
Remove redundant components and devDependencies
2020-09-01 09:12:46 +01:00
Michael Telatynski 656a815991 delint some more 2020-09-01 09:07:46 +01:00
Travis Ralston 78d5b87fbc Use a different border variable for compatibility with custom themes 2020-08-31 11:20:28 -06:00
Travis Ralston b4f62e9c88 use valid jsdoc 2020-08-31 11:07:29 -06:00
Travis Ralston 7f7414ed5a Appease the linter 2020-08-31 10:59:37 -06:00
Travis Ralston fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -06:00
Travis Ralston 133f981fa8 Run the tag selection behaviour through the prototype store too 2020-08-31 10:22:29 -06:00
Travis Ralston 724e3f6905 Run all selected prototype community logic through one store 2020-08-31 10:19:05 -06:00
Travis Ralston 93d67a6689 Wire up members button to member view
Ideally this would open up the group members panel, but that's exceedingly difficult. Instead, we switch to the general chat and rename the button to be a bit more helpful.
2020-08-31 10:12:12 -06:00
Michael Telatynski da97d8885b Fix react error about functional components can't take props 2020-08-29 13:51:43 +01:00
Michael Telatynski ac9108a9a6 i18n 2020-08-29 12:16:14 +01:00
Michael Telatynski 672d0fe97b Remove redundant components and devDependencies 2020-08-29 12:09:07 +01:00
Travis Ralston 281e2ab27b Null guard new function to reduce error spam 2020-08-28 20:13:26 -06:00
Travis Ralston 275ff6b41e Wire up the invite button 2020-08-28 20:08:12 -06:00
Travis Ralston 35e4d89545 Add aria labels to menu options 2020-08-28 20:04:19 -06:00
Michael Telatynski 9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01:00
Travis Ralston 02095389e7 Add structure for mixed prototype UserMenu 2020-08-28 17:03:17 -06:00
Travis Ralston 01b0acbe62 Make the UserMenu echo the current community name 2020-08-28 16:14:08 -06:00
Travis Ralston 0ffa548864 Change the menu button to a chevron
by design request
2020-08-28 15:37:23 -06:00
Travis Ralston 90d9d7128d Use FlairStore's cache for group naming
Turns out GroupStore doesn't really know much.
2020-08-28 14:56:59 -06:00
Travis Ralston e68c4efd0b Merge branch 'travis/copy2' into travis/communities/proto/userinfo 2020-08-28 13:54:03 -06:00
Travis Ralston fb54b62be9 Appease the rest of the linter 2020-08-28 13:42:19 -06:00
Travis Ralston 6f237161fd Appease the linter 2020-08-28 13:28:54 -06:00
Travis Ralston e58b514803 Add clarifying text to DM dialog about what is about to happen 2020-08-28 13:22:20 -06:00
Michael Telatynski b1cc078543
Merge pull request #5154 from matrix-org/t3chguy/display-capture
Add display-capture to iframe allow for widgets
2020-08-28 18:18:44 +01:00
Michael Telatynski 2823156ef6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/display-capture 2020-08-28 17:26:10 +01:00
Michael Telatynski b9cfa95ceb Add display-capture to iframe allow 2020-08-28 17:06:56 +01:00
Travis Ralston cc2fc911af Minor copy addition to DM dialog for communities prototype 2020-08-28 10:03:27 -06:00
Travis Ralston 52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change
Update create room dialog copy & community prototype home icon
2020-08-28 09:47:53 -06:00
Travis Ralston f038103f97 Fix copy 2020-08-28 09:47:36 -06:00
J. Ryan Stinnett e2acec6059
Merge pull request #5149 from matrix-org/jryans/defer-cross-signing-setup
Migrate to new, separate APIs for cross-signing and secret storage
2020-08-28 12:40:35 +01:00
J. Ryan Stinnett f634c3a71e Add secret storage cache callback to avoid prompts
This supplies a cache callback to the JS SDK so that we can be notified if a new
storage key is created e.g. by resetting secret storage. This allows it to be
supplied automatically in case it's needed in the same user operation, as it is
when resetting both secret storage and cross-signing together.
2020-08-28 12:10:17 +01:00
Travis Ralston 898136e44d
Merge pull request #5152 from matrix-org/travis/communities/fix-clear
Fix clicking the background of the tag panel not clearing the filter
2020-08-27 15:06:58 -06:00
Travis Ralston 3c176f762e Remove disabled clear button from tag panel + dead code 2020-08-27 14:27:06 -06:00
Travis Ralston bbd343f414 Fix clicking the background of the tag panel not clearing the filter
Fixes https://github.com/vector-im/element-web/issues/12988
2020-08-27 14:17:55 -06:00
Travis Ralston be1de1d295 Update create room dialog copy 2020-08-27 13:49:40 -06:00
Travis Ralston 13e9f7b912 Update home icon 2020-08-27 13:18:52 -06:00
Travis Ralston 8a5dc7edd7
Merge pull request #5147 from matrix-org/travis/communities/proto/create-room
Communities v2 prototype: Associate created rooms with the selected community
2020-08-27 08:05:04 -06:00