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

558 Commits

Author SHA1 Message Date
Matias Alejo Garcia 6b75dd8ddb nicknames 2014-05-01 09:58:56 -03:00
Matias Alejo Garcia 1e8895f4b8 fix conflics 2014-05-01 09:58:56 -03:00
Matias Alejo Garcia b2f377da18 Merge pull request #240 from cmgustavo/feature/05-new-design 
Feature/05 new design
 2014-05-01 09:45:19 -03:00
Gustavo Cortez 2b16903515 Fix position logo. 2014-05-01 09:42:31 -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 Aráoz eb1aaf679c Merge pull request #243 from maraoz/optimize/addresses 
Optimize address tab, with lazy loading
 2014-04-30 20:21:13 -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 bf90bdda9e Cleaning code. 2014-04-30 16:49:26 -03:00
Gustavo Cortez 2bd7242308 Fixes conflicts in index.html 2014-04-30 16:32:07 -03:00
Gustavo Maximiliano Cortez 1a34f53a57 Merge pull request #239 from bechi/feature/01-item-tx-ns 
Feature/01 item tx ns // #231
 2014-04-30 16:24:02 -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
Bechi 141d0d6bcc last transactions 2014-04-30 16:11:50 -03:00
Bechi df66911299 Merge branch 'master' into feature/01-item-tx-ns 2014-04-30 15:00:19 -03:00
Bechi 2bd1ed6608 copayers status 2014-04-30 14:59:20 -03:00
Ryan X. Charles d30ff4ee68 Merge pull request #237 from matiu/feature/autheticated-encrption-AES/CCM-Mode-5 
Feature/autheticated encrption aes/ccm mode 5
 2014-04-30 13:48:13 -04:00
Matias Alejo Garcia c688e0a7b3 fix tests 2014-04-30 14:31:19 -03:00
Matias Alejo Garcia 6cf8988eae fix "hello" for authenticated peers 2014-04-30 14:28:33 -03:00
Matias Alejo Garcia 8c72476857 fix index 2014-04-30 14:14:43 -03:00
Ryan X. Charles 60b49fee1b use svg for logo so it looks god on retina display 2014-04-30 14:10:04 -03:00
Matias Alejo Garcia 2e44a8c047 fix tpl-default 2014-04-30 14:08:30 -03:00
Matias Alejo Garcia 404e244b03 fix index 2014-04-30 14:05:07 -03:00
Matias Alejo Garcia c624f45d25 rm bitcore 2014-04-30 13:57:55 -03:00
Matias Alejo Garcia 79b72f8eec fix css 2014-04-30 13:57:13 -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 add1b084cc fix json 2014-04-30 11:07:44 -03:00
Matias Alejo Garcia adb459887e add sjcl bundle to the repo to fix its bower dist 2014-04-30 11:04:59 -03:00
Bechi 7a872956b4 item tx new style 2014-04-30 11:04:49 -03:00
Matias Alejo Garcia f4f5209af7 add cache for keys 2014-04-30 11:04: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
Matias Alejo Garcia e9dbf341fc Merge pull request #225 from maraoz/fix/routes 
fix routes
 2014-04-30 07:36:51 -03:00
Manuel Araoz 58b7204cd5 fix routes 2014-04-30 00:21:24 -03:00
Matias Alejo Garcia 99555dfa55 Merge pull request #216 from maraoz/misc/various 
small changes
 2014-04-29 23:41:12 -03:00
Matias Alejo Garcia f4eb3e9087 Merge pull request #220 from ryanxcharles/feature/svg-logo 
use svg for logo so it looks good on retina display
 2014-04-29 23:18:14 -03:00
Matias Alejo Garcia ba6f15b432 Merge pull request #221 from maraoz/UI/footer-video 
Video is now in footer, peers tab removed
 2014-04-29 23:17:53 -03:00
Matias Alejo Garcia 4e8a354bdb Merge pull request #223 from cmgustavo/feature/03-new-design 
Fixes transaction list
 2014-04-29 19:49:39 -03:00
Gustavo Cortez 3a81f391e5 Fixes transaction list 2014-04-29 19:43:38 -03:00
Manuel Araoz d0c408553d merge conflicts 2014-04-29 19:31:59 -03:00
Manuel Araoz 93620fa6c0 remove peer tab 2014-04-29 19:30:27 -03:00
Manuel Araoz fb8a52fd6a basic video footer 2014-04-29 19:30:27 -03:00
Manuel Araoz a9eb53e90f various style and wording fixes 2014-04-29 19:30:26 -03:00
Ryan X. Charles 8dbaea557b use svg for logo so it looks god on retina display 2014-04-29 18:25:41 -04:00
Manuel Araoz e14654cd80 small changes 2014-04-29 17:44:35 -03:00
Gustavo Maximiliano Cortez 1f2d050700 Merge pull request #215 from bechi/feature/item-tx-ns 
Feature/item tx ns
 2014-04-29 17:40:00 -03:00