Commit Graph

1654 Commits

Author SHA1 Message Date
Yemel Jardi ae9deaa6f8 Reintroduce cordova 2014-07-29 14:12:50 -03:00
Yemel Jardi bb3e237451 Include views folder into apk 2014-07-28 17:35:21 -03:00
Yemel Jardi 6418f5f8b1 Merge pull request #959 from cmgustavo/feature/01-newdesign-v2
Feature/01 newdesign v2
2014-07-28 17:08:59 -03:00
Gustavo Maximiliano Cortez 8974847f48 Removed old unused notifications. Fixes template url for new notifications 2014-07-28 15:41:12 -03:00
Gustavo Maximiliano Cortez 898e5a12ef Fixes: karma tests 2014-07-28 13:30:41 -03:00
Gustavo Maximiliano Cortez 85aa5842f1 Fix Conflicts:
.gitignore
	index.html
	js/controllers/backup.js
	js/controllers/sidebar.js
2014-07-28 12:28:07 -03:00
bechi 31b0a2da60 mobile layout detail 2014-07-28 10:51:03 -03:00
Gustavo Maximiliano Cortez 5fbbec3dc8 Merge pull request #954 from matiu/feature/bitcore03
update bower
2014-07-25 18:36:12 -03:00
Matias Alejo Garcia 02de6e4deb update bower 2014-07-25 18:35:06 -03:00
Matias Alejo Garcia 8f83b3ad13 Merge pull request #953 from matiu/feature/bitcore02
update bitcore dep
2014-07-25 18:25:14 -03:00
Matias Alejo Garcia c82d00472c update bitcore dep 2014-07-25 18:22:35 -03:00
Manuel Aráoz 811dc6dd3b Merge pull request #952 from matiu/feature/txproposal01
Feature/txproposal01
2014-07-25 18:05:02 -03:00
Matias Alejo Garcia ceada149d7 fix tests 2014-07-25 17:48:35 -03:00
Matias Alejo Garcia 3aef6e156b add FORCED options to TxBuilder creation 2014-07-25 17:45:56 -03:00
Matias Alejo Garcia eea45d4413 reset note in form 2014-07-25 17:45:06 -03:00
Matias Alejo Garcia 560702df58 Merge pull request #936 from yemel/feature/android-cordova
Android - Migration to Cordova + Crosswalk Framework
2014-07-25 16:40:13 -03:00
bechi b98f1091ab layout bugs 2014-07-25 15:41:34 -03:00
Matias Alejo Garcia 2abffd3511 Merge pull request #944 from maraoz/fix/txp-checks
Add txp checks and tests
2014-07-25 14:20:19 -03:00
Yemel Jardi 1e7d519685 Remove framework files 2014-07-25 13:48:25 -03:00
Yemel Jardi c844ca4203 Fix typo in package name 2014-07-25 13:43:50 -03:00
Manuel Araoz e85431861e fix cases for incomplete transactions 2014-07-25 13:37:12 -03:00
Yemel Jardi 0aba7df3ff Changes for building a release apk 2014-07-25 13:05:03 -03:00
Manuel Araoz 740256772e fix password tests 2014-07-25 12:34:31 -03:00
Manuel Araoz 4cab2d1929 fix new tests 2014-07-25 12:25:28 -03:00
Manuel Araoz 76e0d8f5ef add validation for actual tx SIGHASH_TYPE 2014-07-25 12:25:28 -03:00
Manuel Araoz b5c144d48c complete validation tests for txProposal SIGHASH 2014-07-25 12:25:27 -03:00
Manuel Aráoz d7650f30ff Merge pull request #929 from matiu/feature/bitcore01
Updates model and tests to newest bitcore version
2014-07-25 12:23:36 -03:00
Matias Alejo Garcia bb5ba1a209 rm log 2014-07-25 12:15:00 -03:00
Matias Alejo Garcia 2008db932b add buildermockv0 to show old / obsolete tx proposals 2014-07-25 11:59:13 -03:00
Yemel Jardi d37fb96836 Seamless transition out splash screen 2014-07-25 11:30:54 -03:00
Yemel Jardi 19f57e614c Add native QR scanner to send form 2014-07-25 11:30:54 -03:00
Yemel Jardi e121d0acb6 Send email backup with file attached 2014-07-25 11:30:54 -03:00
Yemel Jardi 053718884a Migrate android project to crosswalk+cordova bundle 2014-07-25 11:30:53 -03:00
bechi 1e85511c3c signout button 2014-07-25 11:23:06 -03:00
Matias Alejo Garcia 7f11793b96 less strict import check for TXP v0 2014-07-25 11:13:48 -03:00
Matias Alejo Garcia ae08d5611a fix test / id name 2014-07-25 11:05:10 -03:00
Matias Alejo Garcia 0e6b31b9cb Merge pull request #3 from maraoz/feature/bitcore01
fix test
2014-07-25 10:55:55 -03:00
Manuel Araoz 08c2579272 fix test 2014-07-25 10:54:46 -03:00
Matias Alejo Garcia ab0aee7e89 Merge pull request #2 from maraoz/feature/bitcore01
add failing test for mati to fix
2014-07-25 10:53:46 -03:00
Manuel Araoz 235920bd84 add failing test for mati to fix 2014-07-25 10:50:18 -03:00
Matias Alejo Garcia 5eb8164df2 skip incompatible transaction proposals from backups 2014-07-25 10:39:41 -03:00
Matias Alejo Garcia c2dcd4f44b Merge pull request #919 from maraoz/feature/delete-wallet-intermediate
Add delete wallet button at intermediate screen
2014-07-25 08:01:24 -03:00
Matias Alejo Garcia 72d91ddd50 Merge pull request #922 from yemel/feature/show-empty-address
Show addresses for other copayers
2014-07-25 08:00:04 -03:00
Matias Alejo Garcia 46e8de6314 Merge pull request #904 from yemel/feature/better-password-formula
Implement bitpay's password strength checker
2014-07-25 07:55:05 -03:00
Matias Alejo Garcia b788c76d91 rm log 2014-07-25 07:53:29 -03:00
Matias Alejo Garcia 23ba3e6ebf updates version and use latest bitcore params 2014-07-25 07:53:02 -03:00
Matias Alejo Garcia b3759f2ee3 bump version 0.4.1 2014-07-24 22:01:28 -03:00
Matias Alejo Garcia 813c498d1f fix typo 2014-07-24 21:59:44 -03:00
Matias Alejo Garcia accb823fc4 updated to Bitcore version 0.1.33 2014-07-24 21:56:37 -03:00
Matias Alejo Garcia b5e307c3d3 update format 2014-07-24 21:19:54 -03:00