mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 01:51:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
19875 commits 219 branches 562 tags 474 MiB
Commit graph

19875 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
53edbc743a
Merge pull request #3652 from matrix-org/dbkr/catch_play_failures 
Catch exceptions when we can't play audio
 2019-11-21 17:29:25 +00:00
Travis Ralston
812b0785bf Fix i18n post-merge 2019-11-21 10:22:31 -07:00
Travis Ralston
72f0401589 Merge branch 'develop' into jryans/4s-new-key-backup 2019-11-21 10:22:13 -07:00
Bruno Windels
f75e45a715 reduce margin on e2e icon in room header 2019-11-21 18:17:55 +01:00
Bruno Windels
854f27df3f remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn 2019-11-21 18:16:10 +01:00
Weblate
785f00e6d0 Merge branch 'origin/develop' into Weblate. 2019-11-21 17:14:05 +00:00
Travis Ralston
9d5f3ce32d
Merge pull request #3650 from matrix-org/travis/widget-integration-copy 
Rename section heading for integrations in settings
 2019-11-21 10:13:59 -07:00
Weblate
f532d625f8 Merge branch 'origin/develop' into Weblate. 2019-11-21 17:13:52 +00:00
Travis Ralston
9089744f07
Merge pull request #3651 from matrix-org/travis/widget-encryption-copy 
Update copy for widgets not using message encryption
 2019-11-21 10:13:47 -07:00
Bruno Windels
cb0e6ca5d2 dont make e2e icons themable, as they have multiple colors 2019-11-21 18:13:01 +01:00
Bruno Windels
3cddcad5de use correct icons with borders 2019-11-21 18:12:32 +01:00
David Baker
5d8476185f Catch exceptions when we can't play audio 
...or try to: the chrome debugger still breakpoints, even when we
catch the exception.

Related to, but probably does not fix https://github.com/vector-im/riot-web/issues/7657
 2019-11-21 17:11:17 +00:00
Weblate
8819d5cf0c Merge branch 'origin/develop' into Weblate. 2019-11-21 16:28:10 +00:00
Szimszon
08e08376a2 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1922 of 1922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-11-21 16:28:10 +00:00
David Baker
834e6819d5
Merge pull request #3649 from matrix-org/dbkr/ignore_media_keys 
Ignore media actions
 2019-11-21 16:28:03 +00:00
Travis Ralston
a55e5f7759 Update copy for widgets not using message encryption 
Misc design update
 2019-11-21 09:12:07 -07:00
David Baker
f0fbb20ee5 Detect support for mediaSession 
Firefox doesn't support mediaSession so don't try setting handlers
 2019-11-21 16:11:42 +00:00
Travis Ralston
f7f22444e8 Rename section heading for integrations in settings 
Misc design update
 2019-11-21 09:03:07 -07:00
David Baker
5c6ef10c6b Ignore media actions 
Hopefully the comment explains all

Fixes https://github.com/vector-im/riot-web/issues/11118
 2019-11-21 15:55:30 +00:00
Weblate
41a820acdf Merge branch 'origin/develop' into Weblate. 2019-11-21 15:11:04 +00:00
Travis Ralston
6597e0bd42
Merge pull request #3646 from matrix-org/travis/integration-manager-opt 
Add an option to disable the use of integration managers for provisioning
 2019-11-21 08:10:56 -07:00
Weblate
1e13cbb442 Merge branch 'origin/develop' into Weblate. 2019-11-21 15:10:35 +00:00
Travis Ralston
86783e4439
Merge pull request #3645 from matrix-org/travis/widget-menu 
Move many widget options to a context menu
 2019-11-21 08:10:28 -07:00
