Commit Graph

858 Commits

Author SHA1 Message Date
Matias Alejo Garcia ad8f958fea remove resource (unused) 2014-05-15 18:01:39 -03:00
Mario Colque 7a9e18023d Merge pull request #385 from matiu/feature/txprposal-limit
Feature/txprposal limit
2014-05-15 17:58:48 -03:00
Matias Alejo Garcia c06724ad2a Merge pull request #386 from colkito/fix/webapp-generator-script
fixed path errors in generator script util
2014-05-15 17:55:47 -03:00
Mario Colque 84bd5ed856 fixed path errors in generator script util 2014-05-15 17:53:02 -03:00
Matias Alejo Garcia 5154dc7085 broadcast txproposal 1 by 1 2014-05-15 17:43:41 -03:00
Manuel Aráoz ff00d5f4f2 Merge pull request #384 from colkito/fix/peerjs-settings
settings form improved
2014-05-15 17:06:27 -03:00
Manuel Aráoz 3694ea7aa0 Merge pull request #383 from colkito/fix/cleanup-root-path
removed unnecessary concat.sh
2014-05-15 17:04:09 -03:00
Mario Colque bbff716c65 settings form improved 2014-05-15 16:58:15 -03:00
Gustavo Maximiliano Cortez 3f2245827e Merge pull request #380 from colkito/fix/peerjs-settings
Fix/peerjs settings
2014-05-15 16:45:09 -03:00
Mario Colque fa2dbf4fa3 removed unnecessary concat.sh 2014-05-15 16:44:28 -03:00
Matias Alejo Garcia d8c3d08582 merge 2014-05-15 16:39:22 -03:00
Matias Alejo Garcia b94aaa69fe Merge pull request #381 from maraoz/fix/tx-proposal-list
always show all copayers in tx proposal list
2014-05-15 16:23:01 -03:00
Manuel Araoz 0dfac71bfe always show all copayers in tx proposal list 2014-05-15 16:13:03 -03:00
Manuel Aráoz e8365f3cd5 Merge pull request #379 from yemel/fix/ui-wallets-list
sort wallet list and fix display for unnamed wallets
2014-05-15 15:39:36 -03:00
Mario Colque 89b3453d4c little label fix 2014-05-15 15:34:53 -03:00
Mario Colque 3a215916b8 merge 2014-05-15 15:31:54 -03:00
Mario Colque c460b30872 Merge pull request #378 from cmgustavo/bug/html5-alert
fixes html5 alert
2014-05-15 15:29:51 -03:00
Mario Colque ea065282c1 added PeerJS settings 2014-05-15 15:25:58 -03:00
Yemel Jardi c2fb4217ce sort wallet list and fix display for unnamed wallets 2014-05-15 11:22:53 -07:00
Gustavo Cortez c958b8e7a8 fixes html5 alert: if you have 1 tx pending and you reject or sign it, then does not appear the alert of the next one. 2014-05-15 12:51:52 -03:00
Matias Alejo Garcia 926bb953bd Merge pull request #377 from cmgustavo/feature/html5-notifications
Feature/html5 notifications
2014-05-15 11:10:31 -03:00
Gustavo Cortez 89b2788e39 Fixes: suggestions by @matiu 2014-05-15 10:41:42 -03:00
Gustavo Cortez 82abcb8036 Fix Conflicts:
css/main.css
2014-05-15 02:16:55 -03:00
Gustavo Cortez 2dc5513592 HTML5 Notification support on chrome 2014-05-15 02:13:25 -03:00
Gustavo Cortez 19573dc327 Improve tx counter notification: not show if you sign, reject or if it is your tx proposal. 2014-05-15 02:12:14 -03:00
Matias Alejo Garcia 63210ba277 fix in version checking 2014-05-15 00:02:58 -03:00
Matias Alejo Garcia 2e99d9a8ea add version to networking 2014-05-15 00:02:58 -03:00
Matias Alejo Garcia 81c56d0a41 fix tests 2014-05-15 00:02:25 -03:00
Matias Alejo Garcia 432f74488a change name to bitcore.HierarchicalKey 2014-05-15 00:02:25 -03:00
Matias Alejo Garcia 4ddfc65a2b Merge pull request #371 from colkito/feature/chrome-extension
Feature/chrome extension
2014-05-14 21:17:53 -03:00
Matias Alejo Garcia 2c24591ee3 Merge pull request #370 from yemel/fix/bad-secret-handling
add validation to wallet secret
2014-05-14 19:09:10 -03:00
Mario Colque db09ebc353 chrome extension installation steps 2014-05-14 18:43:25 -03:00
Mario Colque cb54a09b5b fix generator script 2014-05-14 18:32:24 -03:00
Yemel Jardi 9d5f2ddf16 add validation to wallet secret 2014-05-14 14:31:47 -07:00
Mario Colque bca35f8139 moved generator script to util path 2014-05-14 18:08:49 -03:00
Mario Colque a532fbb014 new version of app generator script 2014-05-14 17:58:57 -03:00
Mario Colque 83718717d3 added chrome-extension tmp path 2014-05-14 17:40:19 -03:00
Mario Colque bab659cd6b new bitcore bower package 2014-05-14 17:36:34 -03:00
Mario Colque afadb4128a added chrome:// to whitelist 2014-05-14 17:20:03 -03:00
Mario Colque 01bbe55589 changed label 2014-05-14 17:19:04 -03:00
Mario Colque 452ec3e2d1 added bitcore bower 2014-05-14 17:15:01 -03:00
Manuel Araoz ba335932aa remove copayerID from UI 2014-05-14 15:42:05 -03:00
Mario Colque 7c46ec1d1e added chrome extension files 2014-05-14 11:27:18 -03:00
Mario Colque b9893f7b4a added manifest.json for chrome extension 2014-05-14 11:25:00 -03:00
Gustavo Maximiliano Cortez eedfdcfaa1 Merge pull request #360 from maraoz/optimize/many-addresses
Optimize for many addresses
2014-05-13 15:20:10 -03:00
Gustavo Maximiliano Cortez b7bde5d749 Merge pull request #365 from colkito/feature/settings-page
Feature/settings page
2014-05-13 15:12:24 -03:00
Manuel Aráoz d35aef161a Merge pull request #366 from bechi/feature/footer
footer details
2014-05-13 15:06:16 -03:00
Bechi 4c24a292d9 footer details 2014-05-13 14:55:26 -03:00
Mario Colque 874f60043d merge 2014-05-13 14:30:45 -03:00
Mario Colque 8325c2b02a fix conflicts 2014-05-13 14:29:17 -03:00