Commit Graph
5876 Commits
Author SHA1 Message Date
Michael Telatynski 4afa610ee1 Add variant of default home page for justRegistered 2020-11-02 17:24:47 +00:00
Michael Telatynski f2d8069a24 Track UISIs as Countly Events 2020-11-02 10:28:57 +00:00
Michael TelatynskiandGitHub 06bd2d99c4 Merge pull request #5379 from matrix-org/t3chguy/countly
Fix room directory events happening in the wrong order for Funnels
2020-10-30 21:13:14 +00:00
Michael Telatynski 0368ad4516 Fix room directory events happening in the wrong order for Funnels 2020-10-30 20:20:58 +00:00
David Baker 7ec1d5a881 Fix a bunch of silly lint errors
At some point the script to generate .eslintignore.errorfiles had
been run and added all these files to the ignore list, often because
they lacked a space before a brace or something equally mundane.

These are the easiest bunch.
2020-10-30 18:18:17 +00:00
David Baker 7796621e8d Merge remote-tracking branch 'origin/develop' into dbkr/call_hold 2020-10-30 16:49:42 +00:00
Resynth a74f4fa25e Change "Password" to "New Password"
Doesn't solve most issues in the Forgot Password menu, but clears up the
UI a little. "New Password" makes more sense here, as "Password" may
suggest to the user that they have to enter the password they forgot.

Signed-off-by: Resynth <resynth1943@tutanota.com>
2020-10-30 16:05:35 +00:00
Michael TelatynskiandGitHub f80ee391bc Merge pull request #5370 from matrix-org/t3chguy/countly
Fix CountlyAnalytics NPE on MatrixClientPeg
2020-10-30 14:28:48 +00:00
Michael Telatynski 171b3ede76 improve comments 2020-10-30 14:27:14 +00:00
Michael Telatynski 70fe26d163 Fix CountlyAnaltics NPE on MatrixClientPeg 2020-10-30 14:14:17 +00:00
Michael TelatynskiandGitHub 444425b9ab Merge pull request #5365 from matrix-org/t3chguy/countly
Initial Countly work
2020-10-30 13:07:58 +00:00
David Baker f828c6d494 Implement call hold
Currently just by adding /holdcall and /unholdcall slash commands

The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.

Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
2020-10-29 17:56:24 +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
Matthew Kenigsberg 24ba566877 Specify community description img must be mxc urls
Closes vector-im/element-web#7100

Signed-off-by: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
2020-10-28 18:34:54 -05:00
Michael Telatynski e06550b748 Watch replyToEvent at RoomView to prevent races 2020-10-28 12:47:59 +00:00
nurjinn jafar 19395f3c3c null checks added 2020-10-26 16:37:45 +01: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
Steffen Kolmer fbe2d7e0f8 Optimized naming 2020-10-21 16:15:15 +02:00
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
Steffen Kolmer daa03098f3 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-21 14:21:25 +02:00
Steffen Kolmer d4ec1dd775 Refactoring 2020-10-21 13:56:58 +02: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
nurjinn jafar 1c6d28b861 refactoring roomView / slashCommands / SendMessageComposer with the new effects configurations and fix confetti animation timeout 2020-10-21 13:37:36 +02: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
Steffen Kolmer 48633f76ab added event handling back 2020-10-19 23:10:43 +02: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
Steffen Kolmer 6d98335368 Removed old todo 2020-10-19 21:28:22 +02:00
Steffen Kolmer 607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02: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
Steffen Kolmer 41160ff08e Render confetti the react way 2020-10-19 13:54:09 +02: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
Steffen Kolmer 3e8e817a3d Fixed merge error 2020-10-19 13:35:18 +02: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
Steffen Kolmer 929cc48cef Fixed eslint error 2020-10-19 13:30:52 +02:00
Steffen Kolmer c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
Steffen Kolmer 3358ed2792 Use arrow functions 2020-10-19 12:57:57 +02: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