PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
15819 commits 1 branch 0 tags 338 MiB
Commit graph

15819 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Travis Ralston
d17ea516cc Minus one log 2019-05-29 15:13:20 +01:00
Travis Ralston
fc1ac53ef3 Add some logging for COLR checks 2019-05-29 15:13:20 +01:00
Bruno Windels
686045b46a rewrite HTML>MD conversion,handle (nested) block elements&quotes better 
Re-use walkDOMDepthFirst we already had for turning the editor into
a string, which also allows us to detect when leaving a node better,
which is needed to decide how block elements create newline parts
is more centralized and robust manner, more in line with
how html works (consecutive block elements break the line)
instead of hacky special casing from before.

Also, to support every line of MD generated
within a BLOCKQUOTE, the parts an element creates are returned
and then centrally prepended with "> ", instead of passing in
the parts array and doing it in every parse... function.
 2019-05-29 14:46:15 +02:00
Bruno Windels
b0d87e7e47 allow enterNodeCallback to decide whether to decend into a node 2019-05-29 14:27:36 +02:00
Weblate
de41c14bf8 Merge branch 'origin/develop' into Weblate. 2019-05-29 11:57:01 +00:00
Bruno Windels
d34d5f1660
Merge pull request #3038 from matrix-org/bwindels/colr-check-race2 
Exclude chrome in ua from safari version check for colr support
 2019-05-29 11:56:57 +00:00
J. Ryan Stinnett
7cb90db4e9
Merge pull request #3036 from matrix-org/jryans/revert-3019-release 
Revert "Make the timeline less noisy for screen readers (mk II) #3019" for release
 2019-05-29 12:31:36 +01:00
Bruno Windels
3793361240 always log on return false 2019-05-29 13:24:46 +02:00
Bruno Windels
26a5bb0dcb exclude chrome in ua from safari version check for colr support 2019-05-29 13:05:59 +02:00
Weblate
c3b4d9bdf5 Merge branch 'origin/develop' into Weblate. 2019-05-29 10:25:51 +00:00
Bruno Windels
f61e771f7a
Merge pull request #3034 from matrix-org/bwindels/colr-check-race 
fix COLR font check being racy
 2019-05-29 10:25:47 +00:00
J. Ryan Stinnett
86cd70b7da
Merge pull request #3037 from matrix-org/jryans/decrypt-font-release 
Override font for usercontent download link for release
 2019-05-29 11:21:27 +01:00
Bruno Windels
3014180762 fix lint & make regex more robust 2019-05-29 12:17:15 +02:00
Bruno Windels
18697d8ee7
Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 10:10:18 +00:00
Bruno Windels
50f477dcd0
Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 10:09:10 +00:00
Bruno Windels
66738e2284
Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 10:08:59 +00:00
Bruno Windels
5c8e280a45 make sure the check doesn't blow up 2019-05-29 12:03:38 +02:00
Bruno Windels
ba54b16275 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 11:59:50 +02:00
Bruno Windels
61ace4baef override font for usercontent download link 2019-05-29 10:47:22 +01:00
Weblate
9da16d39d2 Merge branch 'origin/develop' into Weblate. 2019-05-29 09:46:01 +00:00
J. Ryan Stinnett
84dc2f8429
Merge pull request #3035 from matrix-org/bwindels/decrypted-filesize-font 
override font for usercontent download link
 2019-05-29 10:45:56 +01:00
J. Ryan Stinnett
5f38eef7b9 Revert "Merge pull request #3019 from matrix-org/travis/sr/fix-timeline" 
This reverts commit 9a1a9825b0, reversing
changes made to 62dc83310a.
 2019-05-29 10:38:17 +01:00
Bruno Windels
a5eca6cf79 override font for usercontent download link 2019-05-29 11:02:38 +02:00
Bruno Windels
cf704fd2f1 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 10:11:14 +02:00
Weblate
48a6469a0b Merge branch 'origin/develop' into Weblate. 2019-05-28 17:27:00 +00:00
Kévin C
fed3661da4 Translated using Weblate (French) 
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/fr/
 2019-05-28 17:26:59 +00:00
Nathan Follens
ee1e24e7e8 Translated using Weblate (Dutch) 
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/nl/
 2019-05-28 17:26:59 +00:00
J. Ryan Stinnett
9914bac24d
Merge pull request #3033 from matrix-org/jryans/revert-3019 
Revert "Make the timeline less noisy for screen readers (mk II) #3019"
 2019-05-28 18:26:51 +01:00
J. Ryan Stinnett
f0d67e0454 Revert "Merge pull request #3019 from matrix-org/travis/sr/fix-timeline" 
This reverts commit 9a1a9825b0, reversing
changes made to 62dc83310a.
 2019-05-28 12:22:22 +01:00
Weblate
71d5a138bb Merge branch 'origin/develop' into Weblate. 2019-05-28 09:17:33 +00:00