mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 21:18:13 +03:00
Code Issues Projects Releases Packages Wiki Activity
29196 commits 208 branches 547 tags 609 MiB
Commit graph

29196 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
e67db1063e
Merge pull request #5384 from matrix-org/travis/redact-acl 
Don't let users accidentally redact ACL events
 2020-11-02 16:16:29 -07:00
Travis Ralston
b4de01b1f1 Don't let users accidentally redact ACL events 
Fixes https://github.com/vector-im/element-web/issues/15633
Fixes https://github.com/vector-im/element-web/issues/15632

Slightly more information is in the issues above and in the diff, however the short version is redacting an ACL event can obliterate a room which is bad.
 2020-11-02 12:55:59 -07:00
David Baker
294876f062
Merge pull request #5378 from matrix-org/dbkr/more_nededlessly_ignored_files 
Two more easy files to remove from eslintignore
 2020-10-31 13:59:54 +00:00
Michael Telatynski
848893359e
Merge pull request #5381 from matrix-org/t3chguy/fix/15597 
Fix Widget OpenID Permissions for realsies
 2020-10-30 22:26:13 +00:00
Michael Telatynski
997679e648 Fix Widget OpenID Permissions for realsies 2020-10-30 22:12:46 +00:00
Michael Telatynski
574d390a89
Merge pull request #5380 from matrix-org/t3chguy/fix/15597 
Fix regression with OpenID permissions on widgets
 2020-10-30 22:01:41 +00:00
Michael Telatynski
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
bf124c4379 Fix regression with OpenID permissions on widgets 2020-10-30 21:13:01 +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
6d2dc63e47
Merge pull request #5377 from matrix-org/dbkr/for_want_of_a_const 
Remove a couple more files from eslintignore
 2020-10-30 18:45:20 +00:00
David Baker
db343b522b Two more easy files to remove from eslintignore 
Just missing params/returns on jsdoc
 2020-10-30 18:40:19 +00:00
Michael Telatynski
0c6e597f4e
Merge pull request #5376 from matrix-org/t3chguy/countly 
Fix countly method bindings and errors
 2020-10-30 18:39:11 +00:00
David Baker
db0d74d0d4 Remove a couple more files from eslintignore 
Just var/const & spaces
 2020-10-30 18:33:33 +00:00
David Baker
e391d5a1dd
Merge pull request #5375 from matrix-org/dbkr/silly_lint_errors 
Fix a bunch of silly lint errors
 2020-10-30 18:31:18 +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
Michael Telatynski
7b625dbe0d sanitize error reports 2020-10-30 18:04:19 +00:00
David Baker
8b7ed7ad1a Typescript: ImageUtils 2020-10-30 17:50:37 +00:00
Michael Telatynski
577e9ee0a3 Fix method bindings 2020-10-30 17:45:52 +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