Commit Graph
4542 Commits
Author SHA1 Message Date
Michael TelatynskiandGitHub 444425b9ab Merge pull request #5365 from matrix-org/t3chguy/countly
Initial Countly work
2020-10-30 13:07:58 +00:00
Michael Telatynski c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Michael TelatynskiandGitHub 3c9cc636c4 Merge pull request #5360 from matrix-org/t3chguy/fix/15586
Watch replyToEvent at RoomView to prevent races
2020-10-29 11:54:49 +00:00
Michael Telatynski e06550b748 Watch replyToEvent at RoomView to prevent races 2020-10-28 12:47:59 +00:00
Travis RalstonandGitHub b10a6a5720 Merge pull request #5349 from RinkiyaKeDad/comments
docs: added comment explanation
2020-10-26 08:48:39 -06:00
Arsh Sharma e57f4fbd54 docs: fixed whitespace 2020-10-21 20:13:50 +05:30
Arsh Sharma 312d46917c docs: added comment explanation 2020-10-21 20:10:35 +05:30
Michael Telatynski 0170fa608e Fix User Menu avatar colouring being based on wrong string
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 14:11:39 +01:00
Michael Telatynski 4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
2020-10-21 12:48:51 +01:00
Michael Telatynski a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
2020-10-21 09:56:22 +01:00
Michael TelatynskiandGitHub 42228719b9 Merge pull request #5343 from matrix-org/t3chguy/ts/resizer
Convert resizer to Typescript
2020-10-20 23:54:17 +01:00
Michael TelatynskiandGitHub 9181e3e89a Merge pull request #5338 from matrix-org/t3chguy/fix/15166
Hide filtering microcopy when left panel is minimized
2020-10-20 15:21:43 +01:00
Michael TelatynskiandGitHub 5caad82f9f Merge pull request #5337 from matrix-org/t3chguy/fix/15484
Spec compliance, /search doesn't have to return results
2020-10-20 11:36:37 +01:00
Michael Telatynski 329ded92c1 Convert resizer to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 11:03:03 +01:00
Michael Telatynski b0acae6e77 fix remaining type mismatches
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 21:13:31 +01:00
Michael Telatynski bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
2020-10-19 20:50:16 +01:00
Michael Telatynski 744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski 35d12171b1 Remove unused prop for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:54:53 +01:00
Michael Telatynski 9789f8cf94 Spec compliance, /search doesn't have to return results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:46:55 +01:00
Michael Telatynski 30adc98a15 Fix excessive hosting link padding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 12:34:25 +01:00
Michael TelatynskiandGitHub 84111a2eaf Merge pull request #5326 from matrix-org/t3chguy/fix/11195
Discard all mx_fadable legacy cruft which is totally useless
2020-10-15 18:34:03 +01:00
Michael TelatynskiandGitHub 0c87df4957 Merge pull request #5319 from matrix-org/t3chguy/fix/null-avatar
Fix background-image: url(null) for backdrop filter
2020-10-15 17:48:51 +01:00
6a82a1f3c7 Update src/components/structures/LeftPanel.tsx
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-10-15 17:15:01 +01:00
Michael Telatynski 3e548bbc94 tidy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 16:57:07 +01:00
Michael Telatynski 916c78d4cf delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 16:56:16 +01:00
Michael Telatynski 6b01b6ac6c Discard all mx_fadable legacy cruft which is totally useless
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 16:13:16 +01:00
Michael Telatynski f198b95579 Iterate PR; tidy and improve widget context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 15:24:42 +01:00
Michael Telatynski a6c81a903c Iterate with new buttons and resize locking
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-15 11:14:48 +01:00
Travis Ralston 25db3ac6aa Fix _groupFilterOrderStoreToken naming 2020-10-14 16:32:23 -06:00
Arsh Sharma 49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Michael Telatynski efad42439e Fix background-image: url(null) for backdrop filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-14 11:41:24 +01:00
Michael TelatynskiandGitHub e3155fe58f Merge pull request #5313 from matrix-org/t3chguy/other/1
Improve LHS resize performance and tidy stale props&classes
2020-10-14 10:06:37 +01:00
Arsh Sharma 3bdb6606de fix(LeftPanel.tsx): fix 2 for linting errors 2020-10-13 21:07:18 +05:30
Arsh Sharma fa88eea274 fix(LeftPanel.tsx): fix for linting errors 2020-10-13 20:56:28 +05:30
Michael Telatynski bb52bad099 Remove stale props and CSS classes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:23:49 +01:00
Michael Telatynski a2b61796af Improve LHS resize performance
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 16:20:54 +01:00
Michael Telatynski a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
 Conflicts:
	src/components/structures/RoomView.tsx
2020-10-13 13:45:22 +01:00
Arsh Sharma 357579d6ba fixed errors in leftpanel.tsx 2020-10-13 17:04:39 +05:30
Michael Telatynski f72b1e0c7d Remove stale things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 12:27:50 +01:00
David Baker 4c11a82fef Fix rogue (partial) call bar
Call state is now null if there is no call, so check for that too
2020-10-13 12:16:15 +01:00
Michael Telatynski afacf8c6b7 Improve LHS resize performance
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 10:30:52 +01:00
David Baker ed9584bbac Comment scoping block 2020-10-13 09:55:03 +01:00
David Baker abd5e3b3cf More enums 2020-10-12 10:25:23 +01:00
RinkiyaKeDad f5a40eff4b updated TagFilterStore 2020-10-10 18:02:58 +05:30
RinkiyaKeDad 4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
David Baker 55f77b04ae Rewrite call state machine
* Remove the two separate enumerations of call state: now everything
   uses the js-sdk version of call state. Stop adding a separate
   'call_state' field onto the call object(!)
 * Better reflection of the actual state of the call in the call bar,
   so when it's connecting, it says connecting, and only says 'active call'
   when the call is actually active.
 * More typey goodness
2020-10-09 18:56:07 +01:00
Michael Telatynski 85aca420f4 sort hasPinnedWidgets out
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:52:34 +01:00
Michael Telatynski ada6d1aa46 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-09 08:42:21 +01:00
Michael Telatynski b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
J. Ryan StinnettandGitHub 779e43b8dd Merge pull request #5296 from matrix-org/jryans/sso-4s-integration
Convert auth lifecycle to TS, remove dead ILAG code
2020-10-07 15:42:42 +01:00