Commit graph

452 commits

Author SHA1 Message Date
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
Mario Colque
bea2d6cf78 Merge pull request #183 from matiu/bug/signout
Bug/signout
2014-04-24 17:57:18 -03:00
Matias Alejo Garcia
5fc4ab5101 fix signout 2014-04-24 17:54:43 -03:00
Matias Alejo Garcia
f208e1fc7b add config for bitcore"s server 2014-04-24 17:24:43 -03:00
Mario Colque
9acff3db3f Merge pull request #181 from matiu/walletNames
add wallets nicknames, handle error messages
2014-04-24 16:44:19 -03:00
Matias Alejo Garcia
bd5d654681 Merge pull request #180 from colkito/feature/added-zip-file-for-download-app
added a zip file to download the webapp
2014-04-24 16:41:19 -03:00
Matias Alejo Garcia
5d30a6abea add wallets nicknames, handle error messages 2014-04-24 16:36:15 -03:00
Mario Colque
aaf7adb958 added a zip file to download the webapp 2014-04-24 16:30:10 -03:00
Gustavo Maximiliano Cortez
ca56071453 Merge pull request #179 from colkito/feature/gh-pages-generator
added gh-pages web app generator
2014-04-24 16:08:40 -03:00
Mario Colque
e5f6245c13 Merge pull request #178 from cmgustavo/bug/get-random-id
Function getRandomId: Fix creating new wallet
2014-04-24 16:02:52 -03:00
Mario Colque
edb9b2468e Merge pull request #176 from cmgustavo/bug/01-logout
Clear all notifications when sign out.
2014-04-24 16:01:33 -03:00
Mario Colque
63e137556b added gh-pages web app generator 2014-04-24 15:57:45 -03:00
Gustavo Cortez
5fb32c41b2 Fix return 2014-04-24 15:49:37 -03:00
Gustavo Cortez
92f2edbf65 Function getRandomId: Fix creating new wallet 2014-04-24 15:39:07 -03:00
Gustavo Cortez
25e162770a Clear all notifications when sign out. 2014-04-24 14:57:54 -03:00
Ryan X. Charles
486685f757 Merge pull request #173 from matiu/feature/peer-authentication
Feature/peer authentication
2014-04-24 12:35:58 -03:00
Mario Colque
e2f40ad7f5 Merge pull request #174 from cmgustavo/feature/01-test-directives
Testing directives for AngularJS
2014-04-24 12:16:18 -03:00
Gustavo Cortez
9b56d425aa Testing directives for AngularJS 2014-04-24 12:01:06 -03:00
Matias Alejo Garcia
e56a5c3e1b replace HMAC with bitcore\'s hmac 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia
6ace16e20d peer authentication 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia
08fa60d41c hashing working 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia
c1881d5fbb peerId hashing WIP2 2014-04-24 11:58:41 -03:00
Matias Alejo Garcia
88d758a793 Merge pull request #144 from colkito/fix/mocha-setup-conflicts
compare the type of window in order to avoid nodejs conflicts with test
2014-04-24 11:56:34 -03:00
Mario Colque
2ad86bad9c compare the type of window in order to avoid nodejs conflicts with test 2014-04-24 09:46:18 -03:00
Gustavo Maximiliano Cortez
9bd20bb6e7 Merge pull request #140 from colkito/fix/angularjs-test-services
Fix/angularjs test services
2014-04-23 18:25:55 -03:00
Mario Colque
09532f0aaa added tests for angular services 2014-04-23 18:07:20 -03:00
Mario Colque
02af76cdb9 change var name from copay to copayApp 2014-04-23 18:03:22 -03:00
Gustavo Maximiliano Cortez
e69032e951 Merge pull request #139 from colkito/feature/angularjs-tests
Feature/angularjs tests
2014-04-23 15:21:11 -03:00
Mario Colque
7d018389c3 Merge pull request #138 from cmgustavo/feature/06-send-form
AngularJS directives to handle notification and form validation.
2014-04-23 15:16:26 -03:00
Mario Colque
e860f96fb7 Merge pull request #136 from cmgustavo/feature/01-blockchain-tx-list
Feature/01 blockchain tx list
2014-04-23 15:15:41 -03:00
Gustavo Cortez
e17aed54b0 Fix conflicts:
js/controllers/transactions.js
2014-04-23 15:10:42 -03:00
Mario Colque
b25d4e22db Merge pull request #134 from matiu/feature/reject
reject button working
2014-04-23 14:58:08 -03:00
Mario Colque
178dfec1a8 added angularjs test configs 2014-04-23 14:56:03 -03:00
Mario Colque
e08acbd863 added copay var 2014-04-23 14:56:03 -03:00
Mario Colque
481a22e6f2 packages updated 2014-04-23 14:56:03 -03:00
Mario Colque
4db0a28df0 moved bitcore into angular controller 2014-04-23 14:56:03 -03:00
Gustavo Cortez
2b55e108f4 Changed rootScope for scope 2014-04-23 14:41:27 -03:00
Gustavo Cortez
014b7310f4 AngularJS directives to handle notification and form validation.
1) Checking enough amount at real-time when typing value.
2) Common notifications disappear after 5 seconds.
2014-04-23 13:16:20 -03:00
Gustavo Cortez
68fd916053 Get transactions of all addresses (the generated and the changes). Do not repeat txids on the front-end 2014-04-23 03:37:17 -03:00
Matias Alejo Garcia
b6280348e5 reject button working 2014-04-23 02:01:54 -03:00
Gustavo Cortez
df9b26fdde List of transactions by address associated to wallet 2014-04-23 01:55:00 -03:00
Ryan X. Charles
c4d8efdfaa Merge pull request #128 from matiu/feature/ux14
Feature/ux14
2014-04-22 23:17:56 -03:00
Matias Alejo Garcia
3c7c24de49 fix ux issues. tx sending working 2014-04-22 23:07:20 -03:00
Matias Alejo Garcia
31b2d5abac small fixes 2014-04-22 22:07:44 -03:00
Matias Alejo Garcia
4092f0cb9d works sometimes 2014-04-22 22:07:44 -03:00
Matias Alejo Garcia
10dbc073f4 Merge pull request #122 from colkito/fix/remove-unnecessary-peer
removed unnecessary peers files
2014-04-22 21:24:58 -03:00