BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
558 Commits 8 Branches 122 Tags 162 MiB
Commit Graph

283 Commits

Author SHA1 Message Date
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 6cf8988eae fix "hello" for authenticated peers 2014-04-30 14:28:33 -03:00
Matias Alejo Garcia ab12832126 remove unused keyCache 2014-04-30 13:35:50 -03:00
Matias Alejo Garcia d3151cc88b same key for everyone 2014-04-30 13:02:40 -03:00
Matias Alejo Garcia 2dc59de87e add random key for network encryption 2014-04-30 12:58:40 -03:00
Matias Alejo Garcia 65698e7e45 add cache for keys 2014-04-30 11:04:33 -03:00
Matias Alejo Garcia 50d37aa22e implements authenticated encryption 2014-04-30 11:04:16 -03:00
Manuel Araoz 58b7204cd5 fix routes 2014-04-30 00:21:24 -03:00
Manuel Araoz 93620fa6c0 remove peer tab 2014-04-29 19:30:27 -03:00
Manuel Araoz a9eb53e90f various style and wording fixes 2014-04-29 19:30:26 -03:00
Manuel Aráoz 46a5edf9f7 Merge pull request #206 from matiu/feature/rm-encryption-and-signing 
removes encryption and signing. Relays on webrtc DTS. Keep authenticatio...
 2014-04-28 15:20:28 -03:00
Matias Alejo Garcia 8138eaed7b change locking order 2014-04-28 15:15:09 -03:00
Matias Alejo Garcia 830b6d2b5f removes encryption and signing. Relays on webrtc DTS. Keep authentication 2014-04-28 15:02:24 -03:00
Mario Colque 9a2b3e4b17 Merge pull request #201 from maraoz/bug/turn-off-camera 
Turn off video camera on logout
 2014-04-28 12:47:30 -03:00
Mario Colque 2d690e2ead clean up 2014-04-28 12:03:47 -03:00
Mario Colque 47cb4bd3da added a wrapper for the method fromObj of Wallet 2014-04-28 12:02:43 -03:00
Manuel Araoz c89f9528c8 video logout handling 2014-04-28 11:56:44 -03:00
Mario Colque 1168bf82b8 obj syntax 2014-04-28 11:32:02 -03:00
Mario Colque f0911caf63 fixed errors to import/open wallets 2014-04-28 11:22:41 -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
Matias Alejo Garcia 3199c8abcf Merge pull request #195 from cmgustavo/feature/01-theme-support 
Copay Support CSS Style Themes
 2014-04-26 11:28:01 -03:00
Mario Colque 69e1bb8e37 added the import method 2014-04-25 19:12:13 -03:00
Mario Colque 3746a9b878 added a new directive for import backups 2014-04-25 19:11:56 -03:00
Matias Alejo Garcia e46901c369 add update on network events to txproposals 2014-04-25 17:53:19 -03:00
Matias Alejo Garcia 751d86e785 symmetric encryption 2014-04-25 17:39:03 -03:00
Mario Colque 05f41a8e46 added import route 2014-04-25 17:34:38 -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
Gustavo Cortez bbadf97de0 Refresh subscriptions when someone add new address (publickeyring updated event). 2014-04-25 16:19:24 -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
Mario Colque 660285f924 Merge pull request #186 from cmgustavo/feature/01-spinners-buttons 
Feature/01 spinners buttons
 2014-04-25 10:24:10 -03:00
Matias Alejo Garcia e88dc7afb3 peer checking againt by key ring 2014-04-24 23:43:05 -03:00
Gustavo Cortez 278ac28ab2 New order of address: unshift instead push. Revert order of array of address. 2014-04-24 23:23:40 -03:00
Gustavo Cortez 872cfaba68 Added spinner to all buttons 2014-04-24 22:43:19 -03:00
Manuel Araoz aa021125a0 fix style issues 2014-04-24 20:56:36 -03:00
Manuel Araoz d98bc6f2e9 fix merge 2014-04-24 18:59:24 -03:00
Manuel Araoz 97014cdace video works both ways!! 2014-04-24 18:47:59 -03:00
Manuel Araoz f5b8aa7c61 self video working 2014-04-24 18:47:59 -03:00
Manuel Araoz db1cba99fb fix ANGULAR JS PROBLEMMMAADKSKDLALS:DKA:LSDA 2014-04-24 18:44:44 -03:00
Manuel Araoz fbe7a34197 starting with video sync 2014-04-24 18:43:46 -03:00
Matias Alejo Garcia 5fc4ab5101 fix signout 2014-04-24 17:54:43 -03:00
Matias Alejo Garcia 5d30a6abea add wallets nicknames, handle error messages 2014-04-24 16:36:15 -03:00