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
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
