Skip to content

Commit 1d43870

Browse files
author
Weblate
committed
Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts: src/i18n/strings/da.json src/i18n/strings/eo.json src/i18n/strings/fr.json src/i18n/strings/hu.json src/i18n/strings/ja.json src/i18n/strings/nl.json src/i18n/strings/pl.json src/i18n/strings/sk.json src/i18n/strings/zh_Hans.json
2 parents 33920d7 + ddc20e2 commit 1d43870

File tree

725 files changed

+127
-27423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

725 files changed

+127
-27423
lines changed

karma.conf.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,19 @@ module.exports = function (config) {
7070
// This isn't required by any of the tests, but it stops karma
7171
// logging warnings when it serves a 404 for them.
7272
{
73-
pattern: 'src/skins/vector/img/*',
73+
pattern: 'node_modules/matrix-react-sdk/res/img/*',
74+
watched: false, included: false, served: true, nocache: false,
75+
},
76+
{
77+
pattern: 'res/themes/**',
7478
watched: false, included: false, served: true, nocache: false,
7579
},
7680
],
7781

7882
proxies: {
7983
// redirect img links to the karma server. See above.
80-
"/img/": "/base/src/skins/vector/img/",
84+
"/img/": "/base/node_modules/matrix-react-sdk/res/img/",
85+
"/themes/": "/base/res/themes/",
8186
},
8287

8388
// preprocess matching files before serving them to the browser

package.json

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,30 +58,17 @@
5858
"babel-runtime": "^6.11.6",
5959
"bluebird": "^3.5.0",
6060
"browser-request": "^0.3.3",
61-
"classnames": "^2.1.2",
62-
"draft-js": "^0.11.0-alpha",
6361
"extract-text-webpack-plugin": "^0.9.1",
6462
"favico.js": "^0.3.10",
65-
"filesize": "3.5.6",
66-
"flux": "2.1.1",
67-
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
68-
"gfm.css": "^1.1.1",
69-
"highlight.js": "^9.0.0",
70-
"linkifyjs": "^2.1.3",
7163
"matrix-js-sdk": "0.10.1",
7264
"matrix-react-sdk": "0.12.2",
7365
"modernizr": "^3.1.0",
74-
"pako": "^1.0.5",
7566
"prop-types": "^15.5.10",
7667
"react": "^15.6.0",
77-
"react-beautiful-dnd": "^4.0.1",
7868
"react-dom": "^15.6.0",
79-
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
8069
"sanitize-html": "^1.11.1",
81-
"text-encoding-utf-8": "^1.0.1",
8270
"ua-parser-js": "^0.7.10",
83-
"url": "^0.11.0",
84-
"velocity-vector": "vector-im/velocity#059e3b2"
71+
"url": "^0.11.0"
8572
},
8673
"devDependencies": {
8774
"autoprefixer": "^6.6.0",

res/flags/AD.png

-2.52 KB
Binary file not shown.

res/flags/AE.png

-1015 Bytes
Binary file not shown.

res/flags/AF.png

-2.52 KB
Binary file not shown.

res/flags/AG.png

-4.13 KB
Binary file not shown.

res/flags/AI.png

-4.65 KB
Binary file not shown.

res/flags/AL.png

-3.02 KB
Binary file not shown.

res/flags/AM.png

-654 Bytes
Binary file not shown.

res/flags/AO.png

-2.39 KB
Binary file not shown.

0 commit comments

Comments
 (0)