From e17070c6e4717f830079c43a3d785ee9626fc4b3 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Fri, 16 May 2014 17:13:55 -0300 Subject: [PATCH 1/4] added files for the firefox addon --- img/icons/icon-16.png | Bin 0 -> 643 bytes img/icons/icon-32.png | Bin 0 -> 1242 bytes img/icons/icon-64.png | Bin 0 -> 2360 bytes popup.html | 3 ++- 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 img/icons/icon-16.png create mode 100644 img/icons/icon-32.png create mode 100644 img/icons/icon-64.png diff --git a/img/icons/icon-16.png b/img/icons/icon-16.png new file mode 100644 index 0000000000000000000000000000000000000000..d4664c57a166ee167cbb05f717c6ca08b947995f GIT binary patch literal 643 zcmV-}0(||6P)*je0+S*^Stl#zTYbV zn%g@c0|S7Ye~U2iVt#UbSmeleDj`kNB$LU25Ljgy(=@j~k4U-9Wr*NZci{8(k~9n= zkr-1m-}(0A=XThDRIcn~Dn(zh!;Bu;YsM}I5`{nL) zTxnKRQH^6qk1+f3Eo0ALp{msdSkc_xSzyX;Q<#4LhLhcc1lKn(O>j9?Y>JiD zz#6hF7YInj4ZG>>WqNjwrPTn6)e1l~rV)h_GC+ZaXe`c!GaXEPp2DUmCE$j-TGHuE zWr1`igVib%-i#EFiH zme8qp*J81V@)ZEs6a|~2pe1zn?%Bn?8$;}FtRs~&aH`dKZ#^Wg>jeVg{BO)=vvi$3 zh25s$UtH$v+yef^B@AN=hr^C6RUt_QIm0E(ly6?K*9tLG6kAPv z#*o+$4Ka~6tuaxd5~a3*KCq~;DHMVb!4=p9QfS$>SPN>~?e5IZj33;tHiqtQTkH8W zH@S2E|8xK6o^!4Qkey$MyS0Iwg5oED4ZtG6!NgiWa1^L=IqPbNF{SMMBHXP9$SEjp z19F)hJMMDUEzHg@L;}buC_WC{&*a*1m$Po66g>8QLQh8DJ!e?%Yg2erXFQPXB~i2!s%!hE48%;G80DSRv6ERln zsD4GHnlHHX4$7Wg0YKT7?OeIqHDZsh>-4yegw}iZHSpP&`-!u~j-PDI92gk%^5XiZ0cdDB!oZ++Ld&5XuDU&0v?R3NTYnIf$uxNc)PTm4#d)Fi;bSMG za<1$8_y~BtL*(bq2cWa7Cv@c^F-1|?wDu{6eEzW$&~zPJYzzS1J-rBFinvr~&CZ~7 z-EtH~9XkQ5#WE&c1DZxnML8c-eoDN8W9(kt7LS*J-Y)pttV^A6D-P zw&^hvaM*49=sFKTa?*6BB~Bf+H789^rKaj`aqbJ$Evx?5H9z+ziBBFUfQB~&Np2f1qA0cPXZP;RC@p^~2aOpB?*$%&7!Rzy3l4YzG3qqJCvLiMNplUP%R;vZ8)xv*dRsZ|bOwP_P!sV>X z1x`#hcy@jvvb*&F{~%EUGzXv36K(xL-zCG~?$!qW1h_7;ns?oKU;qFB07*qoM6N<$ Eg12x`Bme*a literal 0 HcmV?d00001 diff --git a/img/icons/icon-64.png b/img/icons/icon-64.png new file mode 100644 index 0000000000000000000000000000000000000000..fec1daa73585773476707dbc326bca6e70b10a76 GIT binary patch literal 2360 zcmV-83CH${P)X z17k_64g^F6RKlZ128%q4gdnsGBac{91R6qKgb-kp>}L1gJ^f>o)v$>Txw}aS{mty` z?r-njIp6O&zvn$i;(th7V)953Q<0>hKo_7bAki{K0Odd~LL3Dt{cL8&!5{mBACTBb z#*v-1li0-Zvn5G-8?bU`i&F@(AUpH3_iC`!OF+Vu>DUXehpCe3lqAuORwP1jQ4{V5 z!@}>epV;=1KLH6-rc;r3v$tYa&HyG_r?_>O9^WRqT}}-NQq8j0Bu|)0R!dtkcpnLF zkGq2^6nl2oPGo@WtevQma{4X+4`5Oy)2SL?AOkfHuPb+nND|#*6UWc?5m4>z?<%Rm zEX5@zk3`}?OBj@{>$o)?UDxq=JT(JFk!4g>#biDVyvF5r(>|;%KN~iP z#K8mU-Losv5jLz=i|?9}(lTMy74X)YjjZ`_D;Be1pM6$}OG>^8gf$iL zDwm6)5BKNwmlqHd6<+JNYh^ds@%cV>?fsHd**U1HilWE}ArM0F@`72sFk>GD4tH4D2Gmz3;js@&eBs-(WLgv22Uwe+QB*IALeo=-pDPe_Qh-sNpCui&41)9KjZ zUH~S~UPR7!7Y*5f+!Ww-T_@qeSWfKQ>IXh;<2D98{tSEmo<(SA$dB4~h}FXB>>S_s zF{6edgfJ8g)L?^mR=Jp$GL?nDcw|zT4S-Y~9K4bSm!{ZDJ0UnQsX%ojXZQ|Hk`kVH0 zlAnL6L3Uf|a8h1TiPd6e*0c#6-uYoIQ~6*^1~ca|-l=QoQ_%$Sd+ z=?zI!IscE{_5ObRSmF)PJEHR)=%GW#KhZ<*P5o`c5A4rid)mLTFiz$eo$9{v#N@f zum0LkzdCJGqly<*ReiaCz^lMu_<)DvA0YmL`~C8OH6Nr0sB&w;1h`yo7SB)d)34jS z-8YM^ngCm;`$*^?>!;tib!Us7{eTc4gka{>aen&4U!A~SUfJSXV}=Q+sB|#-$RXG z-m=)JZQcsLcaN@YSnX}J*vl(e^!t^Dm%m{GR8^s{xWrE%+q)-jO$(UEe`L@AcD%pZ zr<*c+QNRc`M1a|(a`N;y{si>tS+9S%J%?AttZ5TiyXsY+Zc@sx$S=CmG7=$0QP_R( zNS(jUd}=&KSJ$R@mh+o=DZY?9G3A%!oX>4psqp?Uk5O4ikALCZXB$-vRXUsuADY04 zz3B`|=np_%ej&r2c$RY)E)nST!Y~0QlgewW-u2U4%x1Q&f2%=HeuVH=l@Imn%igVN zyuD(n&xBIfZD!=e*;G_If)ZK-(iE+7xmdMqG2VpC`A8;?8AVjY_s{)yAIRj5Kc#W~h8vSJoV

