Commit Graph

194 Commits

Author SHA1 Message Date
Mario Colque 018e248dd1 adde ruturn to signin if we not select a wallet before 2014-05-01 16:32:02 -03:00
Mario Colque 9d27a0b85d added password support to UI/Controllers 2014-05-01 16:32:01 -03:00
Mario Colque bbf9a9c4d5 added PasswordController 2014-05-01 16:32:01 -03:00
Gustavo Cortez 7f63d3e1f9 Commented unnecessary digest. 2014-05-01 16:21:48 -03:00
Matias Alejo Garcia 84637bd12d fix conflicts 2014-05-01 11:04:21 -03:00
Matias Alejo Garcia 1e8895f4b8 fix conflics 2014-05-01 09:58:56 -03:00
Gustavo Cortez ef6385ac65 Fix Conflicts:
css/main.css
2014-05-01 09:32:21 -03:00
Manuel Aráoz de7a7d99a0 Merge pull request #241 from cmgustavo/feature/06-new-design
Setup page based on new design #228
2014-04-30 20:22:02 -03:00
Manuel Araoz fd9e6cb48a refactor isChange logic 2014-04-30 20:02:20 -03:00
Manuel Araoz 4acb32c3d8 optimizing address page 2014-04-30 19:58:52 -03:00
Gustavo Cortez 96f41c4e00 Setup page based on #228 2014-04-30 18:47:44 -03:00
Gustavo Cortez e24a88dca1 Merge branch 'master' into feature/05-new-design
Conflicts:
	js/services/video.js
