Merge tag '3.0.2'

younginnovations · Jan 12, 2018 · c2327aa · c2327aa
2 parents a00ec71 + d8c6a94
commit c2327aa
Show file tree

Hide file tree

Showing 26 changed files with 686 additions and 1,543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,6 @@ dstore/un-json/*
 ./config/deploy.rb
 dstore/cache_new/
 dstore/db.zip
-dstore/json/un_agencies_data.json
 dstore/json/un_agencies_data copy.json
 dstore/json/un_org copy.json
 dstore/cache_old

diff --git a/bin/npm_install b/bin/npm_install
@@ -2,11 +2,11 @@ cd `dirname $0`
 
 cd ../ctrack
 rm -rf node_modules
-yarn
+~/.nvm/versions/node/v8.3.0/bin/yarn
 
 cd ../dstore
 rm -rf node_modules
-yarn
+~/.nvm/versions/node/v8.3.0/bin/yarn
 #CC=gcc-5 CXX=g++-5 npm install
 
 cd ../dportal

diff --git a/config/deploy.rb b/config/deploy.rb
@@ -109,7 +109,7 @@
 namespace :deploy do
     after :published, "app_stop:stop"
     after :published, "dportal:create_symlink"
-#    after :published, "install_dependency:install"
+    after :published, "install_dependency:install"
 #    after :published, "app_build:build"
     after :published, "app_restart:start"
 end
diff --git a/ctrack/art/flag/as.png b/ctrack/art/flag/as.png
diff --git a/ctrack/art/flag/bn.png b/ctrack/art/flag/bn.png
diff --git a/ctrack/art/flag/ca.png b/ctrack/art/flag/ca.png
diff --git a/ctrack/art/flag/ch.png b/ctrack/art/flag/ch.png
diff --git a/ctrack/art/flag/cz.png b/ctrack/art/flag/cz.png
diff --git a/ctrack/art/flag/ee.png b/ctrack/art/flag/ee.png
diff --git a/ctrack/art/flag/fi.png b/ctrack/art/flag/fi.png
diff --git a/ctrack/art/flag/gb.png b/ctrack/art/flag/gb.png
diff --git a/ctrack/art/flag/global-regional.png b/ctrack/art/flag/global-regional.png
diff --git a/ctrack/art/flag/gu.png b/ctrack/art/flag/gu.png
diff --git a/ctrack/art/flag/gy.png b/ctrack/art/flag/gy.png
diff --git a/ctrack/art/flag/lv.png b/ctrack/art/flag/lv.png
diff --git a/ctrack/art/flag/mp.png b/ctrack/art/flag/mp.png
diff --git a/ctrack/art/flag/mt.png b/ctrack/art/flag/mt.png
diff --git a/ctrack/art/flag/nl.png b/ctrack/art/flag/nl.png
diff --git a/ctrack/art/flag/pf.png b/ctrack/art/flag/pf.png
diff --git a/ctrack/art/flag/sg.png b/ctrack/art/flag/sg.png
diff --git a/ctrack/art/flag/sl.png b/ctrack/art/flag/sl.png
diff --git a/ctrack/art/un_logos/XM-DAC-41127.png b/ctrack/art/un_logos/XM-DAC-41127.png
diff --git a/ctrack/art/un_logos/XM-OCHA-FTS.png b/ctrack/art/un_logos/XM-OCHA-FTS.png
diff --git a/dportal/upgrade b/dportal/upgrade
@@ -1,3 +1,3 @@
 cd `dirname $0`
 
-yarn
+~/.nvm/versions/node/v8.3.0/bin/yarn