Commit graph

30841 commits

Author SHA1 Message Date
macekj
200c061968 remove unnecessary plus checks in emoji regexes
Signed-off-by: macekj <macekj@umich.edu>
2020-11-27 19:41:45 -05:00
Steffen Kolmer
0e53e220d0
Fixed copy paste error 2020-11-27 17:25:34 +01:00
nurjinn jafar
2f72c9ee55 update translation file 2020-11-27 16:47:07 +01:00
nurjinn jafar
82023dcf42 Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +01:00
Weblate
73ccc40295 Merge branch 'origin/develop' into Weblate. 2020-11-27 14:41:14 +00:00
David Baker
bb1d52919a
Merge pull request #5449 from matrix-org/dbkr/user_media_error
Slightly better error if we can't capture user media
2020-11-27 14:41:06 +00:00
David Baker
4f35bc0865 Merge remote-tracking branch 'origin/develop' into dbkr/user_media_error 2020-11-27 14:29:22 +00:00
Weblate
2d8c103f0c Merge branch 'origin/develop' into Weblate. 2020-11-27 14:07:24 +00:00
Travis Ralston
f4979065e4
Merge pull request #5445 from matrix-org/travis/hide-rooms
Make it possible in-code to hide rooms from the room list
2020-11-27 07:07:18 -07:00
Weblate
b52c900bb5 Merge branch 'origin/develop' into Weblate. 2020-11-27 14:06:43 +00:00
Travis Ralston
ced68a6fbc
Merge pull request #5447 from matrix-org/travis/fix-stickerpicker
Fix the stickerpicker
2020-11-27 07:06:35 -07:00
David Baker
9a5f2c85cd i18n 2020-11-27 14:04:27 +00:00
David Baker
522c2d9dc7
Typo
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-11-27 14:03:52 +00:00
Weblate
65afa01725 Merge branch 'origin/develop' into Weblate. 2020-11-27 14:01:22 +00:00
Michael Telatynski
e5047e7f83
Merge pull request #5436 from SimonBrandner/feature-change-password-validation
Add live password validation to change password dialog
2020-11-27 14:01:15 +00:00
Šimon Brandner
eb64e5b2af Merge branch 'develop' into feature-change-password-validation 2020-11-27 14:46:08 +01:00
David Baker
65ab0ee665 Slightly better error if we can't capture user media
Fixes https://github.com/vector-im/element-web/issues/15837
2020-11-27 12:53:09 +00:00
Weblate
25e06d6745 Merge branch 'origin/develop' into Weblate. 2020-11-27 11:55:34 +00:00
J. Ryan Stinnett
826466179a
Merge pull request #5244 from akissinger/katex
LaTeX rendering in element-web using KaTeX
2020-11-27 11:55:26 +00:00
Weblate
009a2c3852 Merge branch 'origin/develop' into Weblate. 2020-11-27 11:45:55 +00:00
J. Ryan Stinnett
e64b6b07c9
Merge pull request #5448 from matrix-org/jryans/lifecycle-customisations
Add lifecycle customisation point after logout
2020-11-27 11:45:48 +00:00
J. Ryan Stinnett
25cc4b89b8 Add lifecycle customisation point after logout
This will help specific deployments that need to do something custom here such
as redirect the user or call some API after Element has logged out and cleared
storage.
2020-11-27 11:23:01 +00:00
J. Ryan Stinnett
86b2cd1f82 Use typeof in customisations to avoid repeating 2020-11-27 11:11:11 +00:00
Weblate
571b5a2a84 Merge branch 'origin/develop' into Weblate. 2020-11-27 10:58:36 +00:00
Tuomas Hietala
859f842cbd Translated using Weblate (Finnish)
Currently translated at 81.5% (2196 of 2692 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fi/
2020-11-27 10:58:36 +00:00
Юрий Руренко
a609b396cd Translated using Weblate (Ukrainian)
Currently translated at 53.5% (1441 of 2692 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2020-11-27 10:58:28 +00:00
LinAGKar
d468a37de5 Translated using Weblate (Swedish)
Currently translated at 97.5% (2625 of 2692 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2020-11-27 10:58:05 +00:00
Michael Telatynski
edd5bf5842
Merge pull request #5421 from matrix-org/t3chguy/fix/15700
Simplify UserMenu for Guests as they can't use most of the options
2020-11-27 10:57:54 +00:00
Michael Telatynski
00b1cd01eb Update copy 2020-11-27 09:44:04 +00:00
Arsh Sharma
cb3b8b6c77 fix(EventTile): updated comment 2020-11-27 14:13:42 +05:30
Travis Ralston
f2bc3db8fd Fix visual gap of sticker picker at bottom
Fixes https://github.com/vector-im/element-web/issues/15690
2020-11-26 15:09:44 -07:00
Travis Ralston
80f1df6d95 Don't needlessly persist user widgets
Fixes https://github.com/vector-im/element-web/issues/15842

We don't have a concept of a stickerpicker staying on screen, so don't make it a thing yet.
2020-11-26 15:09:08 -07:00
Aleks Kissinger
79baea9c4a fixed indent 2020-11-26 17:54:11 +00:00
Aleks Kissinger
494ae3e421 parse html for latex rendering inside settings block 2020-11-26 17:45:11 +00:00
Steffen Kolmer
ede67684e4
Removed trailing space 2020-11-26 18:27:35 +01:00
Aleks Kissinger
7013483dad UK spelling maths 2020-11-26 17:26:42 +00:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
Aleks Kissinger
dacef10fa6 reverted US translation 2020-11-26 16:22:10 +00:00
Šimon Brandner
acd148d807 Remove nonsense lines 2020-11-26 16:58:34 +01:00
Michael Telatynski
5f03cbd88f Iterate PR some more 2020-11-26 15:45:15 +00:00
Travis Ralston
c2c328e23c Appease the linter 2020-11-26 08:06:48 -07:00
Travis Ralston
b9c57f47b0 Remove example 2020-11-26 08:01:38 -07:00
Michael Telatynski
86025459f4 Remove unused dialog, todo comments and other tiny tweaks 2020-11-26 15:01:12 +00:00
Weblate
7efa8afa79 Merge branch 'origin/develop' into Weblate. 2020-11-26 15:00:18 +00:00
Travis Ralston
6066645207
Merge pull request #5444 from matrix-org/travis/modal-widget-fixes
Fix known issues with modal widgets
2020-11-26 08:00:10 -07:00
Travis Ralston
24f3ecb69a
Merge branch 'develop' into travis/modal-widget-fixes 2020-11-26 08:00:02 -07:00
David Baker
5b7ad079d2 Add SVGs 2020-11-26 14:55:07 +00:00
David Baker
2a02e57a95 Add UI for hold functionality 2020-11-26 14:35:09 +00:00