David Baker
db0d74d0d4
Remove a couple more files from eslintignore
...
Just var/const & spaces
2020-10-30 18:33:33 +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
f38a8dc2de
Merge pull request #5374 from matrix-org/dbkr/imageutils_typescript
...
Typescript: ImageUtils
2020-10-30 18:06:28 +00:00
David Baker
8b7ed7ad1a
Typescript: ImageUtils
2020-10-30 17:50:37 +00:00
David Baker
a0c07907b3
Merge pull request #5373 from matrix-org/dbkr/auxpanel_typescript
...
Convert AuxPanel to TypeScript
2020-10-30 17:45:00 +00:00
David Baker
f920c1fb3f
There's a type for everything!
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-30 17:35:16 +00:00
David Baker
39e682afed
And remove it from the sin bin
2020-10-30 17:30:37 +00:00
David Baker
85fb923398
Convert AuxPanel to TypeScript
...
so the healing can begin
2020-10-30 17:29:32 +00:00
Michael Telatynski
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
Michael Telatynski
067886f5e8
Only pass metrics if they exist otherwise Countly will be unhappy!
2020-10-30 16:09:06 +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
70fe26d163
Fix CountlyAnaltics NPE on MatrixClientPeg
2020-10-30 14:14:17 +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
Michael Telatynski
50a937c523
add comments
2020-10-30 12:44:46 +00:00
Will Hunt
428a2de930
Merge pull request #5368 from matrix-org/hs/fix-video-bug
...
Fix videos not playing in non-encrypted rooms
2020-10-30 11:59:59 +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
db38d737a4
fix ts global
2020-10-30 10:43:52 +00:00
Michael Telatynski
72f6aa61dd
flush requests queue
2020-10-30 10:31:32 +00:00
Michael Telatynski
b01055f962
Tidy up and fix some edge cases
2020-10-30 10:26:15 +00:00
Michael Telatynski
d10234740b
Merge pull request #5367 from aaronraimist/fix-custom-tag-layout
...
Fix custom tag layout which regressed in #5309
2020-10-29 22:07:12 +00:00
Aaron Raimist
c636dc0ed3
Fix custom tag layout which regressed in #5309
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-10-29 16:54:55 -05: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
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
Travis Ralston
09b02d0120
Fix i18n
2020-10-28 10:50:38 -06:00
Travis Ralston
a501d698aa
Add a UI Feature flag for room history settings
2020-10-28 09:00:36 -06:00
RiotRobot
a708dbf6e9
Reset matrix-js-sdk back to develop branch
2020-10-28 14:32:26 +00:00
RiotRobot
6233df9d70
Merge branch 'master' into develop
2020-10-28 14:31:19 +00:00
RiotRobot
bdfac1d858
v3.7.1
2020-10-28 14:25:35 +00:00
RiotRobot
6c7284afba
Prepare changelog for v3.7.1
2020-10-28 14:25:34 +00:00
RiotRobot
de6589705c
Upgrade matrix-js-sdk to 9.0.1
2020-10-28 14:17:48 +00:00
J. Ryan Stinnett
e1e77b2191
Merge pull request #5361 from matrix-org/jryans/hide-inline-images
...
Hide inline images when preference disabled
2020-10-28 14:16:57 +00:00
J. Ryan Stinnett
5f840da38a
Fix typo
2020-10-28 13:12:12 +00:00
J. Ryan Stinnett
ac7991c494
Add comment
2020-10-28 13:11:35 +00:00
J. Ryan Stinnett
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
Michael Telatynski
e06550b748
Watch replyToEvent at RoomView to prevent races
2020-10-28 12:47:59 +00:00
J. Ryan Stinnett
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
Travis Ralston
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
J. Ryan Stinnett
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
Michael Telatynski
a093a64d70
Merge pull request #5358 from matrix-org/t3chguy/fix/jitsi-cherry-pick
...
[Release] Fix theme variable passed to Jitsi
2020-10-27 12:05:13 +00:00
Michael Telatynski
2fb0525756
Fix theme variable passed to Jitsi
2020-10-27 11:51:10 +00:00
Michael Telatynski
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
Michael Telatynski
17717e27c6
Fix theme variable passed to Jitsi
2020-10-27 11:26:16 +00:00
Michael Telatynski
cb510f7d74
Merge pull request #5351 from matrix-org/t3chguy/cherry-pick/6
...
[Release] Widget fixes
2020-10-27 11:15:53 +00:00
RiotRobot
6f37875d38
Reset matrix-js-sdk back to develop branch
2020-10-26 16:57:24 +00:00
RiotRobot
1f2ff33fc8
Merge branch 'master' into develop
2020-10-26 16:56:37 +00:00
RiotRobot
492f85da00
v3.7.0
2020-10-26 16:55:16 +00:00
