Commit graph

30191 commits

Author SHA1 Message Date
J. Ryan Stinnett
44c705e41c Look for emoji in the body that will be displayed
Fixes https://github.com/vector-im/element-web/issues/16013
2020-12-21 15:24:59 +00:00
J. Ryan Stinnett
b510399f31
Merge pull request #5486 from matrix-org/dependabot/npm_and_yarn/ini-1.3.7
Bump ini from 1.3.5 to 1.3.7
2020-12-21 14:54:49 +00:00
J. Ryan Stinnett
62d1345790
Merge pull request #5514 from matrix-org/jryans/element-url-patterns
Recognise `*.element.io` links as Element permalinks
2020-12-21 14:49:58 +00:00
J. Ryan Stinnett
5d78418530 Recognise *.element.io links as Element permalinks
This ensures all Elements detect permalinks to official deployments as Element
and handle them internally.

Fixes https://github.com/vector-im/element-web/issues/16005
2020-12-21 13:15:00 +00:00
J. Ryan Stinnett
162a5de82e Rename and reformat Element URL pattern
This is just a code style cleanup. There are no behaviour changes in this
commit.
2020-12-21 13:05:45 +00:00
David Baker
a126c2eadc
Merge pull request #5509 from matrix-org/dbkr/call_ui_fixups
Fixes for call UI
2020-12-21 11:36:17 +00:00
David Baker
0d4b2f48dc Probably better to just remove this 2020-12-21 11:25:04 +00:00
David Baker
68c5482c05
Comment typo
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-12-21 11:21:41 +00:00
David Baker
12474bb434 Merge remote-tracking branch 'origin/develop' into dbkr/call_ui_fixups 2020-12-21 11:10:31 +00:00
J. Ryan Stinnett
60be1bfc0a
Merge pull request #5511 from matrix-org/travis/snow
Add a snowfall chat effect (with /snowfall command)
2020-12-21 10:19:39 +00:00
Travis Ralston
d53ee58b18 Appease the linter 2020-12-21 00:18:58 -07:00
Travis Ralston
9263bf7cda Add a snowfall chat effect (with /snowfall command) 2020-12-21 00:13:55 -07:00
Travis Ralston
fa02630c4e Merge branch 'travis/upstream/fireworks' into develop 2020-12-18 18:41:47 -07:00
Travis Ralston
1f95acc739 Run the effect to completion rather than chopping it off 2020-12-18 18:41:01 -07:00
Travis Ralston
b2825e8718 Use the same requestAnimationFrame as confetti 2020-12-18 18:40:30 -07:00
Travis Ralston
4ba89cc437 Lower effect time by 1 second
It feels like it runs a bit too long
2020-12-18 18:40:11 -07:00
Travis Ralston
77ce8a9e39 Fix minor lint problems 2020-12-18 18:39:16 -07:00
Travis Ralston
82b782cdb9 Merge branch 'develop' into travis/upstream/fireworks 2020-12-18 18:30:54 -07:00
David Baker
aee861956c Remove secondary call avatar
and change 'paused' to 'on hold'
2020-12-18 19:40:57 +00:00
David Baker
eab764a3c8 Vary resume link text
Use 'Switch' if unholding that call would hold another
2020-12-18 19:35:41 +00:00
David Baker
63e99ecf93 Visual fixups for call UI
* Add bottom margin on PiP view
 * Remove avatar blurring & pause icon for held calls
 * Change background of incoming call box to match PiP view
 * Put drop shadow & border radius on PiP view & incoming call box
   rather than the CallContainer they're in (so they each have their own
   drop shadow / rounded corners).
 * Add margin between incoming call box and PiP view
