Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move everything not explicitly riot (or status) branded into matrix-react-sdk #6500

Merged
merged 22 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,19 @@ module.exports = function (config) {
// This isn't required by any of the tests, but it stops karma
// logging warnings when it serves a 404 for them.
{
pattern: 'src/skins/vector/img/*',
pattern: 'node_modules/matrix-react-sdk/res/img/*',
watched: false, included: false, served: true, nocache: false,
},
{
pattern: 'res/themes/**',
watched: false, included: false, served: true, nocache: false,
},
],

proxies: {
// redirect img links to the karma server. See above.
"/img/": "/base/src/skins/vector/img/",
"/img/": "/base/node_modules/matrix-react-sdk/res/img/",
"/themes/": "/base/res/themes/",
},

// preprocess matching files before serving them to the browser
Expand Down
Binary file removed res/flags/AD.png
Binary file not shown.
Binary file removed res/flags/AE.png
Binary file not shown.
Binary file removed res/flags/AF.png
Binary file not shown.
Binary file removed res/flags/AG.png
Binary file not shown.
Binary file removed res/flags/AI.png
Binary file not shown.
Binary file removed res/flags/AL.png
Binary file not shown.
Binary file removed res/flags/AM.png
Binary file not shown.
Binary file removed res/flags/AO.png
Binary file not shown.
Binary file removed res/flags/AQ.png
Binary file not shown.
Binary file removed res/flags/AR.png
Binary file not shown.
Binary file removed res/flags/AS.png
Binary file not shown.
Binary file removed res/flags/AT.png
Binary file not shown.
Binary file removed res/flags/AU.png
Binary file not shown.
Binary file removed res/flags/AW.png
Binary file not shown.
Binary file removed res/flags/AX.png
Binary file not shown.
Binary file removed res/flags/AZ.png
Binary file not shown.
Binary file removed res/flags/BA.png
Binary file not shown.
Binary file removed res/flags/BB.png
Binary file not shown.
Binary file removed res/flags/BD.png
Binary file not shown.
Binary file removed res/flags/BE.png
Binary file not shown.
Binary file removed res/flags/BF.png
Binary file not shown.
Binary file removed res/flags/BG.png
Binary file not shown.
Binary file removed res/flags/BH.png
Binary file not shown.
Binary file removed res/flags/BI.png
Binary file not shown.
Binary file removed res/flags/BJ.png
Binary file not shown.
Binary file removed res/flags/BL.png
Diff not rendered.
Binary file removed res/flags/BM.png
Diff not rendered.
Binary file removed res/flags/BN.png
Diff not rendered.
Binary file removed res/flags/BO.png
Diff not rendered.
Binary file removed res/flags/BQ.png
Diff not rendered.
Binary file removed res/flags/BR.png
Diff not rendered.
Binary file removed res/flags/BS.png
Diff not rendered.
Binary file removed res/flags/BT.png
Diff not rendered.
Binary file removed res/flags/BV.png
Diff not rendered.
Binary file removed res/flags/BW.png
Diff not rendered.
Binary file removed res/flags/BY.png
Diff not rendered.
Binary file removed res/flags/BZ.png
Diff not rendered.
Binary file removed res/flags/CA.png
Diff not rendered.
Binary file removed res/flags/CC.png
Diff not rendered.
Binary file removed res/flags/CD.png
Diff not rendered.
Binary file removed res/flags/CF.png
Diff not rendered.
Binary file removed res/flags/CG.png
Diff not rendered.
Binary file removed res/flags/CH.png
Diff not rendered.
Binary file removed res/flags/CI.png
Diff not rendered.
Binary file removed res/flags/CK.png
Diff not rendered.
Binary file removed res/flags/CL.png
Diff not rendered.
Binary file removed res/flags/CM.png
Diff not rendered.
Binary file removed res/flags/CN.png
Diff not rendered.
Binary file removed res/flags/CO.png
Diff not rendered.
Binary file removed res/flags/CR.png
Diff not rendered.
Binary file removed res/flags/CU.png
Diff not rendered.
Binary file removed res/flags/CV.png
Diff not rendered.
Binary file removed res/flags/CW.png
Diff not rendered.
Binary file removed res/flags/CX.png
Diff not rendered.
Binary file removed res/flags/CY.png
Diff not rendered.
Binary file removed res/flags/CZ.png
Diff not rendered.
Binary file removed res/flags/DE.png
Diff not rendered.
Binary file removed res/flags/DJ.png
Diff not rendered.
Binary file removed res/flags/DK.png
Diff not rendered.
Binary file removed res/flags/DM.png
Diff not rendered.
Binary file removed res/flags/DO.png
Diff not rendered.
Binary file removed res/flags/DZ.png
Diff not rendered.
Binary file removed res/flags/EC.png
Diff not rendered.
Binary file removed res/flags/EE.png
Diff not rendered.
Binary file removed res/flags/EG.png
Diff not rendered.
Binary file removed res/flags/EH.png
Diff not rendered.
Binary file removed res/flags/ER.png
Diff not rendered.
Binary file removed res/flags/ES.png
Diff not rendered.
Binary file removed res/flags/ET.png
Diff not rendered.
Binary file removed res/flags/FI.png
Diff not rendered.
Binary file removed res/flags/FJ.png
Diff not rendered.
Binary file removed res/flags/FK.png
Diff not rendered.
Binary file removed res/flags/FM.png
Diff not rendered.
Binary file removed res/flags/FO.png
Diff not rendered.
Binary file removed res/flags/FR.png
Diff not rendered.
Binary file removed res/flags/GA.png
Diff not rendered.
Binary file removed res/flags/GB.png
Diff not rendered.
Binary file removed res/flags/GD.png
Diff not rendered.
Binary file removed res/flags/GE.png
Diff not rendered.
Binary file removed res/flags/GF.png
Diff not rendered.
Binary file removed res/flags/GG.png
Diff not rendered.
Binary file removed res/flags/GH.png
Diff not rendered.
Binary file removed res/flags/GI.png
Diff not rendered.
Binary file removed res/flags/GL.png
Diff not rendered.
Binary file removed res/flags/GM.png
Diff not rendered.
Binary file removed res/flags/GN.png
Diff not rendered.
Binary file removed res/flags/GP.png
Diff not rendered.
Binary file removed res/flags/GQ.png
Diff not rendered.
Binary file removed res/flags/GR.png
Diff not rendered.
Binary file removed res/flags/GS.png
Diff not rendered.
Binary file removed res/flags/GT.png
Diff not rendered.
Binary file removed res/flags/GU.png
Diff not rendered.
Binary file removed res/flags/GW.png
Diff not rendered.
Binary file removed res/flags/GY.png
Diff not rendered.
Binary file removed res/flags/HK.png
Diff not rendered.
Binary file removed res/flags/HM.png
Diff not rendered.
Binary file removed res/flags/HN.png
Diff not rendered.
Binary file removed res/flags/HR.png
Diff not rendered.
Binary file removed res/flags/HT.png
Diff not rendered.
Binary file removed res/flags/HU.png
Diff not rendered.
Binary file removed res/flags/ID.png
Diff not rendered.
Binary file removed res/flags/IE.png
Diff not rendered.
Binary file removed res/flags/IL.png
Diff not rendered.
Binary file removed res/flags/IM.png
Diff not rendered.
Binary file removed res/flags/IN.png
Diff not rendered.
Binary file removed res/flags/IO.png
Diff not rendered.
Binary file removed res/flags/IQ.png
Diff not rendered.
Binary file removed res/flags/IR.png
Diff not rendered.
Binary file removed res/flags/IS.png
Diff not rendered.
Binary file removed res/flags/IT.png
Diff not rendered.
Binary file removed res/flags/JE.png
Diff not rendered.
Binary file removed res/flags/JM.png
Diff not rendered.
Binary file removed res/flags/JO.png
Diff not rendered.
Binary file removed res/flags/JP.png
Diff not rendered.
Binary file removed res/flags/KE.png
Diff not rendered.
Binary file removed res/flags/KG.png
Diff not rendered.
Binary file removed res/flags/KH.png
Diff not rendered.
Binary file removed res/flags/KI.png
Diff not rendered.
Binary file removed res/flags/KM.png
Diff not rendered.
Binary file removed res/flags/KN.png
Diff not rendered.
Binary file removed res/flags/KP.png
Diff not rendered.
Binary file removed res/flags/KR.png
Diff not rendered.
Binary file removed res/flags/KW.png
Diff not rendered.
Binary file removed res/flags/KY.png
Diff not rendered.
Binary file removed res/flags/KZ.png
Diff not rendered.
Binary file removed res/flags/LA.png
Diff not rendered.
Binary file removed res/flags/LB.png
Diff not rendered.
Binary file removed res/flags/LC.png
Diff not rendered.
Binary file removed res/flags/LI.png
Diff not rendered.
Binary file removed res/flags/LK.png
Diff not rendered.
Binary file removed res/flags/LR.png
Diff not rendered.
Binary file removed res/flags/LS.png
Diff not rendered.
Binary file removed res/flags/LT.png
Diff not rendered.
Binary file removed res/flags/LU.png
Diff not rendered.
Binary file removed res/flags/LV.png
Diff not rendered.
Binary file removed res/flags/LY.png
Diff not rendered.
Binary file removed res/flags/MA.png
Diff not rendered.
Binary file removed res/flags/MC.png
Diff not rendered.
Binary file removed res/flags/MD.png
Diff not rendered.
Binary file removed res/flags/ME.png
Diff not rendered.
Binary file removed res/flags/MF.png
Diff not rendered.
Binary file removed res/flags/MG.png
Diff not rendered.
Binary file removed res/flags/MH.png
Diff not rendered.
Binary file removed res/flags/MK.png
Diff not rendered.
Binary file removed res/flags/ML.png
Diff not rendered.
Binary file removed res/flags/MM.png
Diff not rendered.
Binary file removed res/flags/MN.png
Diff not rendered.
Binary file removed res/flags/MO.png
Diff not rendered.
Binary file removed res/flags/MP.png
Diff not rendered.
Binary file removed res/flags/MQ.png
Diff not rendered.
Binary file removed res/flags/MR.png
Diff not rendered.
Binary file removed res/flags/MS.png
Diff not rendered.
Binary file removed res/flags/MT.png
Diff not rendered.
Binary file removed res/flags/MU.png
Diff not rendered.
Binary file removed res/flags/MV.png
Diff not rendered.
Binary file removed res/flags/MW.png
Diff not rendered.
Binary file removed res/flags/MX.png
Diff not rendered.
Binary file removed res/flags/MY.png
Diff not rendered.
Binary file removed res/flags/MZ.png
Diff not rendered.
Binary file removed res/flags/NA.png
Diff not rendered.
Binary file removed res/flags/NC.png
Diff not rendered.
Binary file removed res/flags/NE.png
Diff not rendered.
Binary file removed res/flags/NF.png
Diff not rendered.
Binary file removed res/flags/NG.png
Diff not rendered.
Binary file removed res/flags/NI.png
Diff not rendered.
Binary file removed res/flags/NL.png
Diff not rendered.
Binary file removed res/flags/NO.png
Diff not rendered.
Binary file removed res/flags/NP.png
Diff not rendered.
Binary file removed res/flags/NR.png
Diff not rendered.
Binary file removed res/flags/NU.png
Diff not rendered.
Binary file removed res/flags/NZ.png
Diff not rendered.
Binary file removed res/flags/OM.png
Diff not rendered.
Binary file removed res/flags/PA.png
Diff not rendered.
Binary file removed res/flags/PE.png
Diff not rendered.
Binary file removed res/flags/PF.png
Diff not rendered.
Binary file removed res/flags/PG.png
Diff not rendered.
Binary file removed res/flags/PH.png
Diff not rendered.
Binary file removed res/flags/PK.png
Diff not rendered.
Binary file removed res/flags/PL.png
Diff not rendered.
Binary file removed res/flags/PM.png
Diff not rendered.
Binary file removed res/flags/PN.png
Diff not rendered.
Binary file removed res/flags/PR.png
Diff not rendered.
Binary file removed res/flags/PS.png
Diff not rendered.
Binary file removed res/flags/PT.png
Diff not rendered.
Binary file removed res/flags/PW.png
Diff not rendered.
Binary file removed res/flags/PY.png
Diff not rendered.
Binary file removed res/flags/QA.png
Diff not rendered.
Binary file removed res/flags/RE.png
Diff not rendered.
Binary file removed res/flags/RO.png
Diff not rendered.
Binary file removed res/flags/RS.png
Diff not rendered.
Binary file removed res/flags/RU.png
Diff not rendered.
Binary file removed res/flags/RW.png
Diff not rendered.
Binary file removed res/flags/SA.png
Diff not rendered.
Binary file removed res/flags/SB.png
Diff not rendered.
Binary file removed res/flags/SC.png
Diff not rendered.
Binary file removed res/flags/SD.png
Diff not rendered.
Binary file removed res/flags/SE.png
Diff not rendered.
Binary file removed res/flags/SG.png
Diff not rendered.
Binary file removed res/flags/SH.png
Diff not rendered.
Binary file removed res/flags/SI.png
Diff not rendered.
Binary file removed res/flags/SJ.png
Diff not rendered.
Binary file removed res/flags/SK.png
Diff not rendered.
Binary file removed res/flags/SL.png
Diff not rendered.
Binary file removed res/flags/SM.png
Diff not rendered.
Binary file removed res/flags/SN.png
Diff not rendered.
Binary file removed res/flags/SO.png
Diff not rendered.
Binary file removed res/flags/SR.png
Diff not rendered.
Binary file removed res/flags/SS.png
Diff not rendered.
Binary file removed res/flags/ST.png
Diff not rendered.
Binary file removed res/flags/SV.png
Diff not rendered.
Binary file removed res/flags/SX.png
Diff not rendered.
Binary file removed res/flags/SY.png
Diff not rendered.
Binary file removed res/flags/SZ.png
Diff not rendered.
Binary file removed res/flags/TC.png
Diff not rendered.
Binary file removed res/flags/TD.png
Diff not rendered.
Binary file removed res/flags/TF.png
Diff not rendered.
Binary file removed res/flags/TG.png
Diff not rendered.
Binary file removed res/flags/TH.png
Diff not rendered.
Binary file removed res/flags/TJ.png
Diff not rendered.
Binary file removed res/flags/TK.png
Diff not rendered.
Binary file removed res/flags/TL.png
Diff not rendered.
Binary file removed res/flags/TM.png
Diff not rendered.
Binary file removed res/flags/TN.png
Diff not rendered.
Binary file removed res/flags/TO.png
Diff not rendered.
Binary file removed res/flags/TR.png
Diff not rendered.
Binary file removed res/flags/TT.png
Diff not rendered.
Binary file removed res/flags/TV.png
Diff not rendered.
Binary file removed res/flags/TW.png
Diff not rendered.
Binary file removed res/flags/TZ.png
Diff not rendered.
Binary file removed res/flags/UA.png
Diff not rendered.
Binary file removed res/flags/UG.png
Diff not rendered.
Binary file removed res/flags/US.png
Diff not rendered.
Binary file removed res/flags/UY.png
Diff not rendered.
Binary file removed res/flags/UZ.png
Diff not rendered.
Binary file removed res/flags/VA.png
Diff not rendered.
Binary file removed res/flags/VC.png
Diff not rendered.
Binary file removed res/flags/VE.png
Diff not rendered.
Binary file removed res/flags/VG.png
Diff not rendered.
Binary file removed res/flags/VI.png
Diff not rendered.
Binary file removed res/flags/VN.png
Diff not rendered.
Binary file removed res/flags/VU.png
Diff not rendered.
Binary file removed res/flags/WF.png
Diff not rendered.
Binary file removed res/flags/WS.png
Diff not rendered.
Binary file removed res/flags/YE.png
Diff not rendered.
Binary file removed res/flags/YT.png
Diff not rendered.
Binary file removed res/flags/ZA.png
Diff not rendered.
Binary file removed res/flags/ZM.png
Diff not rendered.
Binary file removed res/flags/ZW.png
Diff not rendered.
Binary file removed res/media/busy.mp3
Binary file not shown.
Binary file removed res/media/busy.ogg
Binary file not shown.
Binary file removed res/media/callend.mp3
Binary file not shown.
Binary file removed res/media/callend.ogg
Binary file not shown.
Binary file removed res/media/message.mp3
Binary file not shown.
Binary file removed res/media/message.ogg
Binary file not shown.
Binary file removed res/media/ring.mp3
Binary file not shown.
Binary file removed res/media/ring.ogg
Binary file not shown.
Binary file removed res/media/ringback.mp3
Binary file not shown.
Binary file removed res/media/ringback.ogg
Binary file not shown.
4 changes: 4 additions & 0 deletions res/themes/status/css/status.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@import "../../../../node_modules/matrix-react-sdk/res/themes/light/css/_base.scss";
@import "_status.scss";
@import "../../../../node_modules/matrix-react-sdk/res/css/_components.scss";
@import "_StatusLogin.scss";
6 changes: 3 additions & 3 deletions scripts/copy-res.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ const COPY_LIST = [
["res/home.html", "webapp"],
["res/home-status.html", "webapp"],
["res/home/**", "webapp/home"],
["res/{media,vector-icons}/**", "webapp"],
["res/flags/*", "webapp/flags/"],
["src/skins/vector/{fonts,img,themes}/**", "webapp"],
["res/vector-icons/**", "webapp"],
["node_modules/matrix-react-sdk/res/{fonts,img,themes}/**", "webapp"],
["res/themes/**", "webapp/themes"],
["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
["./config.json", "webapp", { directwatch: 1 }],
Expand Down
135 changes: 0 additions & 135 deletions src/VectorConferenceHandler.js

This file was deleted.

197 changes: 0 additions & 197 deletions src/components/structures/BottomLeftMenu.js

This file was deleted.

Loading