Commit graph

973 commits

Author SHA1 Message Date
Gordon Hall
60cda70f72 Merge branch 'master' of github.com:bitpay/copay into feature/copay-shell 2014-06-04 10:16:39 -04:00
Mario Colque
2dcb1f81ab Merge pull request #542 from yemel/feature/insight-on-port-80
Change default config to connect insight at port 80
2014-06-04 10:52:09 -03:00
Yemel Jardi
01eb60ebdf Merge branch 'master' into feature/insight-on-port-80 2014-06-04 10:42:28 -03:00
Yemel Jardi
010d535784 Merge pull request #541 from maraoz/fix/logs
remove console.logs and general cleanup
2014-06-04 10:38:24 -03:00
Yemel Jardi
7e14b62c48 Change default config to connect insight at port 80 2014-06-04 10:10:30 -03:00
Gordon Hall
00dd3daf11 remove whitespace 2014-06-03 17:49:59 -04:00
Manuel Araoz
7798e38253 remove console.logs 2014-06-03 18:40:07 -03:00
Gustavo Maximiliano Cortez
5e3b1e94e2 Merge pull request #540 from matiu/feature/UXtesting
Feature/u xtesting
2014-06-03 18:22:58 -03:00
Gordon Hall
47f9ade884 merged email modal and wired up copay shell integration for it 2014-06-03 16:51:44 -04:00
Matias Alejo Garcia
ca7b9168c3 rm log 2014-06-03 17:49:11 -03:00
Matias Alejo Garcia
77f6a8221a change names in services 2014-06-03 17:49:11 -03:00
Matias Alejo Garcia
ac58d9744e change angular module namespace to copayApp 2014-06-03 17:48:37 -03:00
Matias Alejo Garcia
7432f216bb add handler for missing configuration errors 2014-06-03 17:47:14 -03:00
Manuel Aráoz
77e7d8d46d Merge pull request #538 from yemel/feature/backup-modal-input
Add modal to email backup
2014-06-03 17:30:30 -03:00
Gordon Hall
11c1157f9e added handling of importing a backup 2014-06-03 15:48:27 -04:00
Yemel Jardi
21113b9baa Add modal to email backup 2014-06-03 16:13:56 -03:00
Gordon Hall
4dbad23eac Merge branch 'master' of github.com:bitpay/copay into feature/copay-shell 2014-06-03 14:22:31 -04:00
Matias Alejo Garcia
9967ed837d Merge pull request #535 from colkito/fix/added-password-strength
added password strength in setup
2014-06-03 15:04:26 -03:00
Matias Alejo Garcia
d9a6874357 Merge pull request #537 from bechi/feature/layout-details
Feature/layout details
2014-06-03 15:04:06 -03:00
Matias Alejo Garcia
7f83a6f4b1 Merge pull request #533 from maraoz/feature/autoreconnect
Feature: autoreconnect to peers after time interval
2014-06-03 15:03:26 -03:00
Gordon Hall
ceafc3bb4f added message for backup to file for when instide copay shell 2014-06-03 12:55:40 -04:00
Bechi
359485e863 Add style for selected tab 2014-06-03 13:53:43 -03:00
Manuel Araoz
86016de19d add new tests for new reconnect feature 2014-06-03 13:07:31 -03:00
Mario Colque
a9d3304e7e added password strength in setup 2014-06-03 13:03:40 -03:00
Gordon Hall
2818ff6d60 now sending alert message to shell when menu action can't be handled 2014-06-03 11:55:48 -04:00
Manuel Araoz
fe177eaba2 fix tests 2014-06-03 12:40:28 -03:00
Manuel Araoz
3934b750f2 polish reconnect 2014-06-03 11:54:21 -03:00
Manuel Araoz
e822d57905 adding timeout 2014-06-03 11:54:21 -03:00
Gordon Hall
6143dd4066 add better handling of native menu actions, add handlers for backup 2014-06-03 10:50:37 -04:00
Mario Colque
529ab11481 Merge pull request #521 from cmgustavo/bug/ui-forms
Bug/uiforms_test_karma
2014-06-03 11:39:07 -03:00
Bechi
c171670323 Progress on pending tx tabs 2014-06-03 11:35:38 -03:00
Gordon Hall
20c7d7fe62 fixed ref error in shell.js 2014-06-03 10:35:24 -04:00
Gustavo Cortez
f1bc9ad894 Improve karma config 2014-06-03 11:24:02 -03:00
Gustavo Cortez
9b349818b3 Fix Conflicts:
index.html
2014-06-03 11:09:31 -03:00
Gustavo Cortez
187ca71c26 Fix Conflicts:
index.html
2014-06-03 11:06:48 -03:00
Mario Colque
7c9e88e190 Merge pull request #527 from matiu/bug/comment-shell.js
exclude shell.js until gets fixed
2014-06-03 11:01:14 -03:00
Gustavo Cortez
2a94b14852 Test for check if there are wallets on localStorage 2014-06-03 10:57:01 -03:00
Bechi
6087ca2191 fix header and footer 2014-06-03 10:53:24 -03:00
Matias Alejo Garcia
24a93a78b6 exclude shell.js untils gets fixed 2014-06-03 10:40:58 -03:00
Mario Colque
f9a7c1bfb3 Merge pull request #525 from yemel/fix/password-tooltip
Fix scope for password tooltip/ng-model
2014-06-03 10:36:06 -03:00
Yemel Jardi
6ec7e882a3 Fix scope for password ng-model 2014-06-03 10:12:53 -03:00
Gustavo Cortez
fd33385536 Fix Karma tests 2014-06-03 10:10:03 -03:00
Gustavo Cortez
965ad1a040 removed password check until it gets fixed (@matiu fix) 2014-06-02 23:42:22 -03:00
Gustavo Cortez
0a80fcc896 Fix: beep when incoming a new transaction 2014-06-02 22:21:01 -03:00
Gustavo Cortez
7aebf032ef Fix Conflicts:
index.html
2014-06-02 22:19:15 -03:00
Gustavo Cortez
5cbfeef163 Fix Conflicts:
index.html
2014-06-02 22:10:27 -03:00
Gustavo Maximiliano Cortez
6d922b7780 Merge pull request #512 from maraoz/UI/separate-errors
UI: separate login errors
2014-06-02 22:06:33 -03:00
Manuel Araoz
1cba837f8d fix test 2014-06-02 18:59:50 -03:00
Manuel Araoz
55245650bd rename WF test 2014-06-02 18:59:50 -03:00
Manuel Araoz
6feb2a2176 add error on incorrect password while importing 2014-06-02 18:59:50 -03:00