Commit Graph

17 Commits

Author SHA1 Message Date
Gustavo Cortez 2454d930fa Merge branch 'master' into feature/socket-io-support
Fix conflicts:
	js/app.js
	js/controllers/signin.js
2014-04-17 11:58:11 -03:00
Matias Alejo Garcia a8d85adc84 fix uxrefresh with new #setup 2014-04-17 11:46:49 -03:00
Gustavo Cortez 7d52f8487b Merge branch 'master' into feature/socket-io-support
Fixed conflicts on:
	index.html
	js/app.js
2014-04-17 00:43:50 -03:00
Gustavo Cortez 4865513c21 Socket-io integration. Using a local socket.io.js file. 2014-04-17 00:36:08 -03:00
Manuel Araoz 8478402237 add wallet setup view (not integrated) 2014-04-16 21:45:06 -03:00
Matias Alejo Garcia 536fe90431 new WalletFactory 2014-04-16 17:51:42 -03:00
Matias Alejo Garcia eff20ec49a mocha test working again 2014-04-15 12:17:28 -03:00
Mario Colque c08eda28ab added support for localstorage 2014-04-01 18:22:07 -03:00
Gustavo Cortez 4cd48b7bb2 integrate new name and header. Signin/signout flow 2014-03-31 12:48:35 -03:00
Ryan X. Charles 7176e49509 rename cosign -> copay throughout code
Also, "cosigners" becomes "copayers"
2014-03-28 14:12:56 -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
Gustavo Cortez 94831dbd1f From Bootstrap to Foundation. Removed bootstrap dependencies. Added foundation-angular. 2014-03-27 12:07:10 -03:00
Gustavo Cortez f325b42989 forms, example values, qr generator 2014-03-26 17:56:11 -03:00
Gustavo Cortez 7bef363585 creating basic controllers 2014-03-26 09:18:42 -03:00
Mario Colque 4503caadd6 added the initial header controller 2014-03-25 11:35:04 -03:00
Mario Colque abee376568 move all files to root path 2014-03-21 14:21:13 -03:00