Merge remote-tracking branch 'origin/develop' into develop
|
@ -11,6 +11,7 @@
|
||||||
"matrix.org"
|
"matrix.org"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"welcomeUserId": "@riot-bot:matrix.org",
|
||||||
"piwik": {
|
"piwik": {
|
||||||
"url": "https://piwik.riot.im/",
|
"url": "https://piwik.riot.im/",
|
||||||
"siteId": 1
|
"siteId": 1
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
"start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
|
"start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
|
||||||
"lint": "eslint src/",
|
"lint": "eslint src/",
|
||||||
"lintall": "eslint src/ test/",
|
"lintall": "eslint src/ test/",
|
||||||
"clean": "rimraf lib webapp electron/dist",
|
"clean": "rimraf lib webapp electron_app/dist",
|
||||||
"prepublish": "npm run build:compile",
|
"prepublish": "npm run build:compile",
|
||||||
"test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
|
"test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
|
||||||
"test-multi": "karma start"
|
"test-multi": "karma start"
|
||||||
|
@ -77,7 +77,8 @@
|
||||||
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
|
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
|
||||||
"sanitize-html": "^1.11.1",
|
"sanitize-html": "^1.11.1",
|
||||||
"ua-parser-js": "^0.7.10",
|
"ua-parser-js": "^0.7.10",
|
||||||
"url": "^0.11.0"
|
"url": "^0.11.0",
|
||||||
|
"velocity-vector": "vector-im/velocity#059e3b2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"autoprefixer": "^6.6.0",
|
"autoprefixer": "^6.6.0",
|
||||||
|
|
BIN
res/flags/AD.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.5 KiB |
BIN
res/flags/AE.png
Before Width: | Height: | Size: 841 B After Width: | Height: | Size: 1015 B |
BIN
res/flags/AF.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.5 KiB |
BIN
res/flags/AG.png
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 4.1 KiB |
BIN
res/flags/AI.png
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 4.7 KiB |
BIN
res/flags/AL.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.0 KiB |
BIN
res/flags/AM.png
Before Width: | Height: | Size: 744 B After Width: | Height: | Size: 654 B |
BIN
res/flags/AO.png
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 2.4 KiB |
BIN
res/flags/AQ.png
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 3.8 KiB |
BIN
res/flags/AR.png
Before Width: | Height: | Size: 955 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/AS.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.9 KiB |
BIN
res/flags/AT.png
Before Width: | Height: | Size: 701 B After Width: | Height: | Size: 655 B |
BIN
res/flags/AU.png
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 5.1 KiB |
BIN
res/flags/AW.png
Before Width: | Height: | Size: 938 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/AX.png
Before Width: | Height: | Size: 900 B After Width: | Height: | Size: 1.8 KiB |
BIN
res/flags/AZ.png
Before Width: | Height: | Size: 978 B After Width: | Height: | Size: 1.7 KiB |
BIN
res/flags/BA.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.0 KiB |
BIN
res/flags/BB.png
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 2.0 KiB |
BIN
res/flags/BD.png
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.8 KiB |
BIN
res/flags/BE.png
Before Width: | Height: | Size: 689 B After Width: | Height: | Size: 558 B |
BIN
res/flags/BF.png
Before Width: | Height: | Size: 954 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/BG.png
Before Width: | Height: | Size: 737 B After Width: | Height: | Size: 659 B |
BIN
res/flags/BH.png
Before Width: | Height: | Size: 842 B After Width: | Height: | Size: 1.3 KiB |
BIN
res/flags/BI.png
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 5.5 KiB |
BIN
res/flags/BJ.png
Before Width: | Height: | Size: 777 B After Width: | Height: | Size: 811 B |
BIN
res/flags/BL.png
Before Width: | Height: | Size: 692 B After Width: | Height: | Size: 566 B |
BIN
res/flags/BM.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 5.2 KiB |
BIN
res/flags/BN.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 5.2 KiB |
BIN
res/flags/BO.png
Before Width: | Height: | Size: 733 B After Width: | Height: | Size: 668 B |
BIN
res/flags/BQ.png
Before Width: | Height: | Size: 726 B After Width: | Height: | Size: 672 B |
BIN
res/flags/BR.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 4.7 KiB |
BIN
res/flags/BS.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.2 KiB |
BIN
res/flags/BT.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 4.8 KiB |
BIN
res/flags/BV.png
Before Width: | Height: | Size: 866 B After Width: | Height: | Size: 1.7 KiB |
BIN
res/flags/BW.png
Before Width: | Height: | Size: 697 B After Width: | Height: | Size: 669 B |
BIN
res/flags/BY.png
Before Width: | Height: | Size: 950 B After Width: | Height: | Size: 2.0 KiB |
BIN
res/flags/BZ.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 5.2 KiB |
BIN
res/flags/CA.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.2 KiB |
BIN
res/flags/CC.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.6 KiB |
BIN
res/flags/CD.png
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 3.6 KiB |
BIN
res/flags/CF.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.6 KiB |
BIN
res/flags/CG.png
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
res/flags/CH.png
Before Width: | Height: | Size: 800 B After Width: | Height: | Size: 1.5 KiB |
BIN
res/flags/CI.png
Before Width: | Height: | Size: 692 B After Width: | Height: | Size: 568 B |
BIN
res/flags/CK.png
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 5.9 KiB |
BIN
res/flags/CL.png
Before Width: | Height: | Size: 964 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/CM.png
Before Width: | Height: | Size: 908 B After Width: | Height: | Size: 1.4 KiB |
BIN
res/flags/CN.png
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 2.2 KiB |
BIN
res/flags/CO.png
Before Width: | Height: | Size: 726 B After Width: | Height: | Size: 668 B |
BIN
res/flags/CR.png
Before Width: | Height: | Size: 734 B After Width: | Height: | Size: 785 B |
BIN
res/flags/CU.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.0 KiB |
BIN
res/flags/CV.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.6 KiB |
BIN
res/flags/CW.png
Before Width: | Height: | Size: 970 B After Width: | Height: | Size: 1.7 KiB |
BIN
res/flags/CX.png
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 5.0 KiB |
BIN
res/flags/CY.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.5 KiB |
BIN
res/flags/CZ.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.7 KiB |
BIN
res/flags/DE.png
Before Width: | Height: | Size: 734 B After Width: | Height: | Size: 568 B |
BIN
res/flags/DJ.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.5 KiB |
BIN
res/flags/DK.png
Before Width: | Height: | Size: 797 B After Width: | Height: | Size: 1.2 KiB |
BIN
res/flags/DM.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.6 KiB |
BIN
res/flags/DO.png
Before Width: | Height: | Size: 946 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/DZ.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.4 KiB |
BIN
res/flags/EC.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.8 KiB |
BIN
res/flags/EE.png
Before Width: | Height: | Size: 723 B After Width: | Height: | Size: 641 B |
BIN
res/flags/EG.png
Before Width: | Height: | Size: 914 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/EH.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.6 KiB |
BIN
res/flags/ER.png
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 4.0 KiB |
BIN
res/flags/ES.png
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 2.1 KiB |
BIN
res/flags/ET.png
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 3.4 KiB |
BIN
res/flags/FI.png
Before Width: | Height: | Size: 841 B After Width: | Height: | Size: 1.5 KiB |
BIN
res/flags/FJ.png
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 4.9 KiB |
BIN
res/flags/FK.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 5.1 KiB |
BIN
res/flags/FM.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.4 KiB |
BIN
res/flags/FO.png
Before Width: | Height: | Size: 834 B After Width: | Height: | Size: 1.7 KiB |
BIN
res/flags/FR.png
Before Width: | Height: | Size: 692 B After Width: | Height: | Size: 566 B |
BIN
res/flags/GA.png
Before Width: | Height: | Size: 753 B After Width: | Height: | Size: 661 B |
BIN
res/flags/GB.png
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 6.2 KiB |
BIN
res/flags/GD.png
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 5.6 KiB |
BIN
res/flags/GE.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.5 KiB |
BIN
res/flags/GF.png
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.3 KiB |
BIN
res/flags/GG.png
Before Width: | Height: | Size: 1001 B After Width: | Height: | Size: 2.7 KiB |
BIN
res/flags/GH.png
Before Width: | Height: | Size: 1010 B After Width: | Height: | Size: 1.8 KiB |
BIN
res/flags/GI.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.7 KiB |
BIN
res/flags/GL.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 3.0 KiB |
BIN
res/flags/GM.png
Before Width: | Height: | Size: 743 B After Width: | Height: | Size: 709 B |
BIN
res/flags/GN.png
Before Width: | Height: | Size: 699 B After Width: | Height: | Size: 560 B |
BIN
res/flags/GP.png
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 5.5 KiB |
BIN
res/flags/GQ.png
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 3.0 KiB |
BIN
res/flags/GR.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.0 KiB |
BIN
res/flags/GS.png
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 5.6 KiB |
BIN
res/flags/GT.png
Before Width: | Height: | Size: 949 B After Width: | Height: | Size: 1.8 KiB |
BIN
res/flags/GU.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.5 KiB |
BIN
res/flags/GW.png
Before Width: | Height: | Size: 972 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/GY.png
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 5.0 KiB |
BIN
res/flags/HK.png
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.9 KiB |
BIN
res/flags/HM.png
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 5.1 KiB |
BIN
res/flags/HN.png
Before Width: | Height: | Size: 971 B After Width: | Height: | Size: 1.6 KiB |
BIN
res/flags/HR.png
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 2.4 KiB |