OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
34,557 Commits
219 Branches
563 Tags
449 MiB
Commit Graph

34557 Commits (297116a3b760a4f2c1d91ce882f00b5d367aad78)

Author SHA1 Message Date
Germain 520763a045
Merge pull request #6189 from matrix-org/gsouquet/disable-comments-on-forks 
Disable comment-on-alert for PR coming from a fork
 2021-06-15 15:06:30 +01:00
Germain Souquet 19cae42161 Benchmark multiple common user scenario 2021-06-15 15:06:00 +01:00
Germain Souquet 8dbc5bddc0 Disable comment-on-alert for PR coming from a fork 2021-06-15 14:47:45 +01:00
Germain bef20dde48
Merge pull request #6177 from matrix-org/gsouquet/benchmark-tracking 2021-06-15 14:17:59 +01:00
Michael Telatynski a52dd57eb2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529 
 Conflicts:
	package.json
	yarn.lock
 2021-06-15 13:59:54 +01:00
Michael Telatynski 89221bde0f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 
 Conflicts:
	src/dispatcher/actions.ts
 2021-06-15 13:58:13 +01:00
Michael Telatynski 660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
 2021-06-15 12:58:29 +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
Michael Telatynski 5098a304c9 delint 2021-06-15 12:33:46 +01:00
Michael Telatynski 5130d5e111 Hide addresses section for private spaces 2021-06-15 12:26:09 +01:00
Michael Telatynski 83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-06-15 12:24:26 +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 a63d9220d2 Clear outstanding TODOs 2021-06-15 08:26:46 +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
Germain d3101b5ce4
Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-15 00:02:49 +01:00
Germain Souquet 2e6dab0bcd change parameter to use preset enum 2021-06-15 00:01:05 +01:00
Germain Souquet 07bdaeaf70 Fix mjolnir private chat enum 2021-06-14 23:55:14 +01:00
Germain Souquet b2f20e052d remove unused import 2021-06-14 23:51:38 +01:00
Germain Souquet 75151b7a6c Migrate TermsDialog to TypeScript 2021-06-14 23:50:41 +01:00
Germain Souquet de414cd0a6 Migrate UserSettingsDialog to TypeScript 2021-06-14 23:42:36 +01: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 b9f86d54c3 Update yarn.lock 2021-06-14 22:07:25 +01:00
Germain Souquet a030c1270a Migrate ErrorDialog to TypeScript 2021-06-14 21:55:47 +01:00
Germain Souquet cf822d4d4c Migrate DeactivateAccountDialog to TypeScript 2021-06-14 21:53:44 +01:00
Germain Souquet e39baf3e23 Migrate CryptoStoreTooNewDialog to TypeScript 2021-06-14 21:45:12 +01:00
Germain Souquet de95f3bc01 Migrate CreateGroupDialog to TypeScript 2021-06-14 21:43:54 +01:00
Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	yarn.lock
 2021-06-14 21:39:06 +01:00
Germain Souquet 5cbbb5110b Migrate ConfirmWipeDeviceDialog to TypeScript 2021-06-14 21:38:10 +01:00
Germain Souquet c2aaba1f79 Migrate ConfirmUserActionDialog to TypeScript 2021-06-14 21:36:56 +01:00
Michael Telatynski 91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Michael Telatynski 2879b9086c Use alphabet from js-sdk 2021-06-14 21:32:11 +01:00
Germain Souquet 9443ef4ff9 Migrate ConfirmRedactDialog to TypeScript 2021-06-14 21:31:17 +01:00
Germain Souquet 6877504f2d Migrate ConfirmAndWaitRedactDialog to TypeScript 2021-06-14 21:30:28 +01:00
Michael Telatynski 8fd72fcf79 Iterate algorithm, base it on new js-sdk string lib 2021-06-14 21:28:32 +01:00
Germain Souquet 1ff3aa0d74 Migrate ChangelogDialog to TypeScript 2021-06-14 21:26:15 +01:00
Germain Souquet be92226448 Migrate BugReportDialog to TypeScript 2021-06-14 21:23:28 +01:00
Germain Souquet f2250af565 Migrate AskInviteAnywayDialog to TypeScript 2021-06-14 21:03:12 +01:00
Germain Souquet 5f2ab50a90 migrate SetupEncryptionStore to TypeScript 2021-06-14 20:58:20 +01:00