Commit graph

9399 commits

Author SHA1 Message Date
Jorik Schellekens
3e21483b82 Try to silence the e2e test
Merge branch 'develop' of github.com:vector-im/riot-web into joriks/font-sclaing-slider
2020-04-23 10:19:45 +01:00
Michael Telatynski
30a9094dc7 fix import in tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:19:06 +01:00
Michael Telatynski
f0011a0183 Merge branches 'develop' and 't3chguy/app_load4' of github.com:vector-im/riot-web into t3chguy/app_load4 2020-04-23 10:12:06 +01:00
Michael Telatynski
6584ff29af mock out scss imports for jest
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 18:58:44 +01:00
Michael Telatynski
918a56d01a don't preload error-view as we expect it to not be shown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 18:49:39 +01:00
Michael Telatynski
5fdf805df2 use scss variables in ErrorView.scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 18:44:52 +01:00
Michael Telatynski
b05e5be2f7 Improve ErrorView to match design
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 18:25:49 +01:00
Travis Ralston
c23b2415e4 Remove encrypted message search feature flag
See https://github.com/matrix-org/matrix-react-sdk/pull/4467
2020-04-22 10:59:47 -06:00
MacLemon
5d39bd69dc Merge branch 'develop' into optimize-image-assets 2020-04-22 18:35:02 +02:00
Nad Chishtie
ac78570b58 Add example error pages 2020-04-22 16:07:24 +01:00
Weblate
882e576fdf Merge branch 'origin/develop' into Weblate. 2020-04-22 14:36:22 +00:00
Travis Ralston
6b1965388e
Merge pull request #13312 from vector-im/travis/docs-settings-fix
Fix `default_federate` settting description
2020-04-22 08:36:17 -06:00
Weblate
e4a964cd0f Merge branch 'origin/develop' into Weblate. 2020-04-22 14:33:56 +00:00
Travis Ralston
f8885cb0a6
Merge pull request #13314 from vector-im/travis/jitsi-docs-improvement
Clarify that the .well-known method for Jitsi isn't available yet
2020-04-22 08:33:50 -06:00
Michael Telatynski
e5a232b0d8 make typescript happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:41:29 +01:00
Michael Telatynski
d486782dd4 convert app.js to app.tsx
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:29:12 +01:00
MacLemon
5a39eafc37 Optimized PNG image assets by recompressing without affecting quality.
SVG assets have not been altered to maintain readability.
2020-04-22 14:04:55 +02:00
Weblate
7971f993cd Merge branch 'origin/develop' into Weblate. 2020-04-22 09:27:30 +00:00
Michael Telatynski
7ffa1ba1bd
Merge pull request #13296 from vector-im/t3chguy/autocomplete
add config option to tsc resolveJsonModule
2020-04-22 10:27:25 +01:00
Weblate
ac0c2d89f0 Merge branch 'origin/develop' into Weblate. 2020-04-22 09:15:31 +00:00
rkfg
cec4330618 Translated using Weblate (Russian)
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2020-04-22 09:15:30 +00:00
Michael Telatynski
9632f296e1
Merge pull request #13297 from vector-im/t3chguy/autocomplete2
Fix dispatcher import to be extension agnostic
2020-04-22 10:15:25 +01:00
Jorik Schellekens
04e4c7804d Add scaling to develop config. 2020-04-22 09:53:13 +01:00
Travis Ralston
601816862f
Clarify that the .well-known method for Jitsi isn't available yet
We should remove this at release time, but if we forget it should be vaguely worded well enough.

People keep assuming it'll just work even though the feature hasn't launched yet. The original theory was that a release was around the corner, but it's since been pushed back several times.
2020-04-21 13:27:05 -06:00
Travis Ralston
25dbeca083
Fix default_federate settting description 2020-04-21 09:27:03 -06:00
Jorik Schellekens
7d74e789ca Fix slight innacuracy. 2020-04-21 15:18:22 +01:00
Jorik Schellekens
abcf0b73c0 Docs on font-scaling 2020-04-21 10:05:05 +01:00
Michael Telatynski
9d5e3d6d9a Fix dispatcher import to be extension agnostic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 10:03:59 +01:00
Jorik Schellekens
201053963d
Strings should be explicit
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-21 10:01:45 +01:00
Michael Telatynski
e00d2b9589 Enable esModuleInterop and iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 10:01:05 +01:00
Weblate
c0827e04df Merge branch 'origin/develop' into Weblate. 2020-04-21 06:32:12 +00:00
Travis Ralston
c16ff9dc11
Merge pull request #13260 from MichaelKohler/issue13089-config-doc
Document more config options in config.md (fixes #13089)
2020-04-21 00:32:07 -06:00
Michael Telatynski
b3a87b56fa tsc resolveJsonModule
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 20:14:33 +01:00
Weblate
5f8a46868e Merge branch 'origin/develop' into Weblate. 2020-04-20 19:13:14 +00:00
Michael Telatynski
3218deff3a
Merge pull request #13295 from vector-im/t3chguy/fix_tests
Fix tests post-js-sdk-filters change
2020-04-20 20:13:09 +01:00
Michael Telatynski
1314a8d3f9 undo unrelated change.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 20:06:34 +01:00
Michael Telatynski
afabf9d4b1 Fix tests post-js-sdk-filters change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 19:47:16 +01:00
Weblate
cd62967cae Merge branch 'origin/develop' into Weblate. 2020-04-20 17:16:17 +00:00
Travis Ralston
22b1231e9a
Merge pull request #13227 from vector-im/travis/inline-jitsi-script
Make Jitsi download script a JS script
2020-04-20 11:16:12 -06:00
Travis Ralston
4c4f67653e Merge branch 'develop' into travis/inline-jitsi-script 2020-04-20 10:11:55 -06:00
Travis Ralston
3eadf35819 Manually undo emojibase changes in lockfile 2020-04-20 09:49:09 -06:00
Travis Ralston
3f14b31e47 Add more words to explain windows being awful 2020-04-20 09:46:52 -06:00
Weblate
0d456fc0ff Merge branch 'origin/develop' into Weblate. 2020-04-20 15:00:33 +00:00
Michael Telatynski
fd343b069e
Merge pull request #13271 from vector-im/t3chguy/cmd_rageshake
Use matrix-react-sdk type extensions as a base
2020-04-20 16:00:27 +01:00
Michael Telatynski
982074c12e Use matrix-react-sdk type extensions as a base
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:10:17 +01:00
Michael Kohler
752b6b63ec Document more config options in config.md (fixes #13089)
Signed-off-by: Michael Kohler <me@michaelkohler.info>
2020-04-19 11:44:58 +02:00
Karol Kosek
e68770b4a7 Translated using Weblate (Polish)
Currently translated at 89.3% (25 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2020-04-18 22:27:54 +00:00
Weblate
75ac6b07cc Merge branch 'origin/develop' into Weblate. 2020-04-17 20:41:36 +00:00
aWeinzierl
68f9019570 Translated using Weblate (German)
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-04-17 20:41:36 +00:00
alexsal86
f1302f0261 Translated using Weblate (German)
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-04-17 20:41:36 +00:00