mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 17:56:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
30283 commits 203 branches 553 tags 406 MiB
Commit graph

30283 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Robinson
bb53ae8038 Rename Element Pro -> Host Signup 2021-01-04 16:05:49 +02:00
Jason Robinson
6286c23aa5 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-04 15:46:28 +02:00
Michael Telatynski
461b569278
Merge pull request #5524 from SimonBrandner/fix-15988 
Fix #15988
 2020-12-29 13:09:11 +00:00
Jason Robinson
6843737a33 Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-12-28 11:22:05 +02:00
Jason Robinson
7a358b1ca3 Rename components to be less EMS specific 2020-12-28 11:21:42 +02:00
Šimon Brandner
65af77e546 i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-24 08:01:35 +01:00
Šimon Brandner
65285fd55e Fix 15988 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-24 08:00:23 +01:00
Travis Ralston
777c0ca1ef
Merge pull request #5520 from matrix-org/dependabot/npm_and_yarn/node-notifier-8.0.1 
Bump node-notifier from 8.0.0 to 8.0.1
 2020-12-22 08:45:36 -07:00
J. Ryan Stinnett
7c7ed7a2e4
Merge pull request #5503 from matrix-org/jryans/prepublish-only 
Use TypeScript source for development, swap to build during release
 2020-12-22 13:48:22 +00:00
RiotRobot
c4f7269321 Reset matrix-js-sdk back to develop branch 2020-12-21 17:52:30 +00:00
RiotRobot
8e6f8b11df Merge branch 'master' into develop 2020-12-21 17:51:09 +00:00
RiotRobot
5fd39954a1 v3.11.1 2020-12-21 17:37:29 +00:00
RiotRobot
cc0bef7f8d Upgrade matrix-js-sdk to 9.4.1 2020-12-21 17:36:46 +00:00
RiotRobot
ec274196c4 Prepare changlog for v3.11.1 2020-12-21 17:32:49 +00:00
dependabot[bot]
9af2138171
Bump node-notifier from 8.0.0 to 8.0.1 
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-21 17:19:21 +00:00
RiotRobot
e551e7ac40 Reset matrix-js-sdk back to develop branch 2020-12-21 17:08:51 +00:00
RiotRobot
55fd463a9d Merge branch 'master' into develop 2020-12-21 17:07:52 +00:00
RiotRobot
d23d0b2b42 v3.11.0 2020-12-21 17:06:40 +00:00
RiotRobot
74c33cabca Prepare changelog for v3.11.0 2020-12-21 17:06:40 +00:00
RiotRobot
78e6fb9121 Upgrade matrix-js-sdk to 9.4.0 2020-12-21 17:00:39 +00:00
J. Ryan Stinnett
f806443b7d
Merge pull request #5519 from matrix-org/jryans/big-emoji-html-release 
[Release] Look for emoji in the body that will be displayed
 2020-12-21 16:26:45 +00:00
J. Ryan Stinnett
ee56560e33
Merge pull request #5517 from matrix-org/jryans/big-emoji-html 
Look for emoji in the body that will be displayed
 2020-12-21 16:07:58 +00:00
J. Ryan Stinnett
3e7803d723
Merge pull request #5516 from matrix-org/jryans/element-url-patterns-release 
[Release] Recognise `*.element.io` links as Element permalinks
 2020-12-21 16:07:39 +00:00
J. Ryan Stinnett
3907826cd6 Look for emoji in the body that will be displayed 
Fixes https://github.com/vector-im/element-web/issues/16013
 2020-12-21 16:02:38 +00:00
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
Jason Robinson
129795c2ec Add allow-same-origin to Element Pro dialog 
Seems to be required after all.
 2020-12-21 17:20:51 +02: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
93e24fae7a 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 14:54:04 +00:00
J. Ryan Stinnett
71cbc8bf29 Rename and reformat Element URL pattern 
This is just a code style cleanup. There are no behaviour changes in this
commit.
 2020-12-21 14:54:04 +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
e14050a19f
Merge pull request #5513 from matrix-org/dbkr/call_ui_fixups_rel 
[Release] Fixes for call UI
 2020-12-21 11:37:30 +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
d851c826e5 Probably better to just remove this 2020-12-21 11:26:50 +00:00
David Baker
0d4b2f48dc Probably better to just remove this 2020-12-21 11:25:04 +00:00
David Baker
189d5bf769
Comment typo 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2020-12-21 11:21:50 +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
f325df3b6a Remove secondary call avatar 
and change 'paused' to 'on hold'
 2020-12-21 11:12:24 +00:00
David Baker
7cc00faeb3 Vary resume link text 
Use 'Switch' if unholding that call would hold another
 2020-12-21 11:12:13 +00:00
David Baker
f63572f02b 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-21 11:11:27 +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
f364c852fd
Merge pull request #5512 from matrix-org/travis/release/the/snow 
[RELEASE] Add a snowfall chat effect (with /snowfall command)
 2020-12-21 10:22:10 +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
a0d925b879 Add a snowfall chat effect (with /snowfall command) 2020-12-21 00:18:32 -07:00
Travis Ralston
9263bf7cda Add a snowfall chat effect (with /snowfall command) 2020-12-21 00:13:55 -07:00
Travis Ralston
5c309042e6 fix i18n order 2020-12-18 18:46:59 -07:00
Travis Ralston
ce638e717d Run the effect to completion rather than chopping it off 2020-12-18 18:46:35 -07:00
Travis Ralston
4fea266003 Use the same requestAnimationFrame as confetti 2020-12-18 18:46:32 -07:00