Merge remote-tracking branch 'origin/with-ES-store'
Conflicts: bower.json www/css/style.css www/i18n/locale-en.json www/index.html www/js/app.js www/js/controllers/currency-controllers.js www/js/controllers/home-controllers.js www/js/controllers/wallet-controllers.js www/js/services/crypto-services.js www/js/services/utils-services.js www/js/services/wallet-services.js www/templates/account/new_account.html www/templates/account/view_transfer.html www/templates/account/view_wallet.html www/templates/currency/select_currency.html www/templates/currency/tabs/view_parameters.html www/templates/currency/view_peer.html www/templates/explore/explore_currency.html www/templates/explore/explore_tabs.html www/templates/home.html www/templates/login.html www/templates/menu.html www/templates/wot/lookup.html www/templates/wot/modal_lookup.html
Showing
- .editorconfig 14 additions, 0 deletions.editorconfig
- .gitignore 7 additions, 1 deletion.gitignore
- .gitmodules 0 additions, 0 deletions.gitmodules
- README.md 39 additions, 1 deletionREADME.md
- app/config.json 34 additions, 0 deletionsapp/config.json
- bower.json 6 additions, 3 deletionsbower.json
- config.xml 34 additions, 5 deletionsconfig.xml
- gulpfile.js 42 additions, 5 deletionsgulpfile.js
- hooks/README.md 0 additions, 0 deletionshooks/README.md
- hooks/before_prepare/02_jshint.js 75 additions, 0 deletionshooks/before_prepare/02_jshint.js
- ionic.project 10 additions, 2 deletionsionic.project
- package.json 15 additions, 12 deletionspackage.json
- resources/android/icon/drawable-hdpi-icon.png 0 additions, 0 deletionsresources/android/icon/drawable-hdpi-icon.png
- resources/android/icon/drawable-ldpi-icon.png 0 additions, 0 deletionsresources/android/icon/drawable-ldpi-icon.png
- resources/android/icon/drawable-mdpi-icon.png 0 additions, 0 deletionsresources/android/icon/drawable-mdpi-icon.png
- resources/android/icon/drawable-xhdpi-icon.png 0 additions, 0 deletionsresources/android/icon/drawable-xhdpi-icon.png
- resources/android/icon/drawable-xxhdpi-icon.png 0 additions, 0 deletionsresources/android/icon/drawable-xxhdpi-icon.png
- resources/android/icon/drawable-xxxhdpi-icon.png 0 additions, 0 deletionsresources/android/icon/drawable-xxxhdpi-icon.png
- resources/android/icon/lesou-120px.png 0 additions, 0 deletionsresources/android/icon/lesou-120px.png
- resources/android/splash/drawable-land-hdpi-screen.png 0 additions, 0 deletionsresources/android/splash/drawable-land-hdpi-screen.png
Loading
Please register or sign in to comment