Commit Graph

33863 Commits (19cae421619021d2b1e453c43490e5ae0426a62b)

Author SHA1 Message Date
Germain Souquet 19cae42161 Benchmark multiple common user scenario 2021-06-15 15:06:00 +01:00
Germain bef20dde48
Merge pull request #6177 from matrix-org/gsouquet/benchmark-tracking 2021-06-15 14:17:59 +01:00
Germain 3eca1cbec3
Merge pull request #6187 from matrix-org/gsouquet/update-react-test-utils
Upgrade matrix-react-test-utils for React 17 peer deps
2021-06-15 12:45:09 +01:00
Germain Souquet 4a23ebae1e upgrade matrix-react-test-utils for react 17 peer deps 2021-06-15 12:00:44 +01:00
Germain Souquet 7310d35d7f Merge branch 'develop' into gsouquet/benchmark-tracking 2021-06-15 11:45:11 +01:00
Germain Souquet 011a2f2bb6 Remove test data for develop pipeline 2021-06-15 10:59:57 +01:00
Germain Souquet d5f7f524e1 Slow down registration process 2021-06-15 10:24:07 +01:00
Germain Souquet 2b2e83b9e7 Fix github token 2021-06-15 10:10:22 +01:00
Germain Souquet 55a9915c55 Upgrade github-action-benchmark 2021-06-15 10:01:05 +01:00
Germain Souquet 6f6a128587 try auto push 2021-06-15 09:27:44 +01:00
Germain Souquet 646416c8ec try deployment to gh-pages 2021-06-15 08:59:51 +01:00
Michael Telatynski 419baebde9
Merge pull request #6186 from SimonBrandner/fix/irc-layout-display-name/17645
Fix display name overlaps on the IRC layout
2021-06-15 08:10:38 +01:00
Šimon Brandner d08495bde6
Fix display name overlap
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-15 06:30:22 +02:00
Michael Telatynski 6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566 2021-06-14 23:27:51 +01:00
Michael Telatynski 2fd8cc414c
Merge pull request #6111 from matrix-org/t3chguy/fix/17365 2021-06-14 22:57:14 +01:00
Michael Telatynski 539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
Michael Telatynski 430ec8cecd Clear selected rooms after operation in manage space rooms 2021-06-14 22:18:18 +01:00
Michael Telatynski f8eea2ae23 Fix word wrap in space descriptions 2021-06-14 22:18:02 +01:00
Michael Telatynski 91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Travis Ralston d4c039a332
Merge pull request #6183 from matrix-org/travis/fix-types
Move various createRoom types to the js-sdk
2021-06-14 13:51:37 -06:00
Travis Ralston 951fbf4a1a fix import 2021-06-14 13:38:43 -06:00
Travis Ralston 2eafe132b8 Move various createRoom types to the js-sdk 2021-06-14 13:31:58 -06:00
Germain 42538f8c75
Merge pull request #6175 from matrix-org/gsouquet/fix-17621
Fix HTML tag for Event Tile when not rendered in a list
2021-06-14 15:48:00 +01:00
Germain Souquet 6e3ece2dc6 use proper released github action 2021-06-14 15:29:18 +01:00
Germain Souquet 7000176572 Add workflow steps to track measurements 2021-06-14 14:53:22 +01:00
Šimon Brandner e260e8671f
Inline display name into return
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-11 15:14:16 +02:00
Germain 015890477d
Merge pull request #6176 from matrix-org/gsouquet/deprecate-dependencies 2021-06-11 12:43:51 +01:00
Germain Souquet 37484e3fc4 Add TextEncoder polyfill for test run 2021-06-11 12:33:02 +01:00
Germain Souquet 84679cf8ec remove legacy polyfills and unused dependencies 2021-06-11 12:19:14 +01:00
Germain Souquet b1824ce579 fix HTML tag for Event Tile when not rendered in a list 2021-06-11 11:34:53 +01:00
Germain e84d51bc0a
Merge pull request #6173 from SimonBrandner/fix/hover-select-event-tile/17576
Fix buggy hovering/selecting of event tiles
2021-06-11 09:30:32 +01:00
Šimon Brandner 5343be7814
Fix buggy hovering/selecting of event tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 18:53:56 +02:00
Germain 88e337b89c
Merge pull request #5929 from matrix-org/gsouquet-e2ee-warning 2021-06-10 14:58:31 +01:00
Germain c6968b4919
Merge pull request #6156 from matrix-org/gsouquet/gh-actions-e2e-tests
Migrate end to end tests to GitHub actions
2021-06-10 14:41:46 +01:00
Šimon Brandner 8174973cfe
Use the same styling as for mx_TextualEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-10 15:31:27 +02:00
Germain 79b8fbc2a9
Add indentation for unencrypted warning text
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-10 14:21:48 +01:00
Germain 0a6cd6a758
Merge pull request #6171 from matrix-org/gsouquet/fix-17505
Fix expanding last collapsed sticky session when zoomed in
2021-06-10 12:44:57 +01:00
Germain Souquet 9731e275f8 cater for an undefined MatrixClient on rooms 2021-06-10 12:15:55 +01:00
Germain Souquet 6606a1142d Update unencrypted room warning copy 2021-06-10 11:29:10 +01:00
Germain Souquet 0e2e327c46 Delete new room intro stale CSS 2021-06-10 11:19:25 +01:00
Germain Souquet 7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Germain Souquet 4f649f290c Migrate RoomSettingsDialog to TypeScript 2021-06-10 10:46:54 +01:00
Germain Souquet c2d1eb3e8e Merge branch 'develop' into gsouquet-e2ee-warning 2021-06-10 10:25:20 +01:00
Germain 4660101944
Merge pull request #6165 from matrix-org/gsouquet/react-17 2021-06-10 10:13:18 +01:00
Germain Souquet b4cb275ca1 Fix expanding last collapsed sticky session when zoomed in 2021-06-09 17:59:41 +01:00
Germain 91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586
Revert refreshStickyHeaders optimisations
2021-06-09 16:34:11 +01:00
David Baker 0b90560b1a
Merge pull request #6170 from matrix-org/dbkr/call_room_logging
Add logging for which rooms calls are in
2021-06-09 16:24:12 +01:00
J. Ryan Stinnett 9aaf506ad5
Merge pull request #6169 from matrix-org/jryans/rebuild-the-sky
Restore read receipt animation from event to event
2021-06-09 16:16:17 +01:00
David Baker bd8fd246c6 Add logging for which rooms calls are in 2021-06-09 16:04:03 +01:00
J. Ryan Stinnett c6972c4535 Fix spelling 2021-06-09 15:53:38 +01:00