Commit Graph

773 Commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez 66c1588fef Merge pull request #392 from yemel/fix/handle-sudden-disconnection
Fix/handle sudden disconnection
2014-05-16 09:42:51 -03:00
Gustavo Maximiliano Cortez 914958302c Merge pull request #368 from maraoz/remove/copayer-ID
remove copayerID from UI
2014-05-16 09:42:30 -03:00
Gustavo Maximiliano Cortez a5a4380439 Merge pull request #391 from colkito/fix/script-generator-path
fixed script generator path
2014-05-16 09:34:20 -03:00
Yemel Jardi 190185ac9c handle the PeerID-already-in-use error and display a friendly message 2014-05-15 17:17:44 -07:00
Yemel Jardi f4f060a45b add logout callback on beforeunload 2014-05-15 17:17:44 -07:00
Mario Colque d930de4d55 merge 2014-05-15 20:35:33 -03:00
Mario Colque 48fd0f6fbb Merge pull request #390 from cmgustavo/bug/01-travis
Trying to fix Travis: run grunt before mocha script
2014-05-15 20:33:10 -03:00
Gustavo Cortez 4c8c2b4125 . 2014-05-15 18:50:53 -03:00
Mario Colque cd27cde101 fixed script generator path 2014-05-15 18:47:14 -03:00
Gustavo Cortez 4eaceb92b4 Trying to fix Travis: run grunt before mocha script 2014-05-15 18:42:36 -03:00
Gustavo Maximiliano Cortez 8461a585ad Merge pull request #389 from colkito/fix/added-version-webapp
added version.js to webapp/chrome extension
2014-05-15 18:31:51 -03:00
Mario Colque a79f5432de added version.js to webapp/chrome extension 2014-05-15 18:25:50 -03:00
Mario Colque 1bfaf86823 Merge pull request #388 from cmgustavo/bug/import-form
Fixes import backup form
2014-05-15 18:09:25 -03:00
Mario Colque aa8cd54fd7 Merge pull request #387 from matiu/bug/fix-index
remove resource (unused)
2014-05-15 18:07:07 -03:00
Gustavo Cortez 11f18a9d30 Fixes import backup form 2014-05-15 18:02:21 -03:00
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