OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
35,847 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

35847 Commits (94af6db201ec740289c81ed7ce1e895b1427e97b)

Author SHA1 Message Date
Michael Telatynski 94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00
Michael Telatynski d587ae44af
Merge pull request #6466 from matrix-org/t3chguy/fix/18096 2021-07-29 15:53:57 +01:00
Michael Telatynski 3ee8f607c0 Switch dropdown out for radio interaction when leaving space 2021-07-29 15:50:18 +01:00
David Baker 0b9c422d47
Merge pull request #6508 from SimonBrandner/fix/pill-click/18283 
Fix clicking pills inside replies
 2021-07-29 15:40:27 +01:00
Michael Telatynski 251b6eb04e update copy 2021-07-29 15:30:49 +01:00
Šimon Brandner f0f2d3621e
Fix clicking pills inside replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-29 16:30:07 +02: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 f69b4549dd Re-add top border stroke in space create menu 2021-07-29 15:13:02 +01:00
Germain dac3eda9e3
Merge pull request #6499 from matrix-org/gsouquet/fix-18195 
Prevent timeline flickering on hover
 2021-07-29 14:33:34 +01:00
Michael Telatynski ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091 2021-07-29 13:20:19 +01:00
Michael Telatynski 08c883ed07 Update all copy of `subspace` to `space` 2021-07-29 13:02:07 +01:00
Germain 3bd393f16b
Merge pull request #6501 from matrix-org/gsouquet/fix-18249 
Restore pointer cursor for SenderProfile in message bubbles
 2021-07-29 12:20:56 +01:00
Germain 44bab05b47
Merge pull request #6500 from matrix-org/gsouquet/fix-18143 
Align event list summary read receipts when using message bubbles
 2021-07-29 12:20:37 +01:00
Dariusz Niemczyk f9f9aebef6
Merge pull request #6503 from matrix-org/fix/grecaptcha-regression 
Fix grecaptcha regression
 2021-07-29 13:05:38 +02:00
Dariusz Niemczyk 7baa3284e3
Fix grecaptcha regression 2021-07-29 12:39:32 +02:00
Germain Souquet 6c68f779ec Restore pointer cursor for SenderProfile in message bubbles 2021-07-29 11:58:32 +02:00
Germain Souquet 9c4101fa89 Align event list summary read receipts when using message bubbles 2021-07-29 11:48:22 +02:00
Germain Souquet 78a9117598 Prevent timeline flickering on hover 2021-07-29 11:12:07 +02:00
Germain ef8d2e8257
Merge pull request #6477 from matrix-org/gsouquet/fix-18132 2021-07-29 09:51:13 +01:00
Germain Souquet e140dd6ba1 Merge branch 'develop' into gsouquet/fix-18132 2021-07-29 10:27:00 +02:00
Michael Telatynski 67b8c0a811 remove unused import 2021-07-28 19:33:54 +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 a5606c72de Update feedback prompt to match designs 2021-07-28 17:56:57 +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
Travis Ralston b8781b7552
Merge pull request #6455 from matrix-org/travis/widget-customisation 
Add customisation point for declaring widget variables
 2021-07-28 07:15:45 -06:00
Michael Telatynski f91a20cb02
Merge pull request #6484 from matrix-org/t3chguy/fix/18095 2021-07-28 13:51:45 +01:00
Germain 771dda0341
Merge pull request #6472 from SimonBrandner/fix/call-view/18221 2021-07-28 11:10:37 +01:00
Germain 2a5577810f
Merge pull request #6485 from matrix-org/gsouquet/fix-18264 2021-07-28 09:41:36 +01:00
Germain Souquet a4cf147d72 Merge branch 'develop' into gsouquet/fix-18264 2021-07-28 10:30:29 +02:00
Germain 77a3d2ec18
Merge pull request #6491 from robintown/align-reactions 
Realign reactions row with messages in modern layout
 2021-07-28 09:16:04 +01:00
Michael Telatynski 98f3a5120c
Merge pull request #6492 from matrix-org/t3chguy/fix/18275.1 2021-07-28 09:10:00 +01:00
Michael Telatynski 52e50863f8 Fix CreateRoomDialog exploding when making public room outside of a space 2021-07-28 08:39:59 +01:00
Robin Townsend 3694006d05 Realign reactions row with messages in modern layout 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-27 23:48:51 -04:00
Travis Ralston 9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163 
Don't set `font-family` explicitly
 2021-07-27 11:04:23 -06:00
Germain f82744db97
Merge pull request #6487 from matrix-org/gsouquet/fix-18265 2021-07-27 17:20:02 +01:00
Germain 7e453d7745
Typo 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-27 17:14:39 +01:00
Michael Telatynski e7151ebf2d
Merge pull request #6488 from SimonBrandner/fix/call-crash/18270 2021-07-27 17:12:01 +01:00
Šimon Brandner 36607fa8a2
Fix call crashing because element was undefined 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 18:05:50 +02:00
Germain Souquet 30ce7b5eab Make link within replies clickable 2021-07-27 17:57:46 +02:00
Šimon Brandner 6f77d3bbab
Correctly hide the dialpad 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 17:52:13 +02:00
Šimon Brandner 8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
David Baker 3e7aee3a87
Merge pull request #5992 from SimonBrandner/fix/12652/screen-share 
Add support for screen sharing in 1:1 calls
 2021-07-27 15:34:27 +01:00
Šimon Brandner b9e305daae
Delete mistake line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:26:46 +02:00
Šimon Brandner 24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-27 16:25:38 +02:00
Germain Souquet 3037be11c4 Restore padding for single person state events 2021-07-27 16:24:05 +02:00
Travis Ralston 93f42182c0
Merge pull request #6479 from matrix-org/travis/voice-messages/fix-placeholder-ui 
Fix timing of voice message recording UI appearing
 2021-07-27 08:05:28 -06:00