Weblate
f3ac2c2a1e Merge branch 'origin/develop' into Weblate. 2019-11-21 15:05:12 +00:00
Edgars Voroboks
598901b483 Translated using Weblate (Latvian) 
Currently translated at 47.8% (918 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
 2019-11-21 15:05:11 +00:00
random
87167f42f8 Translated using Weblate (Italian) 
Currently translated at 99.9% (1917 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-11-21 15:05:11 +00:00
Szimszon
d786017d08 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1919 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-11-21 15:05:10 +00:00
Kévin C
ad941b96e0 Translated using Weblate (French) 
Currently translated at 100.0% (1919 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-11-21 15:05:09 +00:00
Tuomas Hietala
670d44ecd8 Translated using Weblate (Finnish) 
Currently translated at 96.1% (1845 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-11-21 15:05:08 +00:00
Jeff Huang
5670a52469 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1919 of 1919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-11-21 15:05:04 +00:00
Travis Ralston
5d612bb370
Merge pull request #3644 from matrix-org/travis/widget-encryption 
Re-add encryption warning to widget permission prompt
 2019-11-21 08:04:56 -07:00
Bruno Windels
ed024a0b10
Merge pull request #3647 from matrix-org/bwindels/updateciderdocs 
Update CIDER docs now that it is used for main composer as well
 2019-11-21 13:18:11 +00:00
Michael Telatynski
3242e2da72
Merge pull request #3593 from matrix-org/t3chguy/remove_bluebird 
get rid of bluebird
 2019-11-21 11:22:49 +00:00
Michael Telatynski
d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
David Baker
04641a0f87
Merge pull request #3638 from matrix-org/dbkr/dedup_theming_code 
Remove getBaseTheme
 2019-11-21 09:44:37 +00:00
Bruno Windels
8c02893da7
Update CIDER docs now that it is used for main composer as well 2019-11-21 08:58:13 +00:00
Travis Ralston
670c14b2e3 Circumvent the linter 2019-11-20 20:54:21 -07:00
Travis Ralston
a69d818a0d Our linter is seriously picky. 2019-11-20 20:49:41 -07:00
Travis Ralston
560c0afae3 Appease the linter 2019-11-20 20:45:16 -07:00
Travis Ralston
94fed922cf Intercept cases of disabled/no integration managers 
We already intercepted most of the cases where no integration manager was present, though there was a bug in many components where openAll() would be called regardless of an integration manager being available.

The integration manager being disabled by the user is handled in the IntegrationManager classes rather than on click because we have quite a few calls to these functions. The StickerPicker is an exception because it does slightly different behaviour.

This also removes the old "no integration manager configured" state from the IntegrationManager component as it is now replaced by a dialog.
 2019-11-20 20:40:39 -07:00
Travis Ralston
81c9bdd9f3 It's called an "Integration Manager" (singular) 
Fixes https://github.com/vector-im/riot-web/issues/11256

This was finally annoying me enough to fix it.
 2019-11-20 20:14:25 -07:00
Travis Ralston
3391cc0d90 Add the toggle switch for provisioning 2019-11-20 20:05:32 -07:00
Travis Ralston
0a0e952691 Update integration manager copy 2019-11-20 19:53:52 -07:00
Travis Ralston
b0eb54541c Rip out options to change your integration manager 
We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there.
 2019-11-20 19:50:13 -07:00
Travis Ralston
66c51704cc Fix indentation 2019-11-20 19:21:10 -07:00
Travis Ralston
fd12eb28e7 Move many widget options to a context menu 
Part of https://github.com/vector-im/riot-web/issues/11262
 2019-11-20 19:17:42 -07:00
Travis Ralston
f0066ff622
Merge pull request #3643 from bkil/bkil/fix-tooltip-of-nonmember-emojis 
ReactionsRowButtonTooltip: fix null dereference if emoji owner left room
 2019-11-20 18:06:37 -07:00
bkil
a40194194d ReactionsRowButtonTooltip: fix null dereference if emoji owner left room 
Signed-off-by: bkil <b.K.il.h.u+tigbuh@gmail.com>
 2019-11-21 01:50:18 +01:00
Travis Ralston
62a2c7a51a Re-add encryption warning to widget permission prompt 2019-11-20 16:26:06 -07:00
Michael Telatynski
2f084113f6
Merge pull request #3642 from matrix-org/t3chguy/pre_jest 
Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
 2019-11-20 22:43:16 +00:00