2014-04-30 16:14:36 -03:00
Gustavo Cortez fa2d40bdad Initial page. Signin. 2014-04-30 16:11:55 -03:00
Matias Alejo Garcia 2dc59de87e add random key for network encryption 2014-04-30 12:58:40 -03:00
Manuel Araoz 93620fa6c0 remove peer tab 2014-04-29 19:30:27 -03:00
Mario Colque 380014a280 Merge pull request #196 from matiu/feature/encryption
Feature/encryption
2014-04-28 09:22:32 -03:00
Matias Alejo Garcia d08d0aa875 Merge pull request #197 from colkito/feature/import-backups
Feature/import backups
2014-04-26 11:31:58 -03:00
Mario Colque 69e1bb8e37 added the import method 2014-04-25 19:12:13 -03:00
Matias Alejo Garcia e46901c369 add update on network events to txproposals 2014-04-25 17:53:19 -03:00
Mario Colque bc77fabba9 Added import angularjs controller 2014-04-25 17:34:24 -03:00
Gustavo Cortez 08e4eaf5e0 CSS Style themes support in Copay 2014-04-25 17:22:51 -03:00
Mario Colque 6cb1b5a851 Merge pull request #188 from matiu/feature/peer-checking
Feature/peer checking
2014-04-25 10:27:06 -03:00
Matias Alejo Garcia e88dc7afb3 peer checking againt by key ring 2014-04-24 23:43:05 -03:00
Gustavo Cortez 872cfaba68 Added spinner to all buttons 2014-04-24 22:43:19 -03:00
Matias Alejo Garcia 5d30a6abea add wallets nicknames, handle error messages 2014-04-24 16:36:15 -03:00
Gustavo Cortez 25e162770a Clear all notifications when sign out. 2014-04-24 14:57:54 -03:00
Matias Alejo Garcia 6ace16e20d peer authentication 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia 08fa60d41c hashing working 2014-04-24 11:58:41 -03:00
Gustavo Maximiliano Cortez e69032e951 Merge pull request #139 from colkito/feature/angularjs-tests
Feature/angularjs tests
2014-04-23 15:21:11 -03:00
Mario Colque 7d018389c3 Merge pull request #138 from cmgustavo/feature/06-send-form
AngularJS directives to handle notification and form validation.
2014-04-23 15:16:26 -03:00
Gustavo Cortez e17aed54b0 Fix conflicts:
js/controllers/transactions.js
2014-04-23 15:10:42 -03:00
Mario Colque 4db0a28df0 moved bitcore into angular controller 2014-04-23 14:56:03 -03:00
Gustavo Cortez 014b7310f4 AngularJS directives to handle notification and form validation.
1) Checking enough amount at real-time when typing value.
2) Common notifications disappear after 5 seconds.
2014-04-23 13:16:20 -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 3c7c24de49 fix ux issues. tx sending working 2014-04-22 23:07:20 -03:00
Matias Alejo Garcia 4092f0cb9d works sometimes 2014-04-22 22:07:44 -03:00
Matias Alejo Garcia 10dbc073f4 Merge pull request #122 from colkito/fix/remove-unnecessary-peer
removed unnecessary peers files
2014-04-22 21:24:58 -03:00
Ryan X. Charles 37c20b47ac Merge pull request #124 from colkito/fix/angularjs-digest-issue
removed a updateBalance call from header.js
2014-04-22 18:29:51 -03:00
Gustavo Cortez 294c086913 Fix: check if available to spend is enought to send money 2014-04-22 16:21:14 -03:00
Mario Colque 637c9719f9 removed a updateBalance call from header.js 2014-04-22 15:47:09 -03:00
Mario Colque d379c47032 removed unnecessary peers files 2014-04-21 17:01:24 -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 2fbd075206 available address 2014-04-21 13:16:15 -03:00
Matias Alejo Garcia 2fc3a8e8fa safe unspent 2014-04-21 12:41:48 -03:00
Mario Colque 8df747001c Merge pull request #115 from cmgustavo/bug/01-send-form
check if your balance is enough to send money
2014-04-21 12:35:34 -03:00
Manuel Araoz 9779d5f6df improving UI and wording for signing page 2014-04-21 12:17:15 -03:00
Mario Colque ded325af46 fix conflict 2014-04-21 11:41:49 -03:00
Gustavo Cortez e03b0db150 check if your balance is enough to send money 2014-04-21 11:34:08 -03:00
Mario Colque e928ca2b81 several improvements 2014-04-21 11:32:51 -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 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
Ryan X. Charles 9d149b8394 another typo 2014-04-20 22:05:25 -03:00
Matias Alejo Garcia 616429a355 fixes in ux 2014-04-20 21:53:54 -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 Maximiliano Cortez 581be08a9e Merge pull request #106 from matiu/feature/ux9
more work on Tx
2014-04-20 20:42:37 -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
Matias Alejo Garcia a1b00dcd05 more work on Tx 2014-04-20 20:24:24 -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
Mario Colque a2be737bad merge 2014-04-20 18:02:15 -03:00
Mario Colque 74f7271310 fix conflicts 2014-04-20 17:18:20 -03:00
Matias Alejo Garcia fe0cccd801 better sync for peers 2014-04-20 17:16:21 -03:00
Gustavo Cortez 6f0a9499aa Removed "sendTest" link. 2014-04-20 16:21:33 -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 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
Mario Colque 58a15502d1 clean up peerController 2014-04-18 15:36:38 -03:00
Mario Colque e5a4e3c25c modev wallet validation from all controllers to router 2014-04-18 15:22:02 -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
Matias Alejo Garcia ba8a0e83d2 fix p2p connecting 2014-04-18 11:19:39 -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 5eca1a63c2 filter out change address. Better refresh 2014-04-17 17:22:50 -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
Gustavo Cortez f55d243bed Refactory get balance 's methods 2014-04-17 16:42:27 -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 8ab479691d Cleaning controllers. Also call connect socket-ii in all pages. Everything work! 2014-04-17 13:25:36 -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 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
Matias Alejo Garcia a8d85adc84 fix uxrefresh with new #setup 2014-04-17 11:46:49 -03:00
Gustavo Cortez dd62ab16d1 Fix balance value when sign out (a wallet with btc) and create a new wallet (this showed value of the previous wallet) 2014-04-17 11:23:04 -03:00
Gustavo Cortez 9fdb04e868 Fixed socke-emit-on
Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js
2014-04-17 11:11:17 -03:00
Mario Colque b95af5e53a fix conflicts 2014-04-17 09:35:46 -03:00
Gustavo Cortez eaa1bc37e0 Initial getBalance of all your addresses. Socket-io that listening if your address receives btc.
Known bug: if you add new the address you can to recall socket-io. Socket-io should be listening on headerController.
2014-04-17 06:43:30 -03:00