2020-12-18 18:08:04 +00:00
David Baker
3037aac59a
Merge pull request #5506 from matrix-org/dbkr/silent_call_end_for_non_started_calls
Don't play call end sound for calls that never started
2020-12-18 17:24:22 +00:00
Travis Ralston
d3be7b79df
Merge pull request #5485 from madonius/feature/tableflip-slashcommand
Add /tableflip slash command
2020-12-18 09:14:03 -07:00
nurjin jafar
ebe02ecf04
Merge branch 'develop' into nic/feat/PB-404-fireworks-effect 2020-12-18 16:15:14 +01:00
nurjinn jafar
3d1327ecec removed unnecessary opacity 2020-12-18 15:32:44 +01:00
nurjinn jafar
2305811271 changed canvas globalCompositeOperation value and removed probability 2020-12-18 15:30:50 +01:00
nurjinn jafar
88d3de710a comments added 2020-12-18 14:51:58 +01:00
David Baker
453575d70a Don't play call end sound for calls that never started 2020-12-18 13:46:58 +00:00
Emmanouil Kampitakis
2488a8f1ee Add string-translation for english
Signed-off-by: Emmanouil Kampitakis <info+github@kampitakis.de>
2020-12-18 12:19:37 +01:00
Emmanouil Kampitakis
f4d3668214 Add the unflip slashcommand
Signed-off-by: Emmanouil Kampitakis <info+github@kampitakis.de>
2020-12-18 12:19:37 +01:00
Emmanouil Kampitakis
98a1b7a2d8 Add the tableflip slashcommand
Signed-off-by: Emmanouil Kampitakis <info+github@kampitakis.de>
2020-12-18 12:19:37 +01:00
J. Ryan Stinnett
6726b731e4
Merge pull request #5504 from matrix-org/jryans/call-lib-src
Import from src in IncomingCallBox.tsx
2020-12-17 18:52:49 +00:00
J. Ryan Stinnett
8350b4152b Import from src in IncomingCallBox.tsx 2020-12-17 17:16:00 +00:00
nurjinn jafar
380b729692 fireworks effect added 2020-12-17 16:57:59 +01:00
Michael Telatynski
7bd2f2c6ba
Merge pull request #5499 from matrix-org/t3chguy/msc2858.1
Social Login support both https and mxc icons
2020-12-17 12:31:33 +00:00
Michael Telatynski
37e3c2a23a
Merge pull request #5501 from matrix-org/t3chguy/fix/15936
Fix padding in confirmation email registration prompt
2020-12-17 12:05:37 +00:00
Michael Telatynski
2567fcd045 add brackets for operator precedence 2020-12-17 12:02:16 +00:00
Michael Telatynski
762519a44f
Merge pull request #5500 from matrix-org/t3chguy/fix/15938
Fix room list help prompt alignment
2020-12-17 11:31:45 +00:00
Michael Telatynski
c498609f79 Fix padding in confirmation email registration prompt 2020-12-17 10:47:03 +00:00
Michael Telatynski
f2214c0367 Fix room list help prompt alignment 2020-12-17 10:43:53 +00:00
Michael Telatynski
1b2cfa5f05 Social Login support both https and mxc icons 2020-12-17 10:34:49 +00:00
J. Ryan Stinnett
1b6ace8cce
Merge pull request #5497 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2020-12-16 11:44:03 +00:00
waclaw66
66b682fa99 Translated using Weblate (Czech)
Currently translated at 95.0% (2577 of 2711 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2020-12-16 11:42:54 +00:00
Weblate
99d15b35c6 Merge branch 'origin/develop' into Weblate. 2020-12-16 11:16:35 +00:00
David Baker
c03854729c
Merge pull request #5495 from matrix-org/dbkr/callhandler_unregister_dispatcher
Unregister from the dispatcher in CallHandler
2020-12-16 11:16:27 +00:00
David Baker
ff84699028 Merge remote-tracking branch 'origin/develop' into dbkr/callhandler_unregister_dispatcher 2020-12-16 11:03:47 +00:00
Weblate
f91ce75de8 Merge branch 'origin/develop' into Weblate. 2020-12-16 10:59:12 +00:00
Mitja Sorsa
6878e23cb8 Translated using Weblate (Finnish)
Currently translated at 91.9% (2493 of 2711 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fi/
2020-12-16 10:59:11 +00:00
Michael Telatynski
3940eab165
Merge pull request #5496 from matrix-org/t3chguy/msc2858
Better adhere to MSC process
2020-12-16 10:58:56 +00:00
David Baker
973a0b7b8a set dispatcher ref to null so we don't double-unregister 2020-12-16 10:53:59 +00:00