Commit Graph

430 Commits

Author SHA1 Message Date
Christopher Jeffrey 3f6b5ec6b8 paypro: use HDPath instead of Structure. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 350592aa8d paypro: fix parse error. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey e0ff9ca6bd paypro: fix parseBitcoinURI. start using bitcoin uris in tests. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey b0dc3fc24d paypro: more merchant data storage. createTx and sendTx work. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey f49177f0b7 paypro: begin adding code for payment protocol. 2014-08-14 09:52:08 -04:00
Yemel Jardi 815c98f7e8 Merge pull request #1076 from matiu/bug/02-open-wallet
Bug/02 open wallet
2014-08-13 12:33:46 -03:00
Matias Alejo Garcia 35ab711846 refactor lock warning and add tests 2014-08-12 15:26:15 -04:00
Matias Alejo Garcia 1733f5491b fix settings page and add tests 2014-08-11 16:26:48 -04:00
Gustavo Maximiliano Cortez 8ad1fa7b02 Fixes: tests. Added karma and mocha tests. 2014-08-07 20:07:41 -03:00
Gustavo Maximiliano Cortez 801e746d11 Show a warning if trying to open same wallet in same browser. Fix redirect to receive. 2014-08-07 18:57:19 -03:00
Gustavo Maximiliano Cortez fe53f1b87c Merge pull request #1059 from yemel/feature/change-menu
Refactor menu, split transactions tab into send and history
2014-08-07 10:26:40 -03:00
Yemel Jardi 09e60b2f70 Refresh tx list after send on 1-of-1 2014-08-07 09:53:20 -03:00
Matias Alejo Garcia bb9406be01 Merge pull request #1033 from cmgustavo/bug/01-url-handler
Fixes: url handler
2014-08-07 00:58:08 -03:00
Gregg Zigler c8c7a57416 1. Add TxProposals to mocha test page
2. The jshint tool found some instances where var was declared twice within a function. Seemed to originate from copy/paste-style coding. Most were unambiguously intended for a single block within the function. In a few cases, two declarations were consumed by one later reference. In those cases, I removed the duplicate var or I refactored slightly.
2014-08-06 18:44:04 -04:00
Gustavo Maximiliano Cortez fd030ecbfb Fix Conflicts:
js/controllers/join.js
2014-08-06 18:55:44 -03:00
Gustavo Maximiliano Cortez 0c2141c380 Fix Conflicts:
views/unsupported.html
2014-08-06 18:51:04 -03:00
Matias Alejo Garcia 8e2802e1e7 Merge pull request #1064 from cmgustavo/feature/01-setup
add steps to creation process
2014-08-06 18:45:26 -03:00
Gustavo Maximiliano Cortez 53bc610bbc improve url checker 2014-08-06 18:41:37 -03:00
Matias Alejo Garcia 0ca9bbe86b Merge pull request #1062 from cmgustavo/feature/01-delete
Add delete wallet from the intermediate screen
2014-08-06 18:38:23 -03:00
Gustavo Maximiliano Cortez c588d97fc3 add steps to creation process 2014-08-06 18:21:14 -03:00
Gustavo Maximiliano Cortez e264aa66a2 Add delete wallet from the intermediate screen (it was lost in migration to new design) 2014-08-06 16:51:45 -03:00
Gustavo Maximiliano Cortez 7fd642c8ac Fixes problem with gitignore 2014-08-06 15:36:13 -03:00
Yemel Jardi 2ba794fc47 Change url to /receive and /history 2014-08-06 15:34:56 -03:00
Yemel Jardi ad75265e93 Refactor menu, split transactions tab into send and history 2014-08-06 13:59:33 -03:00
Gustavo Maximiliano Cortez 0a388c73ca Added version and networkName label bellow Copay logo 2014-08-05 11:52:51 -03:00
Gustavo Maximiliano Cortez a5544d08db Merge pull request #1040 from yemel/feature/improve-1-of-1
Remove Name field and copayer list on 1-of-1 wallets
2014-08-05 10:29:46 -03:00
Gustavo Maximiliano Cortez 125ceb9b66 Merge pull request #1041 from yemel/fix/go-home-settings
Go home after saving settings
2014-08-05 10:23:12 -03:00
Yemel Jardi 2a122f4b47 Go home after saving settings 2014-08-04 17:13:24 -03:00
Yemel Jardi 523a48b056 Remove Name field and copayer list on 1-of-1 wallets 2014-08-04 16:27:58 -03:00
Yemel Jardi 9b1708b88e Save last opened wallet 2014-08-04 15:10:01 -03:00
Gustavo Maximiliano Cortez ee031849b2 Fixes: url handler 2014-08-04 11:27:46 -03:00
Yemel Jardi 3ab1510051 Android update 0.4.2 2014-08-04 09:49:22 -03:00
Yemel Jardi ba504f147d Merge pull request #976 from cmgustavo/feature/01-timeout
Automatically logout wallet after 15 minutes of inactivity
2014-08-01 10:56:23 -03:00
Gustavo Maximiliano Cortez d2ae49f9a5 Fixes: typo 2014-08-01 10:51:26 -03:00
Gustavo Maximiliano Cortez fc71e6a441 Fixes: typo 2014-08-01 10:44:33 -03:00
Gustavo Maximiliano Cortez 2784e19cb2 Merge pull request #988 from yemel/fix/open-external
Fix open external in new tab and fix typo
2014-08-01 10:23:26 -03:00
Gustavo Maximiliano Cortez dbf812f848 Fix Karma test 2014-07-31 22:49:11 -03:00
Yemel Jardi 9c633f1918 Add icons for user actions at transaction proposal 2014-07-31 20:34:21 -03:00
Yemel Jardi e5fd3c38f4 Fix open external in new tab and fix typo 2014-07-31 14:06:55 -03:00
Gustavo Maximiliano Cortez f704826a5c feature: Logout wallet after 15 minutes of inactivity 2014-07-30 20:12:22 -03:00
Matias Alejo Garcia d62883e88f Merge pull request #969 from yemel/feature/address-external-link
Open bitcoin url in external app
2014-07-30 09:55:33 -03:00
Yemel Jardi 45f4352ec4 Add qr code to wallet secret and qr scanner at join page 2014-07-30 02:55:59 -03:00
Yemel Jardi 037b6e9d01 Open bitcoin url in external app 2014-07-30 00:51:38 -03:00
Yemel Jardi 71448828f2 Fix settings save function 2014-07-30 00:22:40 -03:00
Gustavo Maximiliano Cortez fc339f6472 Merge pull request #964 from matiu/feature/renameHD
Feature/rename hd
2014-07-29 15:57:48 -03:00
Matias Alejo Garcia af2a12929a fix uriPayment 2014-07-29 14:30:08 -03:00
Yemel Jardi e3eeab0eb6 Change routes to old hastag mode 2014-07-29 14:13:21 -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
Manuel Aráoz 811dc6dd3b Merge pull request #952 from matiu/feature/txproposal01
Feature/txproposal01
2014-07-25 18:05:02 -03:00