David Baker
7796621e8d
Merge remote-tracking branch 'origin/develop' into dbkr/call_hold
2020-10-30 16:49:42 +00:00
Michael Telatynski
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
b6532f9b80
Merge pull request #5369 from matrix-org/t3chguy/countly
...
fix CountlyAnalytics canEnable on wrong target
2020-10-30 13:47:35 +00:00
Michael Telatynski
3f11259fa8
fix CountlyAnalytics canEnable on wrong target
2020-10-30 13:42:35 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly
...
Initial Countly work
2020-10-30 13:07:58 +00:00
Will Hunt
c8485419c1
Fix bug that would cause failed to decrypt messages in non-encrypted rooms
2020-10-30 11:29:32 +00:00
Michael Telatynski
b01055f962
Tidy up and fix some edge cases
2020-10-30 10:26:15 +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 Telatynski
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
Travis Ralston
a501d698aa
Add a UI Feature flag for room history settings
2020-10-28 09:00:36 -06: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
Will Hunt
7eb54cc83c
Also only download images after clicking on them
2020-10-23 17:16:09 +01:00
Will Hunt
e5228e2795
alt is not valid on video element
2020-10-23 16:42:23 +01:00
Will Hunt
7164284bb6
Do not download encrypted video if autoplay is not on
2020-10-23 16:33:40 +01:00
Will Hunt
bbb4c7f801
Convert MVideoBody to typescript
2020-10-23 16:32:04 +01:00
Michael Telatynski
cf93f75d09
fix sandbox flags
2020-10-22 22:09:16 +01:00
Michael Telatynski
0004dd4475
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
2020-10-22 21:40:05 +01:00
Michael Telatynski
12bc3ea9dc
remove stale comments
2020-10-22 21:34:48 +01:00
MaHa-Nordeck
674060ed93
fixed spacing
2020-10-22 15:28:30 +02:00
MaHa-Nordeck
46eb5cdb1b
Minor improvements
...
* Made color generation dependant on gradient usage.
* Changed a loop to use for of
2020-10-22 14:01:16 +02:00
Steffen Kolmer
1c556c97d3
Added some code documentation
2020-10-21 19:06:10 +02:00
Steffen Kolmer
3ea4560019
Moved effect options to configuration
2020-10-21 17:58:54 +02:00
Michael Telatynski
a16a6d2b54
Remove redundant event listener
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:44 +01:00
Michael Telatynski
6196c03c0a
Fix stickerpicker not having correct contexts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 16:05:20 +01:00
Steffen Kolmer
cb79e38377
Better initialization and check if canvas gets unmounted
2020-10-21 17:04:01 +02:00
Steffen Kolmer
335774b6ff
Fixed more linter errors
2020-10-21 16:03:22 +02:00
Steffen Kolmer
2f83771eab
Fixed more eslint errors
2020-10-21 15:15:26 +02:00
Steffen Kolmer
906686b640
Fixed more linter warnings
2020-10-21 15:06:05 +02:00
Steffen Kolmer
6f4c5d1b08
fixed build error
2020-10-21 14:56:04 +02:00
Steffen Kolmer
8847561795
Added additional module exports
2020-10-21 14:48:11 +02:00
Steffen Kolmer
8728e12242
Some code optimizations
2020-10-21 14:43:09 +02:00
Steffen Kolmer
c7d535d2d3
Fixed some formatting issues
2020-10-21 14:29:25 +02:00
Steffen Kolmer
daa03098f3
Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676
2020-10-21 14:21:25 +02:00
Steffen Kolmer
047c29731b
Added missing translation
2020-10-21 14:15:27 +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 Telatynski
5a9bac68c6
iterate PR based on feedback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 09:48:02 +01:00
Michael Telatynski
9cd146aa33
remove debug lines
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-21 09:46:37 +01:00
Michael Telatynski
9348c8a23b
Fix some widget auto tiling issues
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 16:07:47 +01:00
Michael Telatynski
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 Telatynski
b6fd2a0691
Iterate the Modal Widget Dialog paddings and phishing warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 15:05:22 +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
16362440b3
Iterate Modal Widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-19 20:39:43 +01:00
Steffen Kolmer
607e33feba
Extensibility, TypeScript and lazy loading
2020-10-19 21:25:01 +02:00
Michael Telatynski
00b1a03a3e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
...
Conflicts:
src/@types/global.d.ts
src/FromWidgetPostMessageApi.js
src/WidgetMessaging.js
src/widgets/WidgetApi.ts
2020-10-19 19:46:07 +01:00