Commit Graph

64 Commits

Author SHA1 Message Date
Matias Alejo Garcia 96e9882a62 fix after comments 2014-04-04 19:39:21 -03:00
Ryan X. Charles cea03f540b Merge pull request #19 from colkito/fix/p2p-connections
Fix/p2p connections
2014-04-04 18:12:03 -04:00
Ryan X. Charles 1619fe7f07 Merge pull request #18 from matiu/feature/PublicKeyRing
Feature/public key ring
2014-04-04 17:50:26 -04:00
Mario Colque fbe0b838cd merge 2014-04-04 18:30:27 -03:00
Mario Colque 5b8b000c3d several improvements to p2p connections 2014-04-04 18:29:32 -03:00
Matias Alejo Garcia 7492599552 public key ring, symmetric for all holders 2014-04-04 17:16:10 -03:00
Matias Alejo Garcia 1779d9e7c6 merge 2014-04-04 15:58:10 -03:00
Matias Alejo Garcia d33cf4a751 change Wallet to PublicKeyRing 2014-04-04 15:57:28 -03:00
Ryan X. Charles ebac50a595 Merge pull request #17 from bechi/feature/backup-page
backup page
2014-04-03 15:48:03 -04:00
Bechi 0d1263305c backup page 2014-04-03 16:32:17 -03:00
Ryan X. Charles 5356dc21fd Merge pull request #15 from colkito/feature/localstorage-support
added support for localstorage
2014-04-01 19:39:21 -04:00
Mario Colque c08eda28ab added support for localstorage 2014-04-01 18:22:07 -03:00
Ryan X. Charles c9cd7b6eda Merge pull request #14 from bechi/fix/fonts
fix #10 remove google fonts
2014-04-01 11:18:33 -04:00
Bechi b496f91b69 fix #10 remove google fonts 2014-04-01 12:16:33 -03:00
Ryan X. Charles 910906664c Merge pull request #13 from colkito/feature/multipeers-support
Feature/multipeers support
2014-03-31 18:16:55 -04:00
Mario Colque 0172223bd8 fix conflicts 2014-03-31 18:28:59 -03:00
Ryan X. Charles 9ec6e65e18 Merge pull request #12 from bechi/feature/join-page
logo + new button style + join-page
2014-03-31 17:14:12 -04:00
Bechi b82c72a539 logo + new button style + join-page 2014-03-31 18:06:44 -03:00
Mario Colque 92f4422841 fix conflicts 2014-03-31 18:05:35 -03:00
Mario Colque 99b81128fd Added the multipeer connections support 2014-03-31 16:48:43 -03:00
Ryan X. Charles dd7aee0379 Merge pull request #11 from ryanxcharles/feature/change-tabs-to-spaces-in-css
Change tabs to spaces in CSS
2014-03-31 14:19:50 -04:00
Ryan X. Charles 6d146f436f Change tabs to spaces in CSS 2014-03-31 12:10:11 -04:00
Ryan X. Charles 5aad170bec Merge pull request #9 from cmgustavo/feature/signin-signup-flow
integrate new name and header. Flow of signin/signout. Reorder forms.
2014-03-31 11:59:12 -04:00
Gustavo Cortez 4cd48b7bb2 integrate new name and header. Signin/signout flow 2014-03-31 12:48:35 -03:00
Ryan X. Charles 28247a87c6 Merge pull request #8 from bechi/feature/iconfonts
font + icon
2014-03-28 16:04:09 -04:00
Bechi 064151a6f0 font + icon 2014-03-28 16:39:58 -03:00
Ryan X. Charles c3da9aa26b Merge pull request #7 from ryanxcharles/feature/rename-copay
Rename Cosign -> Copay
2014-03-28 14:28:26 -04:00
Ryan X. Charles 7176e49509 rename cosign -> copay throughout code
Also, "cosigners" becomes "copayers"
2014-03-28 14:12:56 -04:00
Ryan X. Charles dbc0018ad3 Merge pull request #6 from bechi/feature/navbar
header + navbar
2014-03-28 11:43:41 -04:00
Bechi 4168a67b81 header + navbar 2014-03-28 12:32:29 -03:00
Ryan X. Charles c25e7eb00f rename cosign -> copay
We got a cease & desist letter for the name "cosign". We are renaming to copay,
which does not have any relevant trademarks registered and for which we own the
domain name copay.io.
2014-03-28 11:17:46 -04:00
Ryan X. Charles 4fec0ee71d Merge pull request #5 from colkito/feature/peerjs-support
Feature/peerjs support
2014-03-27 17:07:15 -04:00
Mario Colque 64fc2dd22b fix conflicts 2014-03-27 16:43:51 -03:00
Mario Colque 76eadc17cf added PeerJS and initial Network service 2014-03-27 16:31:42 -03:00
Ryan X. Charles b4bd9aafb0 Merge pull request #4 from cmgustavo/feature/foundation
From Bootstrap to Foundation
2014-03-27 14:04:04 -04:00
Gustavo Cortez 2f573cc149 tiny-fix: changed class names. 2014-03-27 14:55:56 -03:00
Matias Alejo Garcia 88d8ad285c createTX to wallet 2014-03-27 12:14:49 -03:00
Gustavo Cortez 94831dbd1f From Bootstrap to Foundation. Removed bootstrap dependencies. Added foundation-angular. 2014-03-27 12:07:10 -03:00
Matias Alejo Garcia cf1732fc44 add getAddresses to return all wallet\'s addresses 2014-03-27 01:18:29 -03:00
Matias Alejo Garcia 6a2e0d82d0 add pubkey sorting 2014-03-26 23:55:46 -03:00
Matias Alejo Garcia b57c1544bb get Script Address for Wallet 2014-03-26 22:00:42 -03:00
Ryan X. Charles fe8ae416ab Merge pull request #1 from cmgustavo/feature/angular-controllers-views-qr
Feature/angular controllers views qr
2014-03-26 20:39:47 -04:00
Gustavo Cortez 7be9cec630 tinyfix: collapse one at a time 2014-03-26 18:07:28 -03:00
Gustavo Cortez f325b42989 forms, example values, qr generator 2014-03-26 17:56:11 -03:00
Matias Alejo Garcia 3bf02173c5 wallet model basic functions (WIP) 2014-03-26 17:55:02 -03:00
Matias Alejo Garcia bd8271d0ec wallet model and test WIP 2014-03-26 15:26:31 -03:00
Gustavo Cortez 7bef363585 creating basic controllers 2014-03-26 09:18:42 -03:00
Gustavo Maximiliano Cortez 7e34253495 Merge pull request #11 from colkito/feature/header-controller
Feature/header controller
2014-03-25 12:26:05 -03:00
Mario Colque a247d82a80 moved network.js to /services/network.js 2014-03-25 12:16:53 -03:00
Mario Colque 4503caadd6 added the initial header controller 2014-03-25 11:35:04 -03:00