45e0515b39
Merge pull request #4399 from matrix-org/t3chguy/querystring
2021-07-16 19:57:24 +01:00
74bd7cad3f
remove unrelated change
2021-07-16 13:40:53 +01:00
3b13eb7b44
Prefer URL constructor over `url` dependency
2021-07-16 13:18:12 +01:00
9d45a3760f
Fix types of the various query params dicts, arrays can be included e.g via
2021-07-16 13:11:43 +01:00
5dbd79c729
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/querystring
...
Conflicts:
package.json
src/@types/global.d.ts
src/components/views/elements/AppTile.js
src/utils/HostingLink.js
yarn.lock
2021-07-16 12:47:33 +01:00
b55f69a74c
Merge pull request #6374 from matrix-org/copy-room
...
Add "Copy Link" to room context menu
2021-07-16 11:14:00 +01:00
5f2fab02e7
Merge pull request #6385 from matrix-org/t3chguy/fix/18008
2021-07-16 11:06:57 +01:00
767d97065d
Run i18n
2021-07-16 09:36:59 +01:00
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
685b59235d
Make error message consistent with menu title
2021-07-16 09:24:46 +01:00
329f1c9d6a
Update src/components/views/rooms/RoomTile.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 09:22:17 +01:00
ff80bbc4a5
Move copy link to be before settings
2021-07-16 09:10:20 +01:00
a1c658f187
Set Menu icon to link
2021-07-16 09:07:52 +01:00
7464900f95
Change menu label to Copy Link
2021-07-16 09:05:01 +01:00
6809817c77
Merge pull request #6387 from SimonBrandner/fix/irc-replies/18010
...
Fix IRC layout replies
2021-07-16 07:11:53 +01:00
a3792b75e2
Fix IRC layout replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 07:53:20 +02:00
831c482371
Stub out MatrixClient::isUserIgnored for tests
2021-07-15 18:17:07 +01:00
1437188282
Also move effects handling from `event` to `Room.timeline` to wake up less
2021-07-15 18:02:02 +01:00
923d68a0fa
Fix EventIndex handling events twice
...
It awaits the decryption in onRoomTimeline as well as subscribing to EVent.decrypted
2021-07-15 17:46:46 +01:00
b0053f36d3
Fix instances of event.sender being read for just the userId - this field may not be set in time
2021-07-15 17:43:24 +01:00
376533e709
Merge pull request #3553 from maunium/compact-reply-rendering
2021-07-15 15:52:10 +01:00
5d0afdb706
Don't show line number in replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:38:07 +02:00
88da0f4dcf
Give audio and video replies an icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:17:41 +02:00
68640a4dbd
Fix icon postion
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:16:05 +02:00
375e279825
Add speaker icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:15:48 +02:00
f1bb223803
Merge pull request #6380 from matrix-org/dbkr/new_changelogs
...
Update PR template for new changelog generation
2021-07-15 14:12:28 +01:00
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 14:54:06 +02:00
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console
2021-07-15 13:50:13 +01:00
20e0356eb1
why do my IDE be dumb
2021-07-15 12:25:26 +01:00
7dd4100f41
improve types
2021-07-15 12:18:17 +01:00
7c3c04d340
Fix instances of setState calls after unmount
2021-07-15 12:10:54 +01:00
e9d56d4f13
Fix possible uncaught exception for getUrlPreview which would cause 0 url previews if one url was faulty
2021-07-15 12:10:01 +01:00
1eaf6dd4ed
Improve TS in SenderProfile
2021-07-15 11:49:55 +01:00
b8ac40ae55
Fix React missing key error
2021-07-15 11:49:44 +01:00
59feff3763
Silence RoomListStore possible memory leak warning
2021-07-15 11:49:15 +01:00
76022dc95f
Merge pull request #6381 from matrix-org/t3chguy/spacesperf
2021-07-15 11:39:42 +01:00
316b21408d
Fix tests
2021-07-15 10:59:52 +01:00
50b6c5c557
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +01:00
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
80f9793c73
only show space beta tweaks if you have the beta enabled as they do nothing otherwise
2021-07-15 08:29:50 +01:00
90d380c8ae
Cache value of feature_spaces* flags as they cause page refresh so are immutable
2021-07-15 08:26:49 +01:00
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
f42382edbd
Update PR template for new changelog stuff
2021-07-14 23:29:54 +01:00
f990a595d1
Merge pull request #6379 from matrix-org/dbkr/contributing_md
...
Convert CONTRIBUTING to markdown
2021-07-14 23:06:18 +01:00
21a6a2d01e
Update links
2021-07-14 22:39:03 +01:00
f4c767ab3e
Convert CONTRIBUTING to markdown
...
Where by 'convert', I mean 'rename'
2021-07-14 22:37:47 +01:00
6fc6d6b0a3
Merge pull request #6366 from matrix-org/t3chguy/ts/c4
2021-07-14 20:14:01 +01:00
2c5c2e82bf
Merge pull request #6378 from matrix-org/travis/widgets/fix-state-read
...
Exclude state events from widgets reading room events
2021-07-14 12:59:58 -06:00
421392f339
Exclude state events from widgets reading room events
...
They can request state reading permissions to read state.
2021-07-14 12:48:27 -06:00
12761fd823
add valuable ts-ignore
2021-07-14 19:16:34 +01:00
Michael Telatynski