Commit Graph

114 Commits

Author SHA1 Message Date
Mario Colque 22eab0205b Merge pull request #118 from cmgustavo/feature/06-details
The transactions proposal are order by createdTs
2014-04-21 12:36:28 -03:00
Gustavo Cortez d0821a6215 The transactions proposal are order by createdTs 2014-04-21 12:09:39 -03:00
Ryan X. Charles 99abd2acd1 required number of signatures ... not number of copayers 2014-04-21 12:08:39 -03:00
Mario Colque ded325af46 fix conflict 2014-04-21 11:41:49 -03:00
Matias Alejo Garcia 7f20106d71 fix callback in sent 2014-04-21 11:28:25 -03:00
Mario Colque 319417552a fix conflict 2014-04-21 09:26:33 -03:00
Matias Alejo Garcia 342b9bd937 buttons fix 2014-04-21 07:47:35 -03:00
Matias Alejo Garcia dcd903904e multiple ux fixes 2014-04-21 07:28:11 -03:00
Mario Colque 009d7b75b8 fix conflicts 2014-04-20 22:54:28 -03:00
Ryan X. Charles a50f4cc638 Merge pull request #110 from matiu/feature/ux10
Feature/ux10
2014-04-20 22:20:48 -03:00
Matias Alejo Garcia 616429a355 fixes in ux 2014-04-20 21:53:54 -03:00
Ryan X. Charles 55f26590bc use "info" instead of "warning", which is more pleasant
...and update a typo: signning -> signing
2014-04-20 21:40:03 -03:00
Matias Alejo Garcia 5dc27c2ef4 Merge pull request #107 from cmgustavo/feature/03-details
WIP: reorder main menu. Renamed home for addresses. Fix header titles
2014-04-20 21:22:59 -03:00
Gustavo Cortez 65da9b69c1 sentTs on transaction proposal 2014-04-20 21:19:32 -03:00
Ryan X. Charles 6bfde4735c Merge pull request #105 from cmgustavo/feature/01-details
Feature/01 details
2014-04-20 20:26:03 -03:00
Gustavo Cortez 5267c2ad48 WIP: reorder main menu. Renamed home for addresses. Fix header titles 2014-04-20 20:21:54 -03:00
Gustavo Cortez cb887ca778 Fix navbar menu on small devices 2014-04-20 19:39:16 -03:00
Ryan X. Charles d7333fb981 Merge pull request #104 from cmgustavo/feature/02-details
Improve look&feel of tx list.
2014-04-20 19:30:38 -03:00
Gustavo Cortez 9ab4e2e6d8 Improve look&feel of tx list. 2014-04-20 19:08:04 -03:00
Mario Colque a2be737bad merge 2014-04-20 18:02:15 -03:00
Ryan X. Charles ef88951cf6 fix typos ... add space for formatting clarity 2014-04-20 17:26:54 -03:00
Mario Colque 74f7271310 fix conflicts 2014-04-20 17:18:20 -03:00
Gustavo Cortez 6f0a9499aa Removed "sendTest" link. 2014-04-20 16:21:33 -03:00
Ryan X. Charles 4ea7a2c785 make things easier to install
mv config to root directory, and improve README
2014-04-20 16:06:56 -03:00
Matias Alejo Garcia 6e07d64832 fixes in networking 2014-04-20 12:41:28 -03:00
Matias Alejo Garcia 04d7d5abf0 send tx 2014-04-19 11:23:24 -03:00
Ryan X. Charles 270891b5fd Merge pull request #96 from cmgustavo/feature/send-form
Send form: validation and functionality. Issue in navbar was fixed
2014-04-19 09:38:10 -03:00
Gustavo Cortez 4fff1673cd Send form: validation and functionality. Little issue in navbar was fixed. 2014-04-19 04:55:32 -03:00
Mario Colque 0455d5ee69 refactory of the socket service 2014-04-18 19:08:01 -03:00
Manuel Araoz 4ba65dd4e1 automatic peer discovery 2014-04-18 18:25:51 -03:00
Mario Colque 58a15502d1 clean up peerController 2014-04-18 15:36:38 -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
Matias Alejo Garcia fbede5a903 better tx layout 2014-04-18 11:33:58 -03:00
Gustavo Maximiliano Cortez 5cff5f6b47 Merge pull request #88 from bechi/feature/01-layout-details
layout details
2014-04-18 11:29:53 -03:00
Bechi 4cd9e185e0 layout details 2014-04-18 10:27:32 -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
Mario Colque 2838b3ecd2 added support for the wallet backups 2014-04-17 18:02:20 -03:00
Matias Alejo Garcia 9ead0f69f4 clean up index 2014-04-17 17:10:32 -03:00
Matias Alejo Garcia 1e64031ec3 options for running with local peerJs server. Ux fixes 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia 6627184ebc hide features until wallet isComplete() 2014-04-17 17:07:30 -03:00
Matias Alejo Garcia fc7354e93a import option (not working yet) 2014-04-17 14:28:50 -03:00
Matias Alejo Garcia 9733305aea ux fixes 2014-04-17 13:43:42 -03:00
Matias Alejo Garcia a51ed6c66d fix walletID list 2014-04-17 13:43:42 -03:00
Matias Alejo Garcia e28be27bf3 better signin page 2014-04-17 13:43:42 -03:00
Gustavo Cortez 2454d930fa Merge branch 'master' into feature/socket-io-support
Fix conflicts:
	js/app.js
	js/controllers/signin.js
2014-04-17 11:58:11 -03:00
Gustavo Cortez e18599481e Update balance below qr-code when select an address. 2014-04-17 11:52:42 -03:00
Gustavo Maximiliano Cortez 73d5266a89 Merge pull request #77 from matiu/bug/fix-uxrefresh
fix uxrefresh with new #setup - awesome!!
2014-04-17 11:49:02 -03:00