David Baker
|
72becb73e1
|
Merge pull request #6473 from matrix-org/gsouquet/fix-18208
Fix deleted message left offset in the timeline
|
2021-07-27 13:40:20 +01:00 |
|
Michael Telatynski
|
59e9704ee8
|
Merge pull request #6481 from matrix-org/t3chguy/fix/18250
Fix broken layout of the space hierarchy view
|
2021-07-27 13:19:04 +01:00 |
|
Germain
|
50aee28bf0
|
Merge pull request #6480 from matrix-org/gsouquet/fix-18137
Add data-layout to MELS for better CSS structure
|
2021-07-27 13:15:02 +01:00 |
|
Michael Telatynski
|
0c79aec19d
|
Fix broken layout of the space hierarchy view
Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself
|
2021-07-27 13:09:43 +01:00 |
|
Germain Souquet
|
8104ba936c
|
Add data-layout to MELS for better CSS structure
|
2021-07-27 11:30:25 +02:00 |
|
Germain
|
80bf7d1675
|
Merge pull request #6468 from SimonBrandner/fix/quotes/18199
|
2021-07-27 09:48:19 +01:00 |
|
Dariusz Niemczyk
|
e65c1c2ae6
|
Merge pull request #6476 from matrix-org/fix/update-eslint-config
Update ESLint Config
|
2021-07-27 10:21:23 +02:00 |
|
Dariusz Niemczyk
|
7c9ff40863
|
Update ESLint Config
|
2021-07-27 09:52:37 +02:00 |
|
Germain
|
788abac74d
|
Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216
Fix VoIP event tile issues
|
2021-07-27 08:17:31 +01:00 |
|
Šimon Brandner
|
29b0d03fe4
|
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-26 21:27:22 +02:00 |
|
Germain Souquet
|
46a370a818
|
Fix deleted message left offset in the timeline
|
2021-07-26 11:01:37 +02:00 |
|
Michael Telatynski
|
405fe436a6
|
Merge pull request #6469 from matrix-org/t3chguy/fix/18211
Fix editing of <sub> & <sup> & <u>
|
2021-07-26 09:27:30 +01:00 |
|
Germain
|
dbe24fab70
|
Merge pull request #6461 from matrix-org/gsouquet/fix-18128
|
2021-07-26 07:46:52 +01:00 |
|
Germain
|
c7bbb497f9
|
Merge branch 'develop' into gsouquet/fix-18128
|
2021-07-26 07:41:42 +01:00 |
|
Germain
|
93ae5c20d6
|
Merge pull request #6464 from matrix-org/gsouquet/fix-18172
Fix reactions row pushing content on IRC layout
|
2021-07-26 07:40:49 +01:00 |
|
Šimon Brandner
|
8c635884d9
|
Add comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 11:05:52 +02:00 |
|
Šimon Brandner
|
456800af21
|
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 10:57:51 +02:00 |
|
Šimon Brandner
|
a2c7035163
|
Tweak copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 10:57:46 +02:00 |
|
Šimon Brandner
|
7c805501bc
|
Cleanup hangup dialogs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 10:56:04 +02:00 |
|
Šimon Brandner
|
f7087d5148
|
Add declined state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 10:30:53 +02:00 |
|
Šimon Brandner
|
f63b6fc0a9
|
Support for getting reject info
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 10:28:27 +02:00 |
|
Šimon Brandner
|
4784ddc175
|
Add state for when the remote doesn't pick up
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 08:57:29 +02:00 |
|
Šimon Brandner
|
aedd535c92
|
Correct iconography for missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 08:37:25 +02:00 |
|
Šimon Brandner
|
4aa8d8ff21
|
Add missed call icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 08:36:41 +02:00 |
|
Michael Telatynski
|
fa550a65af
|
Fix editing of <sub> & <sup> & <u>
|
2021-07-23 19:01:12 +01:00 |
|
Michael Telatynski
|
869a5fb5c7
|
Merge pull request #6467 from matrix-org/t3chguy/fix/18110
|
2021-07-23 18:21:43 +01:00 |
|
Šimon Brandner
|
d206a0b8d3
|
Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199
|
2021-07-23 18:39:42 +02:00 |
|
Šimon Brandner
|
c6df7e4e41
|
Style markdown quotes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-23 17:46:49 +02:00 |
|
Michael Telatynski
|
e78a1adb6f
|
Merge pull request #6459 from matrix-org/t3chguy/eslint1
|
2021-07-23 16:23:38 +01:00 |
|
Michael Telatynski
|
4fe0e216d6
|
Use div instead of span for mx_MImageBody to not violate spec
|
2021-07-23 16:22:35 +01:00 |
|
Michael Telatynski
|
5f2582395f
|
Fix blurhash rounded corners missing regression
|
2021-07-23 16:21:59 +01:00 |
|
Michael Telatynski
|
3c1902c26a
|
Update matrix-org-eslint-plugin
|
2021-07-23 16:09:41 +01:00 |
|
Travis Ralston
|
2c4ab507d6
|
Merge pull request #6453 from matrix-org/travis/voice-messages/code-cleanup-1
Clean up voice messages code
|
2021-07-23 09:09:12 -06:00 |
|
Michael Telatynski
|
5fb96eba05
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
|
2021-07-23 16:08:37 +01:00 |
|
Michael Telatynski
|
c7a24746f5
|
Merge pull request #6462 from matrix-org/t3chguy/fix/18182
|
2021-07-23 14:52:56 +01:00 |
|
Germain Souquet
|
3ce6fcc64b
|
Fix reactions row pushing content on IRC layout
|
2021-07-23 14:58:27 +02:00 |
|
Germain
|
3556384d80
|
Merge pull request #6463 from matrix-org/gsouquet/fix-18100
Fix clipped avatar in room list
|
2021-07-23 13:23:49 +01:00 |
|
Germain Souquet
|
42b213ba8c
|
Fix clipped avatar in room list
|
2021-07-23 14:17:26 +02:00 |
|
Michael Telatynski
|
2b133deb63
|
fix scroll behaviour to match that of prior to the spinner fix
|
2021-07-23 12:19:54 +01:00 |
|
Germain
|
3429f73efc
|
Merge pull request #6460 from matrix-org/gsouquet/fix-18126
Make inline events feel less claustrophobic in bubble layout
|
2021-07-23 11:48:21 +01:00 |
|
Michael Telatynski
|
4a4ec596bd
|
Fix position of the space hierarchy spinner
|
2021-07-23 11:27:00 +01:00 |
|
Germain Souquet
|
dcfd5d4793
|
Overlay avatar on top of bubbles
|
2021-07-23 12:12:52 +02:00 |
|
Germain Souquet
|
1ba5f19f2e
|
Put avatar is right place when sender isnt displayed in message bubbles
|
2021-07-23 12:10:34 +02: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 |
|
Germain Souquet
|
f99c0fad3e
|
Make inline events feel less claustrophobic in bubble layout
|
2021-07-23 11:40:34 +02:00 |
|
Michael Telatynski
|
f5630acea7
|
Adhere to better eslint rules
|
2021-07-23 10:35:10 +01:00 |
|
Michael Telatynski
|
358a4e5d3f
|
Merge pull request #6212 from matrix-org/t3chguy/fix/17686
|
2021-07-23 09:09:17 +01:00 |
|
Michael Telatynski
|
cd77b9f1af
|
merge two opposing if statements
|
2021-07-23 08:55:16 +01:00 |
|
Germain
|
ffcc9631df
|
Merge pull request #6449 from matrix-org/gsouquet/fix-18153
Add event selected state for message bubbles
|
2021-07-23 08:10:50 +01:00 |
|
Germain
|
aac01171b2
|
Merge pull request #6448 from matrix-org/gsouquet/fix-18162
Make images fit inside message bubble
|
2021-07-23 08:10:37 +01:00 |
|