Merge branch 'new-guest-access' into experimental

2024-10-01 01:26:12 -04:00 · 2017-06-06 16:43:01 +01:00 · 2017-06-06 16:43:01 +01:00 · 1deadf5aad
commit 1deadf5aad
parent 4cec4f066d d06934c5f6
300 changed files with 1195 additions and 226 deletions
--- a/config.sample.json
+++ b/config.sample.json
@ -11,6 +11,7 @@
            "matrix.org"
        ]
    },
    "welcomeUserId": "@riot-bot:matrix.org",
    "piwik": {
        "url": "https://piwik.riot.im/",
        "siteId": 1
--- a/package.json
+++ b/package.json
@ -77,7 +77,8 @@
    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
    "sanitize-html": "^1.11.1",
    "ua-parser-js": "^0.7.10",
-    "url": "^0.11.0"
+    "url": "^0.11.0",
    "velocity-vector": "vector-im/velocity#059e3b2"
  },
  "devDependencies": {
    "autoprefixer": "^6.6.0",
--- a/res/flags/AD.png
+++ b/res/flags/AD.png
--- a/res/flags/AE.png
+++ b/res/flags/AE.png
--- a/res/flags/AF.png
+++ b/res/flags/AF.png
--- a/res/flags/AG.png
+++ b/res/flags/AG.png
--- a/res/flags/AI.png
+++ b/res/flags/AI.png
--- a/res/flags/AL.png
+++ b/res/flags/AL.png
--- a/res/flags/AM.png
+++ b/res/flags/AM.png
--- a/res/flags/AO.png
+++ b/res/flags/AO.png
--- a/res/flags/AQ.png
+++ b/res/flags/AQ.png
--- a/res/flags/AR.png
+++ b/res/flags/AR.png
--- a/res/flags/AS.png
+++ b/res/flags/AS.png
--- a/res/flags/AT.png
+++ b/res/flags/AT.png
--- a/res/flags/AU.png
+++ b/res/flags/AU.png
--- a/res/flags/AW.png
+++ b/res/flags/AW.png
--- a/res/flags/AX.png
+++ b/res/flags/AX.png
--- a/res/flags/AZ.png
+++ b/res/flags/AZ.png
--- a/res/flags/BA.png
+++ b/res/flags/BA.png
--- a/res/flags/BB.png
+++ b/res/flags/BB.png
--- a/res/flags/BD.png
+++ b/res/flags/BD.png
--- a/res/flags/BE.png
+++ b/res/flags/BE.png
--- a/res/flags/BF.png
+++ b/res/flags/BF.png
--- a/res/flags/BG.png
+++ b/res/flags/BG.png
--- a/res/flags/BH.png
+++ b/res/flags/BH.png
--- a/res/flags/BI.png
+++ b/res/flags/BI.png
--- a/res/flags/BJ.png
+++ b/res/flags/BJ.png
--- a/res/flags/BL.png
+++ b/res/flags/BL.png
--- a/res/flags/BM.png
+++ b/res/flags/BM.png
--- a/res/flags/BN.png
+++ b/res/flags/BN.png
--- a/res/flags/BO.png
+++ b/res/flags/BO.png
--- a/res/flags/BQ.png
+++ b/res/flags/BQ.png
--- a/res/flags/BR.png
+++ b/res/flags/BR.png
--- a/res/flags/BS.png
+++ b/res/flags/BS.png
--- a/res/flags/BT.png
+++ b/res/flags/BT.png
--- a/res/flags/BV.png
+++ b/res/flags/BV.png
--- a/res/flags/BW.png
+++ b/res/flags/BW.png
--- a/res/flags/BY.png
+++ b/res/flags/BY.png
--- a/res/flags/BZ.png
+++ b/res/flags/BZ.png
--- a/res/flags/CA.png
+++ b/res/flags/CA.png
--- a/res/flags/CC.png
+++ b/res/flags/CC.png
--- a/res/flags/CD.png
+++ b/res/flags/CD.png
--- a/res/flags/CF.png
+++ b/res/flags/CF.png
--- a/res/flags/CG.png
+++ b/res/flags/CG.png
--- a/res/flags/CH.png
+++ b/res/flags/CH.png
--- a/res/flags/CI.png
+++ b/res/flags/CI.png
--- a/res/flags/CK.png
+++ b/res/flags/CK.png
--- a/res/flags/CL.png
+++ b/res/flags/CL.png
--- a/res/flags/CM.png
+++ b/res/flags/CM.png
--- a/res/flags/CN.png
+++ b/res/flags/CN.png
--- a/res/flags/CO.png
+++ b/res/flags/CO.png
--- a/res/flags/CR.png
+++ b/res/flags/CR.png
--- a/res/flags/CU.png
+++ b/res/flags/CU.png
--- a/res/flags/CV.png
+++ b/res/flags/CV.png
--- a/res/flags/CW.png
+++ b/res/flags/CW.png
--- a/res/flags/CX.png
+++ b/res/flags/CX.png
--- a/res/flags/CY.png
+++ b/res/flags/CY.png
--- a/res/flags/CZ.png
+++ b/res/flags/CZ.png
--- a/res/flags/DE.png
+++ b/res/flags/DE.png
--- a/res/flags/DJ.png
+++ b/res/flags/DJ.png
--- a/res/flags/DK.png
+++ b/res/flags/DK.png
--- a/res/flags/DM.png
+++ b/res/flags/DM.png
--- a/res/flags/DO.png
+++ b/res/flags/DO.png
--- a/res/flags/DZ.png
+++ b/res/flags/DZ.png
--- a/res/flags/EC.png
+++ b/res/flags/EC.png
--- a/res/flags/EE.png
+++ b/res/flags/EE.png
--- a/res/flags/EG.png
+++ b/res/flags/EG.png
--- a/res/flags/EH.png
+++ b/res/flags/EH.png
--- a/res/flags/ER.png
+++ b/res/flags/ER.png
--- a/res/flags/ES.png
+++ b/res/flags/ES.png
--- a/res/flags/ET.png
+++ b/res/flags/ET.png
--- a/res/flags/FI.png
+++ b/res/flags/FI.png
--- a/res/flags/FJ.png
+++ b/res/flags/FJ.png
--- a/res/flags/FK.png
+++ b/res/flags/FK.png
--- a/res/flags/FM.png
+++ b/res/flags/FM.png
--- a/res/flags/FO.png
+++ b/res/flags/FO.png
--- a/res/flags/FR.png
+++ b/res/flags/FR.png
--- a/res/flags/GA.png
+++ b/res/flags/GA.png
--- a/res/flags/GB.png
+++ b/res/flags/GB.png
--- a/res/flags/GD.png
+++ b/res/flags/GD.png
--- a/res/flags/GE.png
+++ b/res/flags/GE.png
--- a/res/flags/GF.png
+++ b/res/flags/GF.png
--- a/res/flags/GG.png
+++ b/res/flags/GG.png
--- a/res/flags/GH.png
+++ b/res/flags/GH.png
--- a/res/flags/GI.png
+++ b/res/flags/GI.png
--- a/res/flags/GL.png
+++ b/res/flags/GL.png
--- a/res/flags/GM.png
+++ b/res/flags/GM.png
--- a/res/flags/GN.png
+++ b/res/flags/GN.png
--- a/res/flags/GP.png
+++ b/res/flags/GP.png
--- a/res/flags/GQ.png
+++ b/res/flags/GQ.png
--- a/res/flags/GR.png
+++ b/res/flags/GR.png
--- a/res/flags/GS.png
+++ b/res/flags/GS.png
--- a/res/flags/GT.png
+++ b/res/flags/GT.png
--- a/res/flags/GU.png
+++ b/res/flags/GU.png
--- a/res/flags/GW.png
+++ b/res/flags/GW.png
--- a/res/flags/GY.png
+++ b/res/flags/GY.png
--- a/res/flags/HK.png
+++ b/res/flags/HK.png
--- a/res/flags/HM.png
+++ b/res/flags/HM.png
--- a/res/flags/HN.png
+++ b/res/flags/HN.png
--- a/res/flags/HR.png
+++ b/res/flags/HR.png
--- a/Show More
+++ b/Show More