BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,082 Commits 8 Branches 122 Tags 162 MiB
Commit Graph

1074 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 d79dfb20c3 paypro: comment 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 18ca40b01e paypro: reset form if user removes payment uri. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 8cb2a96aff paypro: do not return error on untrusted cert. let peer decide whether to trust. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey fd8f192dbd paypro: minor 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 6ef3cf2992 paypro: set memo on comment properly. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 53abfcacda paypro: remove more unnecessary code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 3a73f2453c paypro: ripesha refund_to pubkeys. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey c471983a58 paypro: clean up unnecessary code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey f77d3bc350 paypro: fix trusted check. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 438820ef23 paypro: set invalid on errors. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 3866730218 paypro: remove old code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 4130980133 paypro: remove debug logs again. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 959a2f40cb paypro: fix script buffers. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey cf674dced2 paypro: remove temporary xhr shim. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey a9b522888e Revert "paypro: remove debug code." 
This reverts commit 019283e04cb6b25f6431cb56f02618c6d9e7fe90.
 2014-08-14 09:52:10 -04:00
Christopher Jeffrey 28459c2d4e paypro: remove debug code. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey feaa71c951 paypro: total now working. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey d94e8525fd paypro: all working except for value input. 2014-08-14 09:52:10 -04:00
Christopher Jeffrey f697e2ffbb paypro: show untrusted certs. 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 7b678a91b5 paypro: misc work. 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 b9d5219426 paypro: remove old code. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 6b6e251511 paypro: add fetchPaymentTx, use for form validation. improve css selection. 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 5105fd4229 paypro: more server info in validation. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 2d12933112 paypro: more debugging. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 49883779af paypro: more messy debugging. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 7915008433 paypro: remove old parse uri code. more debugging. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 7c39915dd0 paypro: messy work to get xhr to payment server working. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey a7f176890f paypro: parse bitcoin uri. show merchant uri properly. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey ad64ad1e0e paypro: allow payment protocol addresses in address input. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 4d244a03f8 paypro: fix total on merchantdata. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey f9406bbde2 paypro: use bignum for totals. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 91414b963c hdpath: fix uri parser to deal with merchant uris. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey ac8f5a55bc paypro: reimplement `merchant` field in uri parser. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 1a0f782e6d paypro: store total on merchant data specifically for display purposes. 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 b89ad8f3cc paypro: controller unit tests for payment protocol. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey d2e7e35e9f paypro: test/minor - use paypro content type constant. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey 8d96b446df paypro: fix some more errors. 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 e06fda5128 paypro: fix more payment protocol errors. 2014-08-14 09:52:09 -04:00
Christopher Jeffrey b18c9e3cd5 paypro: fix a lot of errors in payment protocol implementation. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey b0dc3fc24d paypro: more merchant data storage. createTx and sendTx work. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey d7ec908701 paypro: remove old code. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 61ef19ad19 paypro: fix a lot of aspects of storing merchant data in txps. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 59038a5d30 paypro: fix how merchant data is stored. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey d7b1770e5a paypro: add merchant prop to tx proposal. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey ebf3137946 paypro: rework flow of payment protocol. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 6c098030c3 paypro: fix trusted check. 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 e0396746f0 Skip first networking notification error 2014-08-14 10:23:37 -03: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 33ac84bc49 rm logs 2014-08-13 10:16:07 -04: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
Matias Alejo Garcia cc164af28b Merge pull request #1045 from cmgustavo/feature/01-version 
Feature/01 version
 2014-08-06 18:34:03 -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
Matias Alejo Garcia ddc8649bd3 fix `comment` handling 2014-08-06 15:56:17 -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
Matias Alejo Garcia afde77e575 fix last transaction retrieval 2014-08-06 15:30:47 -03:00
Yemel Jardi ad75265e93 Refactor menu, split transactions tab into send and history 2014-08-06 13:59:33 -03:00
Matias Alejo Garcia 91a05a896e rm removeRepeated fn 2014-08-05 17:18:02 -03:00
Matias Alejo Garcia 260adc8587 fix tests 2014-08-05 16:42:51 -03:00
Matias Alejo Garcia 5a2dfe690d add rebroadcast test 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 91829f8410 remove sender sig check 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 36fcd6882f add more tests to wallet 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 768dfefe3a wallet working again 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 4cf152999a add seenBy on creator 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia f5f9848ff1 all test passing! 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 753b890658 txp* test passing 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia 966818c53a add different toObj/fromObj fn for networking 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia c8917fccd6 karma + mocha browser passing also 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia d0c43f9bfb ALL test passing 2014-08-05 16:41:29 -03:00
Matias Alejo Garcia dc3bbb8859 wallet test passings 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 5d2b50f77f test in Txproposals working again 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 42c73f9a01 rewrite from scratch tests for TxProposalSet 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia ae042a8292 TxProposal fully testes 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 2fe421b14f tests for txProposal 1 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 0e211426d7 tests for txProposal 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 05aefc17a5 tests for txProposal 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 72e1dfc114 WIP 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 6e5f06693d separate TxProposal to a different class. new tests 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 96a5f0aeb8 add forPath and tests 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia a10e6f4908 add getForPath with tests 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia 4e6d572de0 add cache to pubkeyring test. Speedup 2x 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia c19eac6a4e WIP 2014-08-05 16:38:13 -03:00
Matias Alejo Garcia df357e4ea7 add metadata checks 2014-08-05 16:38:13 -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
Gustavo Maximiliano Cortez 844620f30f Merge pull request #1038 from yemel/feature/remember-last-wallet 
Save last opened wallet
 2014-08-04 17:37:28 -03:00
Yemel Jardi 2a122f4b47 Go home after saving settings 2014-08-04 17:13:24 -03:00
Yemel Jardi 6a3e109f39 Sort copayer list at Tx proposal by creator 2014-08-04 16:43:45 -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
Gustavo Maximiliano Cortez a3baab397c Fix Conflicts: 
css/main.css
	views/modals/qr-address.html
 2014-08-01 13:14:10 -03:00
Gustavo Maximiliano Cortez 313e3e4fcd Merge pull request #998 from yemel/fix/browser-extensions 
Fix/browser extensions
 2014-08-01 11:54:41 -03:00
Gustavo Maximiliano Cortez b94f66f32e Fixed Conflicts: 
bower.json
	js/directives.js
	views/includes/sidebar.html
 2014-08-01 11:12:35 -03:00
Gustavo Maximiliano Cortez 854196e72a Merge pull request #989 from yemel/feature/pre-created-address 
Add a pre-generated address to the shared branch
 2014-08-01 11:04:58 -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 09286ec37d Merge pull request #986 from yemel/feature/ui-locked-balance 
Change available balance to locked
 2014-08-01 10:16:00 -03:00
Yemel Jardi 59a03c1f25 Change available balance to locked 2014-08-01 10:09:26 -03:00
Yemel Jardi 411bc1c85f Update chrome extension 2014-08-01 10:03:11 -03:00
Yemel Jardi fe20e2dabd Update firefox extension 2014-08-01 09:49:03 -03:00
Gustavo Maximiliano Cortez f9161ed8f2 Fix Conflicts: 
css/main.css
 2014-07-31 23:10:38 -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
Gustavo Maximiliano Cortez dc565e0a68 Integrating ZeroClipboard in Copay as directive 2014-07-31 16:34:21 -03:00
Yemel Jardi fdabdc64fe Add a pre-generated address to the shared branch 2014-07-31 16:13:27 -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
Yemel Jardi ba70a17b63 Fix uriHandler 2014-07-29 15:30:01 -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