Commit Graph

493 Commits

Author SHA1 Message Date
Christopher Jeffrey 64b38802bf paypro: fixes. clean up form reset from paypro. etc. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 4dd725aa48 paypro: more cleaning up of form. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 3b550d853f paypro: cleanup a lot of old code and comments. minor fixes. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey d9c72392bd paypro: through a lot of debugging. Payment sending is working. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 91b2d9dd02 paypro: fix endianess. fix fields. fix elements in a messy way. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 6e9eaf7d9d paypro: cached payment requests. validation. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 2aee44f31c paypro: refactor cached payment requests. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey decd981bce paypro: deal with cached payment requests properly. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey af12b56678 paypro: maintain received payment requests. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey b7b7b2e38e paypro: create real paypro txs. start potentially adding more merchant data to notifications. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 035070b78b paypro: drop existing txp check. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 62fe6ce628 paypro: try to find existing tx proposals. 2014-08-14 09:52:09 -04:00
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 b60e8ed407 Add copy to clipboard button 2014-08-13 13:34:47 -03: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
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
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
Yemel Jardi 19f57e614c Add native QR scanner to send form 2014-07-25 11:30:54 -03:00
Manuel Araoz 235920bd84 add failing test for mati to fix 2014-07-25 10:50:18 -03:00
Gustavo Maximiliano Cortez 2787a72b7a Waiting copayer as a controller 2014-07-24 15:31:07 -03:00
Gustavo Maximiliano Cortez 9875e9d643 Split signin.html in home, join and open files. Signin process with responsive support 2014-07-23 17:11:51 -03:00
Gustavo Maximiliano Cortez c52b604771 Import and settings 2014-07-22 15:57:19 -03:00
Gustavo Maximiliano Cortez d7adc854c9 fixes modals qr-address. 2014-07-22 11:03:27 -03:00
Manuel Araoz e7847208f7 add confirmation message before deleting 2014-07-21 16:31:46 -03:00
Manuel Araoz 1d6e4b897f remove '...' from More tab name 2014-07-21 16:25:47 -03:00
Manuel Araoz 1e44ce2cc7 add delete option in intermediate screen 2014-07-21 16:24:41 -03:00
Yemel Jardi 5f27f1e7a6 Move address modal to a separate file, rename html files and reintroduce bitcoin protocol handler 2014-07-18 18:51:55 -03:00
Yemel Jardi 0c3709ceee Add copayer list at sidebar, separate snippet and clean video controller code 2014-07-18 18:38:43 -03:00
Yemel Jardi 4f57c3f696 Highlight active section on sidebar 2014-07-18 15:23:01 -03:00
Yemel Jardi 0ffbd585f8 Add QR modal at address list and clean deprecated code 2014-07-18 11:24:29 -03:00
Yemel Jardi d484c5ab49 Replace iframe for window.open _blank 2014-07-17 22:35:24 -03:00
Yemel Jardi aa4af0a0e9 Add email wallet backup using iframe 2014-07-17 16:53:38 -03:00
Gustavo Maximiliano Cortez f7e4390507 Split create new wallet page 2014-07-17 16:00:58 -03:00
Gustavo Maximiliano Cortez 0ffb8eb42f New schema for signin/join a wallet 2014-07-17 15:09:44 -03:00
Gustavo Maximiliano Cortez 91c7ab100d Fixes karma tests 2014-07-16 19:00:34 -03:00
Gustavo Maximiliano Cortez 0a027360a8 Split index.html in many files smaller. New right column when the wallet is ready. Removed templates selector. 2014-07-16 17:59:28 -03:00
Yemel Jardi abdb876a4b Remove automatic partial backup 2014-07-10 17:45:16 -03:00
Yemel Jardi 774f9e4def Fix importing partial backup 2014-07-08 16:47:00 -03:00
Yemel Jardi cadd66812b Skip partial backup on 1-1 wallet 2014-07-08 15:54:10 -03:00
Yemel Jardi 49ac6dfcf4 Hold on backup page until all copayers made a full backup 2014-07-08 15:53:34 -03:00
Yemel Jardi f9fad5d62f Add partial backup at create and join 2014-07-08 15:53:34 -03:00
Matias Alejo Garcia 137e9ca108 Merge pull request #868 from cmgustavo/bug/video-intermediate-page
Fixed video while waiting for copayer
2014-07-08 15:44:25 -03:00
Gustavo Maximiliano Cortez ad403309ce Fixed video while waiting for copayer 2014-07-08 15:26:20 -03:00
Manuel Araoz 4d70f0cf24 add message for unchangeable network 2014-07-08 13:23:43 -03:00
Matias Alejo Garcia 360ccd724d change settings tab name 2014-07-08 10:48:56 -03:00
Matias Alejo Garcia 141e8bddd3 fixes txproposal notifications 2014-07-08 08:58:24 -03:00
Gustavo Cortez a1e5246727 updated 2014-07-07 18:13:26 -03:00
Matias Alejo Garcia 7e6827351f rm log 2014-07-07 18:06:30 -03:00
Gustavo Cortez 0931024e23 Fixes: verify addressbook method 2014-07-07 17:38:17 -03:00
Matias Alejo Garcia 93bbc68f5f fix save in Firefox 2014-07-07 17:30:42 -03:00
Matias Alejo Garcia f497d76405 Merge pull request #816 from yemel/feature/bipNNN-refactor
Feature/bip nnn refactor
2014-07-07 15:55:13 -03:00