Commit graph

129 commits

Author SHA1 Message Date
Gustavo Cortez
e17aed54b0 Fix conflicts:
js/controllers/transactions.js
2014-04-23 15:10:42 -03:00
Gustavo Cortez
68fd916053 Get transactions of all addresses (the generated and the changes). Do not repeat txids on the front-end 2014-04-23 03:37:17 -03:00
Matias Alejo Garcia
b6280348e5 reject button working 2014-04-23 02:01:54 -03:00
Gustavo Cortez
df9b26fdde List of transactions by address associated to wallet 2014-04-23 01:55:00 -03:00
Matias Alejo Garcia
31b2d5abac small fixes 2014-04-22 22:07:44 -03:00
Matias Alejo Garcia
4092f0cb9d works sometimes 2014-04-22 22:07:44 -03:00
Manuel Aráoz
5f66a179c9 Merge pull request #121 from matiu/feature/ux13
Feature/ux13
2014-04-21 13:18:16 -03:00
Ryan X. Charles
ace128dfe9 Merge pull request #120 from maraoz/feature/ux-fixes
Feature/ux fixes
2014-04-21 13:16:57 -03:00
Matias Alejo Garcia
2fc3a8e8fa safe unspent 2014-04-21 12:41:48 -03:00
Matias Alejo Garcia
0523d99eda add getUsedUnspent to txproposals 2014-04-21 12:37:39 -03:00
Manuel Araoz
9779d5f6df improving UI and wording for signing page 2014-04-21 12:17:15 -03:00
Gustavo Cortez
8aa4a69e00 More descriptive message when Insight return an error. 2014-04-21 11:49:19 -03:00
Matias Alejo Garcia
7f20106d71 fix callback in sent 2014-04-21 11:28:25 -03:00
Matias Alejo Garcia
85098bebbb remove console.logs 2014-04-21 07:30:46 -03:00
Matias Alejo Garcia
dcd903904e multiple ux fixes 2014-04-21 07:28:11 -03:00
Matias Alejo Garcia
616429a355 fixes in ux 2014-04-20 21:53:54 -03:00
Matias Alejo Garcia
17431e29c5 fix set sent 2014-04-20 21:24:02 -03:00
Gustavo Maximiliano Cortez
581be08a9e Merge pull request #106 from matiu/feature/ux9
more work on Tx
2014-04-20 20:42:37 -03:00
Matias Alejo Garcia
a1b00dcd05 more work on Tx 2014-04-20 20:24:24 -03:00
Ryan X. Charles
0eaaa6bab7 Merge pull request #102 from matiu/feature/ux8
better sync for peers
2014-04-20 17:29:29 -03:00
Matias Alejo Garcia
fe0cccd801 better sync for peers 2014-04-20 17:16:21 -03:00
Ryan X. Charles
3215d341bb Merge pull request #100 from matiu/feature/ux7
fix firefox / timing in connection
2014-04-20 16:52:53 -03:00
Matias Alejo Garcia
a3dffc65ef better broadcast schema 2014-04-20 16:34:46 -03:00
Matias Alejo Garcia
019e841b31 fix firefox / timing in connection 2014-04-20 16:16:09 -03:00
Ryan X. Charles
91c068ab38 Merge pull request #94 from ryanxcharles/feature/command-line-4
WIP: Command Line #4: encryption and decryption working for File
2014-04-20 12:52:28 -03:00
Matias Alejo Garcia
6e07d64832 fixes in networking 2014-04-20 12:41:28 -03:00
Matias Alejo Garcia
ea7f747e83 fix wallet 2014-04-19 11:23:24 -03:00
Matias Alejo Garcia
04d7d5abf0 send tx 2014-04-19 11:23:24 -03:00
Ryan X. Charles
0020faa84a get LocalEncrypted working the same way as File 2014-04-18 19:19:38 -03:00
Manuel Araoz
695f3a205d remove console.logs 2014-04-18 18:39:09 -03:00
Manuel Araoz
4ba65dd4e1 automatic peer discovery 2014-04-18 18:25:51 -03:00
Ryan X. Charles
f599331351 use base64 for export 2014-04-18 17:48:47 -03:00
Ryan X. Charles
9246ae175f encryption and decryption working for File 2014-04-18 17:35:32 -03:00
Manuel Araoz
d62dbeffca WIP for automatic network join 2014-04-18 14:40:40 -03:00
Matias Alejo Garcia
b2508b7195 fix wallet updates 2014-04-18 13:20:35 -03:00
Manuel Aráoz
cf4140ab2b Merge pull request #89 from matiu/feature/ux2
fix p2p connecting
2014-04-18 11:29:27 -03:00
Matias Alejo Garcia
ba8a0e83d2 fix p2p connecting 2014-04-18 11:19:39 -03:00
Gustavo Cortez
5cd9f7a93b Fix read from backup address. 2014-04-18 11:16:10 -03:00
Manuel Araoz
3e8ca41a0a optimize public key generation for BIP32 with cache 2014-04-17 18:56:44 -03:00
Manuel Araoz
5847d6aff2 optimize PrivateKey with cache 2014-04-17 18:56:44 -03:00
Ryan X. Charles
4681783231 add setFromObj to FakeStorage - and fix publicKeyring capitalization
...to fix tests
2014-04-17 18:55:17 -03:00
Manuel Aráoz
9319c7f93f Merge pull request #84 from ryanxcharles/feature/wallet-file-consistency
WIP: add setFromObj and getEncryptedObj to storage classes
2014-04-17 18:35:08 -03:00
Gustavo Maximiliano Cortez
d34dfc746c Merge pull request #85 from colkito/feature/wallet-backup-support
Feature/wallet backup support
2014-04-17 18:21:56 -03:00
Matias Alejo Garcia
1954978202 parse output TX to show before signing (WIP) 2014-04-17 18:06:09 -03:00
Mario Colque
2c0b733025 fix conflicts 2014-04-17 18:05:26 -03:00
Ryan X. Charles
69c5c3bc2e add setFromObj and getEncryptedObj to storage classes
This is so that you can export the file from the browser and use the same file
in the wallet file from the command-line. I have made encryption work
equivalently between the browser and node.
2014-04-17 18:04:56 -03:00
Mario Colque
2838b3ecd2 added support for the wallet backups 2014-04-17 18:02:20 -03:00
Matias Alejo Garcia
5eca1a63c2 filter out change address. Better refresh 2014-04-17 17:22:50 -03:00
Matias Alejo Garcia
f9ee67b548 clean config for peerjs 2014-04-17 17:10:32 -03:00
Matias Alejo Garcia
b79aefefee remove logs 2014-04-17 17:07:30 -03:00