mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
29518 commits 214 branches 561 tags 414 MiB
Commit graph

29518 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
193685b8b2 Merge branch 'origin/develop' into Weblate. 2020-10-30 22:26:19 +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
Weblate
148cbc8db3 Merge branch 'origin/develop' into Weblate. 2020-10-30 22:01:51 +00:00
Marcelo Filho
cfafa3d595 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-10-30 22:01:51 +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
Weblate
0ee3bea98a Merge branch 'origin/develop' into Weblate. 2020-10-30 21:13:20 +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
Weblate
c03341c7b2 Merge branch 'origin/develop' into Weblate. 2020-10-30 18:45:25 +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
Weblate
f1e68956c0 Merge branch 'origin/develop' into Weblate. 2020-10-30 18:39:17 +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
Weblate
3741ce949e Merge branch 'origin/develop' into Weblate. 2020-10-30 18:31:24 +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
Weblate
e59b499198 Merge branch 'origin/develop' into Weblate. 2020-10-30 18:06:35 +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
Weblate
2a606c4214 Merge branch 'origin/develop' into Weblate. 2020-10-30 17:45:10 +00:00
Priit Jõerüüt
df2c64f21d Translated using Weblate (Estonian) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-10-30 17:45:10 +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
David Baker
7796621e8d Merge remote-tracking branch 'origin/develop' into dbkr/call_hold 2020-10-30 16:49:42 +00:00
Weblate
d589dac124 Merge branch 'origin/develop' into Weblate. 2020-10-30 16:24:45 +00:00
Besnik Bleta
3021ca05bd Translated using Weblate (Albanian) 
Currently translated at 99.7% (2370 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2020-10-30 16:24:45 +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
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
Weblate
7951a54854 Merge branch 'origin/develop' into Weblate. 2020-10-30 14:28:58 +00:00
XoseM
ac4f9bbcc0 Translated using Weblate (Galician) 
Currently translated at 99.9% (2374 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-30 14:28:58 +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
Weblate
9b794198e9 Merge branch 'origin/develop' into Weblate. 2020-10-30 13:47:47 +00:00
XoseM
97b7863354 Translated using Weblate (Galician) 
Currently translated at 99.6% (2366 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-30 13:47:46 +00:00
David Baker
90cdc2f341 Add the new css file 2020-10-30 13:47:43 +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
Weblate
c0ce913fe0 Merge branch 'origin/develop' into Weblate. 2020-10-30 13:08:05 +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
Weblate
7b40aa6d1f Merge branch 'origin/develop' into Weblate. 2020-10-30 12:00:13 +00:00