enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
33,683 Commits 1 Branch 7 Tags
6eb33ac730d5b3cdbf5a1bda796bfc864a9152e8
Commit Graph

5148 Commits

Author SHA1 Message Date
Šimon Brandner 6eb33ac730 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:49:05 +02:00
Michael Telatynski 5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael Telatynski 93010d34fd Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Germain 7f83590846 Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Michael Telatynski 83d223475b delint imports 2021-06-03 08:41:22 +01:00
Michael Telatynski 42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Germain Souquet bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Germain 9d126c51e4 Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
Šimon Brandner 466a52e238 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-02 10:45:35 +02:00
Šimon Brandner b202f997e3 Refactor setState() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-02 10:30:17 +02:00
Šimon Brandner 521b2445a8 Refactoring and fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-02 10:18:32 +02:00
Šimon Brandner 3bf28e3a6b Remove Ended from SUPPORTED_STATES 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 16:29:52 +02:00
Šimon Brandner 6b9e2042c3 Use a Set instead of an Array 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 16:28:57 +02:00
Michael Telatynski a1ff060138 Merge pull request #6123 from matrix-org/t3chguy/fix/17517 
Update way of checking for registration disabled
 2021-06-01 15:20:21 +01:00
Michael Telatynski 4e6f1e6294 add comment 2021-06-01 15:00:59 +01:00
Šimon Brandner 9db280bbe6 Listen for CallsChanged 
This should avoid delays and such

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 15:31:46 +02:00
Germain Souquet 591314141b Add methods visibility for AutoHideScrollbar 2021-06-01 14:15:42 +01:00
Germain Souquet 308ac505a8 Migrate AutoHideScrollbar to TypeScript 
Also changed the way the React.RefObject is collected
 2021-06-01 14:13:46 +01:00
Šimon Brandner 70a5715b3d Support hangup reasons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 14:46:41 +02:00
Šimon Brandner f1e780e642 Improved missed calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 13:40:25 +02:00
Šimon Brandner 9b904cdee8 Remove empty line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 13:39:05 +02:00
Michael Telatynski 72fab80bb9 Merge pull request #6125 from matrix-org/t3chguy/fix/17521 
Switch to stable endpoint/fields for MSC2858
 2021-06-01 12:07:41 +01:00
Šimon Brandner 14605e49c4 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-01 12:11:11 +02:00
Michael Telatynski f11a7083ae Switch to stable endpoint/fields for MSC2858 2021-06-01 11:01:09 +01:00
Michael Telatynski e525d046c7 remove outdated TODO 2021-06-01 10:49:19 +01:00
Michael Telatynski b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Šimon Brandner 0785997983 Handle missed calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:28:45 +02:00
Michael Telatynski 826efeaeaa Update way of checking for registration disabled 
Spec says 403 + M_FORBIDDEN
 2021-06-01 10:22:24 +01:00
J. Ryan Stinnett a8b6094482 Merge pull request #5674 from churchtools/default-username 
Add url param `defaultUsername` to prefill the login username field
 2021-06-01 10:12:31 +01:00
Šimon Brandner 5b3967a486 Add handling for invite 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:01:10 +02:00
Šimon Brandner 67a052e46a Reorganize things and do some fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:55:03 +02:00
Šimon Brandner 8c67b96a0f Save all events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:42:21 +02:00
Šimon Brandner c1fcadba3b Manage some more call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:33:44 +02:00
Šimon Brandner f96e25d833 Simply use call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:11:48 +02:00
Šimon Brandner 6b72c13e34 Add some call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:06:03 +02:00
Šimon Brandner 30365ca1ad Allow picking up calls from the timeline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:03:17 +02:00
Germain Souquet d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Šimon Brandner dac741d8b9 Another rewrite 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 09:30:37 +02:00
Šimon Brandner d05b1798b8 Add callId 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner 85bcf8ed52 Hook up CallEventGrouper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner 8dc0e2a7ab Add CallEventGrouper as a replacement for TimeLineCallEventStore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner 4ae92d8adc Hook up TimelineCallEventStore and add Avatar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Germain Souquet fd69fce1ba guard event listener from null values 2021-05-28 17:37:29 +01:00
Germain Souquet f10e95956b Use passive option for scroll handler 2021-05-28 14:59:14 +01:00
Germain 71b217e4a1 Merge pull request #6110 from matrix-org/gsouquet/sticky-header-sizing 2021-05-28 14:49:49 +01:00
Germain Souquet 650b683761 Reposition sticky headers when layout has changed 2021-05-28 10:31:42 +01:00
Germain Souquet 29c4d9ffd0 Restore toggle LHS logic 2021-05-28 10:03:46 +01:00
Germain Souquet 1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Germain Souquet aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00