o+4AXb(l%|Uu=q-ow9^9G7T0v0KE1lJ@Wtmy8Zxj!|8cq8 z9LPMz?t@3zcjzdxEC;3i-6RC~szgo0VlwgYfH->f=t^`%XJlDMk!9@Vl@ym;C9j~E zug`umn?8IH9PgLXKaTq-Eya()qc1x0M$zRS>~a-Is6!Ph-ZM6h-YDsG zR_vt8WHNO3QpRr^t$*_YMsSX==Zlt0KfvB&pE^SS@BAoALq{i<$EBO5e;WihoAe zwoNE4N`yEngOqOcJ{GeXgcqRIYQbbun>3v@kO!tq0C7pl4(|NpakuTh&K}MPk*nkL zg1Zd753?_Z#3qivc(28x{H&W0Vh-SJ1=yWJh&kDr8QoQ()B;aK eYJk>$eEz=!5t11oDtT1^0000 Date: Fri, 16 May 2014 17:26:47 -0300 Subject: [PATCH 2/4] added firefox addon files --- index-download-chrome.html | 2 +- index-download-firefox.html | 18 ++++++++++++++++++ index.html | 4 ++-- util/generate-app-extension.sh | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 index-download-firefox.html diff --git a/index-download-chrome.html b/index-download-chrome.html index 675112999..a5626065b 100644 --- a/index-download-chrome.html +++ b/index-download-chrome.html @@ -8,7 +8,7 @@

-

Copay Installation:

+

Copay Chrome Installation:

  • Download ZIP
  • Unpack the ZIP file
    • diff --git a/index-download-firefox.html b/index-download-firefox.html new file mode 100644 index 000000000..0e23e2c1d --- /dev/null +++ b/index-download-firefox.html @@ -0,0 +1,18 @@ + + + + + + Copay Firefox Addon - Install + + + +
    +

    Copay Firefox Installation:

    +
      +
    • Download XPI
      • +
    • Copay is installed!
      • +
    +
    + + diff --git a/index.html b/index.html index 0e119019a..b45064051 100644 --- a/index.html +++ b/index.html @@ -209,9 +209,9 @@
    Settings · - Create a new wallet · + Create a new wallet · - Import a backup + Import a backup
diff --git a/util/generate-app-extension.sh b/util/generate-app-extension.sh index d33485b61..07bfe2b50 100755 --- a/util/generate-app-extension.sh +++ b/util/generate-app-extension.sh @@ -13,10 +13,12 @@ fi # Configs APPDIR="./webapp" CHROMEDIR="./chrome-extension" +FIREFOXDIR="./firefox-addon" LIBDIR="$APPDIR/lib" DOWNLOADDIR="$APPDIR/download" CHROMEDOWNLOADDIR="$DOWNLOADDIR/chrome" +FIREFOXDOWNLOADDIR="$DOWNLOADDIR/firefox" ZIPFILE="copay.zip" CHROMEZIPFILE="copay-chrome-extension.zip" @@ -50,6 +52,13 @@ fi mkdir -p $CHROMEDIR +# Create/Clean chrome-extension dir +if [ -d $FIREFOXDIR ]; then + rm -rf $FIREFOXDIR +fi + +mkdir -p $FIREFOXDIR + # Re-compile copayBundle.js echo -e "${OpenColor}${Green}* Generating copay bundle...${CloseColor}" grunt --target=dev shell @@ -65,6 +74,11 @@ echo -e "${OpenColor}${Green}* Copying all chrome-extension files...${CloseColor cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html,manifest.json} $CHROMEDIR checkOK +# Copy all firefox-addon files +echo -e "${OpenColor}${Green}* Copying all firefox-addon files...${CloseColor}" +cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html} $FIREFOXDIR +checkOK + # Zipping apps echo -e "${OpenColor}${Green}* Zipping all app files...${CloseColor}" zip -r $ZIPFILE $APPDIR @@ -79,5 +93,6 @@ mkdir -p $CHROMEDOWNLOADDIR mv $ZIPFILE $DOWNLOADDIR mv $CHROMEZIPFILE $CHROMEDOWNLOADDIR cp index-download-chrome.html $CHROMEDOWNLOADDIR/index.html +cp index-download-firefox.html $FIREFOXDOWNLOADDIR/index.html echo -e "${OpenColor}${Yellow}\nAwesome! Now you have the webapp in ./webapp and the chrome extension files in ./webapp/download/.${CloseColor}" From 83216c9b6f6f09ff77a2eddba473016ab9ff61ce Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Fri, 16 May 2014 17:29:54 -0300 Subject: [PATCH 3/4] ignore firefox-addon path, fix generator script --- .gitignore | 1 + util/generate-app-extension.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 94dc3faf8..c06d22ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,5 @@ js/copayBundle.js config.js webapp chrome-extension +firefox-addon version.js diff --git a/util/generate-app-extension.sh b/util/generate-app-extension.sh index 07bfe2b50..a5870b421 100755 --- a/util/generate-app-extension.sh +++ b/util/generate-app-extension.sh @@ -90,6 +90,7 @@ zip -r $CHROMEZIPFILE $CHROMEDIR checkOK mkdir -p $CHROMEDOWNLOADDIR +mkdir -p $FIREFOXDOWNLOADDIR mv $ZIPFILE $DOWNLOADDIR mv $CHROMEZIPFILE $CHROMEDOWNLOADDIR cp index-download-chrome.html $CHROMEDOWNLOADDIR/index.html From d76957ef9b5bc684286592eb1392a72714e92ad6 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Fri, 16 May 2014 17:35:39 -0300 Subject: [PATCH 4/4] avoid unsafe links for firefox-addon --- js/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/routes.js b/js/routes.js index 301b9d68a..5e44085eb 100644 --- a/js/routes.js +++ b/js/routes.js @@ -76,5 +76,5 @@ angular }); }) .config(function($compileProvider) { - $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel|chrome-extension):/); + $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|tel|chrome-extension|resource):/); });