Commit Graph

522 Commits

Author SHA1 Message Date
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
Bechi 64cde1378e fix conflict 2014-04-29 16:39:54 -03:00
Bechi b3506b80cd item tx new style 2014-04-29 16:34:40 -03:00
Matias Alejo Garcia 3ab70993cc Merge pull request #214 from cmgustavo/feature/02-new-design
Feature/02 new design
2014-04-29 15:29:58 -03:00
Gustavo Cortez cf2a010307 Addresses TAB: if no address, show only button. 2014-04-29 15:17:14 -03:00
Gustavo Cortez 50ebb2757b Fixes header. Mobile support 2014-04-29 14:24:26 -03:00
Manuel Aráoz b13287870f Merge pull request #211 from cmgustavo/feature/01-new-design
New design: footer and header schemas
2014-04-29 11:59:05 -03:00
Gustavo Cortez b523c9373e New design: footer and header schemas 2014-04-29 11:56:37 -03:00
Mario Colque 0e63d8a220 Merge pull request #209 from cmgustavo/bug/01-css-templates
Little fixes: html and templates config support.
2014-04-29 10:56:25 -03:00
Gustavo Cortez 0010c0f688 Little fixes: html and templates config support. 2014-04-29 09:52:28 -03:00
Manuel Aráoz 8509820f00 Merge pull request #208 from bechi/feature/header-ns
header new style
2014-04-28 17:33:55 -03:00
Bechi 7bde3815ca header new style 2014-04-28 17:23:01 -03:00
Gustavo Maximiliano Cortez e28831e01a Merge pull request #205 from martindale/npm-managed-tests
Allow NPM to Manage Tests
2014-04-28 16:32:38 -03:00
Manuel Aráoz 383bc4e136 Merge pull request #207 from cmgustavo/bug/02-travis
Bug/02 travis
2014-04-28 15:30:02 -03:00
Gustavo Cortez 4a35a8b016 git instead https. 2014-04-28 15:28:01 -03:00
Gustavo Cortez 306e8bc27a Fix: travis.yml and package.json 2014-04-28 15:24:27 -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
Eric Martindale 9d759d3163 Add test command to package.json. 2014-04-28 14:12:14 -04: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 0670060419 Merge pull request #204 from cmgustavo/bug/travis
fix config for travis
2014-04-28 13:12:33 -03:00
Gustavo Cortez ca720818bc fix config of travis 2014-04-28 12:55:36 -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
Matias Alejo Garcia f0571fb67a Merge pull request #203 from colkito/fix/walletfactory-formobj-toobj-tests
Fix/walletfactory formobj toobj tests
2014-04-28 12:32:30 -03:00
Mario Colque f154f77a02 added test for the methods fromObj and toObj of WalletFactory 2014-04-28 12:28:55 -03:00
Gustavo Maximiliano Cortez b48118e3cf Travis: badge of honor 2014-04-28 12:11:55 -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
Manuel Araoz 274e39e2cd change index.html wording 2014-04-28 11:56:43 -03:00
Matias Alejo Garcia a53d5292a7 Merge pull request #200 from colkito/fix/wallet-form-obj
fixed errors to import/open wallets
2014-04-28 11:32:28 -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