mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-28 05:29:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
16121 commits 208 branches 547 tags 609 MiB
Commit graph

16121 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot
512c9b2ac8 Merge branch 'master' into develop 2019-05-31 11:26:49 +01:00
RiotRobot
21c8a64ce1 v1.2.1 2019-05-31 11:26:02 +01:00
RiotRobot
667232ded7 Prepare changelog for v1.2.1 2019-05-31 11:26:02 +01:00
J. Ryan Stinnett
cbcdd6bffb
Merge pull request #3045 from matrix-org/jryans/emoji-height-release 
Native emoji require extra line-height
 2019-05-31 11:18:12 +01:00
J. Ryan Stinnett
8e7933138f Native emoji require extra line-height 
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
 2019-05-31 11:11:22 +01:00
RiotRobot
2a41471df3 Upgrade to JS SDK 2.0.0 which fixes an error during key backup 2019-05-31 11:06:06 +01:00
Will Hunt
9369e964fa Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-31 10:44:30 +01:00
Weblate
76a8265415 Merge branch 'origin/develop' into Weblate. 2019-05-31 09:21:48 +00:00
Bruno Windels
2d8c523642
Merge pull request #3040 from matrix-org/bwindels/editor-remaining-md 
Fix: better HTML > MD conversion for editing, including lists and quotes
 2019-05-31 09:21:43 +00:00
Weblate
9de96b381a Merge branch 'origin/develop' into Weblate. 2019-05-31 09:17:31 +00:00
Szimszon
b9785ca025 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1634 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-05-31 09:17:31 +00:00
J. Ryan Stinnett
5593b499d9
Merge pull request #3044 from matrix-org/jryans/line-height-native-emoji 
Native emoji require extra line-height
 2019-05-31 10:17:26 +01:00
Bruno Windels
78fbea307c less escaping for backticks 2019-05-31 11:06:15 +02:00
Weblate
b3aa3f685f Merge branch 'origin/develop' into Weblate. 2019-05-31 08:57:09 +00:00
J. Ryan Stinnett
6ab136bd9a
Merge pull request #2598 from matrix-org/matthew/low_bandwidth 
port over low_bandwidth mode to develop
 2019-05-31 09:57:04 +01:00
Weblate
04655d3309 Merge branch 'origin/develop' into Weblate. 2019-05-31 08:44:12 +00:00
Karol Kosek
0fdcbbaa4f Translated using Weblate (Polish) 
Currently translated at 73.9% (1207 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-05-31 08:44:12 +00:00
Tirifto
da6a7d1048 Translated using Weblate (Esperanto) 
Currently translated at 81.6% (1332 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-05-31 08:44:11 +00:00
Nathan Follens
04252737b8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1633 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-05-31 08:44:11 +00:00
Jeff Huang
a3a75a9a7f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1633 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-05-31 08:44:11 +00:00
Bruno Windels
eb8dd52437
Merge pull request #3029 from matrix-org/bwindels/pill-n-newlines 
Fix: maintain caret at current line when position is on newline part
 2019-05-31 08:44:02 +00:00
Travis Ralston
af86cdfe9a Disable avatars in desktop notifs when in LB mode 2019-05-30 20:02:25 -06:00
Travis Ralston
a935e26ee3 Add flag to config to always show labs settings 2019-05-30 19:57:37 -06:00
Travis Ralston
0d47222132 Add LB setting to new user settings 
Put under labs out of concern for https://github.com/vector-im/riot-meta/issues/66
 2019-05-30 19:57:17 -06:00
Travis Ralston
d81804e0fe Merge branch 'develop' into matthew/low_bandwidth 2019-05-30 19:42:09 -06:00
J. A. Durieux
e6850ccfc3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1633 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-05-30 21:08:15 +00:00
Weblate
4589493167 Merge branch 'origin/develop' into Weblate. 2019-05-30 10:01:16 +00:00
IevgenVovk
bc13aff5fe Translated using Weblate (Ukrainian) 
Currently translated at 31.3% (511 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2019-05-30 10:01:16 +00:00
Walter
aaa75479b0 Translated using Weblate (German) 
Currently translated at 88.0% (1438 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-05-30 10:01:16 +00:00
Stanislav Lukeš
0418aee922 Translated using Weblate (Czech) 
Currently translated at 99.9% (1633 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2019-05-30 10:01:15 +00:00
J. Ryan Stinnett
7d4d09e8ac
Merge pull request #3042 from matrix-org/jryans/username-on-hs 
Remove username on HS input label
 2019-05-30 11:01:04 +01:00
J. Ryan Stinnett
2be00ee0e0 Native emoji require extra line-height 
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
 2019-05-30 10:26:12 +01:00
Travis Ralston
5c85f4609e Accept JSX into the GenericErrorPage and expose local session vars 2019-05-29 12:09:04 -06:00
J. Ryan Stinnett
1e3e9f4f87 Remove username on HS input label 
Removes redundant HS name on the username input that duplicates the header above
it.

Fixes https://github.com/vector-im/riot-web/issues/9884
 2019-05-29 17:48:16 +01:00
Weblate
9a71fe73bf Merge branch 'origin/develop' into Weblate. 2019-05-29 15:03:58 +00:00
Walter
35ea9fd8f4 Translated using Weblate (Russian) 
Currently translated at 90.3% (1475 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-05-29 15:03:58 +00:00
RiotRobot
76cd829ac9 Merge branch 'master' into develop 2019-05-29 16:03:17 +01:00
RiotRobot
6d383bea1f v1.2.0 2019-05-29 16:02:26 +01:00
RiotRobot
5e156f12b8 Prepare changelog for v1.2.0 2019-05-29 16:02:25 +01:00
RiotRobot
3f1bb494e2 Upgrade JS SDK to 1.2.0 2019-05-29 15:58:17 +01:00
J. Ryan Stinnett
1216e5d586
Merge pull request #3041 from matrix-org/jryans/colr-fixes-release 
COLR font check fixes for release
 2019-05-29 15:24:48 +01:00
Bruno Windels
aeaa4c0848 always log on return false 2019-05-29 15:13:20 +01:00
Bruno Windels
22efb31781 exclude chrome in ua from safari version check for colr support 2019-05-29 15:13:20 +01:00
Bruno Windels
729806b9b4 fix lint & make regex more robust 2019-05-29 15:13:20 +01:00
Bruno Windels
f2a649e611 Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 15:13:20 +01:00
Bruno Windels
2fb451c43f Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 15:13:20 +01:00
Bruno Windels
a295d7bada Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 15:13:20 +01:00
Bruno Windels
ced55552da make sure the check doesn't blow up 2019-05-29 15:13:20 +01:00
Bruno Windels
43f642a8fe sniff safari 12, macos 10.14 to support COLR, as safari doesn't wait for the font to load to emit load 2019-05-29 15:13:20 +01:00
Bruno Windels
85b0107f6c fix COLR font check being racy 
also make sure it doesn't run more than once.
keeping the FF sniffing because missing "extract canvas data" permissions
would still break the check.
 2019-05-29 15:13:20 +01:00