6953aed70a
Copyright
...
Co-authored-by: Travis Ralston <travpc@gmail.com >
2020-11-05 09:51:02 +00:00
9f456a2acf
accidentally committed commenting
2020-11-05 09:50:12 +00:00
5cccb2848e
make quotes consistent
2020-11-05 09:49:14 +00:00
9be3ce928f
explicitly retuen null
...
and also sort out formatting from a different time
2020-11-05 09:47:43 +00:00
7796621e8d
Merge remote-tracking branch 'origin/develop' into dbkr/call_hold
2020-10-30 16:49:42 +00:00
517e3b5ea4
Merge pull request #5372 from matrix-org/t3chguy/countly
...
Only pass metrics if they exist otherwise Countly will be unhappy!
2020-10-30 16:24:28 +00:00
067886f5e8
Only pass metrics if they exist otherwise Countly will be unhappy!
2020-10-30 16:09:06 +00:00
f80ee391bc
Merge pull request #5370 from matrix-org/t3chguy/countly
...
Fix CountlyAnalytics NPE on MatrixClientPeg
2020-10-30 14:28:48 +00:00
171b3ede76
improve comments
2020-10-30 14:27:14 +00:00
70fe26d163
Fix CountlyAnaltics NPE on MatrixClientPeg
2020-10-30 14:14:17 +00:00
b6532f9b80
Merge pull request #5369 from matrix-org/t3chguy/countly
...
fix CountlyAnalytics canEnable on wrong target
2020-10-30 13:47:35 +00:00
3f11259fa8
fix CountlyAnalytics canEnable on wrong target
2020-10-30 13:42:35 +00:00
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly
...
Initial Countly work
2020-10-30 13:07:58 +00:00
50a937c523
add comments
2020-10-30 12:44:46 +00:00
c8485419c1
Fix bug that would cause failed to decrypt messages in non-encrypted rooms
2020-10-30 11:29:32 +00:00
db38d737a4
fix ts global
2020-10-30 10:43:52 +00:00
72f6aa61dd
flush requests queue
2020-10-30 10:31:32 +00:00
b01055f962
Tidy up and fix some edge cases
2020-10-30 10:26:15 +00:00
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
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
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
ac3414b231
Merge pull request #5362 from matrix-org/travis/ui-feat/history
...
Add a UI Feature flag for room history settings
2020-10-28 21:18:19 -06:00
09b02d0120
Fix i18n
2020-10-28 10:50:38 -06:00
a501d698aa
Add a UI Feature flag for room history settings
2020-10-28 09:00:36 -06:00
5f840da38a
Fix typo
2020-10-28 13:12:12 +00:00
ac7991c494
Add comment
2020-10-28 13:11:35 +00:00
9c8bc583e0
Hide inline images when preference disabled
...
As a first attempt, this drops inline images (as if they were not present at
all) when the "show images" preference is disabled. Future work might expose
some UI to reveal them like standalone image events have.
Fixes https://github.com/vector-im/element-web/issues/15573
2020-10-28 13:03:48 +00:00
e06550b748
Watch replyToEvent at RoomView to prevent races
2020-10-28 12:47:59 +00:00
557d9ad90c
Merge pull request #5359 from matrix-org/jryans/react-key-checkboxes
...
Fix React warning by moving handler to each button
2020-10-28 11:27:07 +00:00
0adb920448
Merge pull request #5352 from matrix-org/hs/mvideobody
...
Do not preload encrypted videos|images unless autoplay or thumbnailing is on
2020-10-27 18:56:29 -06:00
bb18e44042
Fix React warning by moving handler to each button
...
React is disturbed that the buttons don't have their own event handlers, so
let's just move it there.
2020-10-27 17:11:09 +00:00
914699259b
Merge pull request #5357 from matrix-org/t3chguy/fix/jitsi
...
Fix theme variable passed to Jitsi
2020-10-27 11:38:30 +00:00
17717e27c6
Fix theme variable passed to Jitsi
2020-10-27 11:26:16 +00:00
b10a6a5720
Merge pull request #5349 from RinkiyaKeDad/comments
...
docs: added comment explanation
2020-10-26 08:48:39 -06:00
7eb54cc83c
Also only download images after clicking on them
2020-10-23 17:16:09 +01:00
e5228e2795
alt is not valid on video element
2020-10-23 16:42:23 +01:00
7164284bb6
Do not download encrypted video if autoplay is not on
2020-10-23 16:33:40 +01:00
bbb4c7f801
Convert MVideoBody to typescript
2020-10-23 16:32:04 +01:00
cf93f75d09
fix sandbox flags
2020-10-22 22:09:16 +01:00
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
12bc3ea9dc
remove stale comments
2020-10-22 21:34:48 +01:00
ca4e7202ae
Merge pull request #5350 from matrix-org/t3chguy/fix/widgets
...
Widgets fixes
2020-10-21 16:30:24 +01:00
5f2058a6a0
Fix WidgetStore wrongly hanging onto old Widget definitions during removal
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-10-21 16:06:22 +01:00
a16a6d2b54
Remove redundant event listener
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-10-21 16:05:44 +01:00
6196c03c0a
Fix stickerpicker not having correct contexts
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-10-21 16:05:20 +01:00
e57f4fbd54
docs: fixed whitespace
2020-10-21 20:13:50 +05:30
312d46917c
docs: added comment explanation
2020-10-21 20:10:35 +05:30
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
fa1a956733
Merge pull request #5345 from matrix-org/dbkr/select_answer
...
Support 'answered elsewhere'
2020-10-21 13:42:23 +01:00
3be11d8785
Merge branch 'origin/develop' into Weblate.
2020-10-21 11:59:48 +00:00
David Baker