Travis Ralston
|
32343f3382
|
Merge pull request #5698 from SimonBrandner/public-e2ee-warn
Add a warning on E2EE rooms if you try to make them public
|
2021-08-23 16:45:47 -06:00 |
|
Šimon Brandner
|
60e7c18e62
|
Add choose to new issue link
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-08-23 13:17:40 +02:00 |
|
James Salter
|
23f70836b6
|
Update copy to indicate debug logs contain which UI elements you last interacted with
|
2021-08-18 17:05:15 +01:00 |
|
James Salter
|
834f72a9a8
|
Merge remote-tracking branch 'origin' into sentry-rageshakes
|
2021-08-17 11:47:00 +01:00 |
|
Travis Ralston
|
da944b2c6b
|
Merge pull request #6323 from matrix-org/t3chguy/ts/12
Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to TS
|
2021-08-13 10:08:58 -06:00 |
|
Andrew Morgan
|
1ad35b1564
|
Keep number field in focus when pressing dialpad buttons (#6520)
|
2021-08-12 18:58:06 +01:00 |
|
Michael Telatynski
|
228d623024
|
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
|
2021-08-12 11:28:14 +01:00 |
|
Michael Telatynski
|
9d3569a577
|
Iterate PR based on feedback
|
2021-08-12 10:58:56 +01:00 |
|
Michael Telatynski
|
69cf64249f
|
add comment
|
2021-08-11 21:50:26 +01:00 |
|
James Salter
|
cc9ddb351f
|
Remove test error on startup, and send correct user text
|
2021-08-11 18:01:22 +01:00 |
|
James Salter
|
ba1618812c
|
Send user text as context
|
2021-08-11 18:00:21 +01:00 |
|
James Salter
|
de398f46f4
|
initial spike
|
2021-08-11 18:00:21 +01:00 |
|
Michael Telatynski
|
54d85a3864
|
Iterate PR based on feedback
|
2021-08-11 16:32:48 +01:00 |
|
Michael Telatynski
|
cd1b315ed6
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/12
|
2021-08-10 10:21:01 +01:00 |
|
Michael Telatynski
|
b7246404be
|
Fix create room dialog in spaces no longer adding to the space
|
2021-08-10 10:05:19 +01:00 |
|
Michael Telatynski
|
f7818e0169
|
iterate PR based on feedback
|
2021-08-06 12:05:14 +01:00 |
|
Šimon Brandner
|
6e688b3c3a
|
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
|
2021-08-06 07:53:07 +02:00 |
|
Michael Telatynski
|
2d3211ccf6
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
|
2021-08-04 12:14:29 +01:00 |
|
Michael Telatynski
|
a6e5112be0
|
Offer a way to create a space based on existing community
|
2021-08-04 10:37:35 +01:00 |
|
David Baker
|
28f5dc483b
|
Update eslint plugin & fix silly indenting
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
|
2021-08-03 17:07:37 +01:00 |
|
Germain Souquet
|
54c685bfa8
|
Migrate LogoutDialog to TypeScript
|
2021-08-03 13:52:46 +02:00 |
|
Germain Souquet
|
81b45f8aa9
|
Make defaultProps a static property of LogoutDialog
|
2021-08-03 13:44:14 +02:00 |
|
Michael Telatynski
|
94af6db201
|
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
|
2021-07-29 15:57:26 +01:00 |
|
Michael Telatynski
|
3ee8f607c0
|
Switch dropdown out for radio interaction when leaving space
|
2021-07-29 15:50:18 +01:00 |
|
Michael Telatynski
|
251b6eb04e
|
update copy
|
2021-07-29 15:30:49 +01:00 |
|
Michael Telatynski
|
af851f7f44
|
fix merge conflict resolution issue
|
2021-07-29 15:24:42 +01:00 |
|
Michael Telatynski
|
493cd01ed3
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
|
2021-07-29 15:22:52 +01:00 |
|
Michael Telatynski
|
efd8a2f9b0
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
|
2021-07-29 15:16:53 +01:00 |
|
Michael Telatynski
|
08c883ed07
|
Update all copy of subspace to space
|
2021-07-29 13:02:07 +01:00 |
|
Michael Telatynski
|
40493634ae
|
Iterate PR
|
2021-07-28 19:23:33 +01:00 |
|
Michael Telatynski
|
ed950875e7
|
Fix space hierarchy not updating when user mutates it
|
2021-07-28 19:08:59 +01:00 |
|
Michael Telatynski
|
5d9e421de0
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
|
2021-07-28 17:58:34 +01:00 |
|
Michael Telatynski
|
6123ccb2eb
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
|
2021-07-28 17:45:15 +01:00 |
|
Šimon Brandner
|
e445c9c3ff
|
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-28 13:28:11 +02:00 |
|
Michael Telatynski
|
52e50863f8
|
Fix CreateRoomDialog exploding when making public room outside of a space
|
2021-07-28 08:39:59 +01:00 |
|
Michael Telatynski
|
39d9ec3ced
|
Merge branch 'develop' into t3chguy/fix/18071
|
2021-07-27 15:02:59 +01:00 |
|
Michael Telatynski
|
737aa1c55d
|
delint
|
2021-07-26 12:41:52 +01:00 |
|
Michael Telatynski
|
2114e854f9
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
Conflicts:
src/components/structures/SpaceRoomView.tsx
|
2021-07-26 12:36:00 +01:00 |
|
Michael Telatynski
|
22339688cb
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/12
Conflicts:
src/components/structures/InteractiveAuth.js
|
2021-07-23 23:43:48 +01:00 |
|
Michael Telatynski
|
64e3c72f65
|
Fix bad import due to naming clash
|
2021-07-23 18:51:27 +01:00 |
|
Michael Telatynski
|
70d8378a66
|
delint
|
2021-07-23 18:50:25 +01:00 |
|
Michael Telatynski
|
05a9023bac
|
delint and tidy code
|
2021-07-23 18:31:31 +01:00 |
|
Michael Telatynski
|
1ba601ba22
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/dialogs/BetaFeedbackDialog.tsx
|
2021-07-23 18:28:21 +01:00 |
|
Michael Telatynski
|
b89434fcbc
|
avoid abusing spans because you're too lazy to give things a class
|
2021-07-23 16:03:15 +01:00 |
|
Michael Telatynski
|
7ccc429bea
|
Change spaces beta feedback to not be so beta-centric
|
2021-07-23 15:47:11 +01:00 |
|
Michael Telatynski
|
9c7fa71a4a
|
Remove spaces beta feedback prompts except a couple more strategic ones
|
2021-07-23 15:07:24 +01:00 |
|
Michael Telatynski
|
5ccd02dd6e
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/messages/MImageBody.tsx
|
2021-07-23 10:42:46 +01:00 |
|
Michael Telatynski
|
f5630acea7
|
Adhere to better eslint rules
|
2021-07-23 10:35:10 +01:00 |
|
Michael Telatynski
|
cd77b9f1af
|
merge two opposing if statements
|
2021-07-23 08:55:16 +01:00 |
|
Michael Telatynski
|
010baabfe6
|
Improve subspaces and some utilities around room/space creation
|
2021-07-23 08:46:20 +01:00 |
|