Commit graph

6,390 commits

Author SHA1 Message Date
Matias Alejo Garcia
2bca646cd5 Merge pull request #3633 from Kirvx/patch-47
Update preferencesAdvanced.html
2015-12-10 10:45:30 -03:00
Kirvx
7bed9a90cc Update preferencesAdvanced.html 2015-12-10 00:33:56 +01:00
Gustavo Maximiliano Cortez
751cefe1e9 Merge pull request #3607 from bitpay/v1.5
Updating master from v1.5
2015-12-07 15:55:01 -03:00
Matias Alejo Garcia
1becb4ae40 Merge pull request #3541 from cmgustavo/bug/select-wallet-item-color
Fix avatar default background color
2015-12-01 14:31:10 -03:00
Matias Alejo Garcia
65ba330788 Merge pull request #3538 from cmgustavo/bug/alert-duplicated
Fixes alert popup duplicated
2015-12-01 14:30:55 -03:00
Gustavo Maximiliano Cortez
45357e1b60 Merge pull request #3537 from bechi/bug/android-icon
fix icon android
2015-12-01 14:29:57 -03:00
Gustavo Maximiliano Cortez
36e7a69e52 Merge pull request #3557 from bitpay/v1.5
Update master with v1.5
2015-12-01 11:06:02 -03:00
Matias Alejo Garcia
8c6e56fba7 Merge pull request #3555 from cmgustavo/release/v1.5.3
New release v1.5.3
2015-12-01 10:28:05 -03:00
Gustavo Maximiliano Cortez
b673e223b9
New release v1.5.3 2015-12-01 10:18:17 -03:00
Matias Alejo Garcia
51fee25070 Merge pull request #3554 from cmgustavo/bug/scanqr-join
Fix QR code scan wallet invitation on Android
2015-12-01 10:11:13 -03:00
Gustavo Maximiliano Cortez
eafb8b199d
Fix QR code scan wallet invitation on Android 2015-12-01 10:03:07 -03:00
bechi
bb3c14a21c fix icon name 2015-11-28 12:57:27 -03:00
Matias Alejo Garcia
13ab87b20f Merge pull request #3544 from cmgustavo/bug/backup-flag02
Set backup flag after export a wallet
2015-11-28 10:55:17 -03:00
Gustavo Maximiliano Cortez
94d1941682
Set backup flag after export a wallet 2015-11-27 20:47:23 -03:00
Gustavo Maximiliano Cortez
29f1cf84a7
Fix avatar default background color 2015-11-26 15:51:01 -03:00
Gustavo Maximiliano Cortez
09cc7869c0
Fix duplicate alert popup 2015-11-26 13:25:38 -03:00
bechi
c31d49338a fix icon android 2015-11-26 12:51:53 -03:00
Matias Alejo Garcia
db4f64254f Merge pull request #3532 from wallclockbuilder/patch-1
Fix grammar.
2015-11-26 12:30:59 -03:00
Matias Alejo Garcia
8744b9e1d3 Merge pull request #3533 from cmgustavo/bug/path-icon-sync
Fix path icon sync
2015-11-26 11:45:41 -03:00
Gustavo Maximiliano Cortez
33ff2162dc
Fix path icon sync 2015-11-26 10:26:16 -03:00
Mawueli Kofi Adzoe
b0486af38f Fix grammar. 2015-11-26 09:30:41 +00:00
Matias Alejo Garcia
f8566cb99c Merge pull request #3528 from bitpay/v1.5
Updates v1.5 to master
2015-11-25 14:29:52 -03:00
Matias Alejo Garcia
0ff01a5e74 Merge pull request #3524 from jzbz/patch-1
README.md fixes
2015-11-25 08:20:01 -03:00
Matias Alejo Garcia
d1bddc9f1b Merge pull request #3525 from jzbz/patch-2
Clarify language
2015-11-25 08:18:51 -03:00
Jonathan Zeppettini
d5284be630 Clarify language
"Word" is a bit confusing and redundant here. "Phrase" or "Mnemonic" might be better choices.
2015-11-25 00:48:41 -05:00
Jonathan Zeppettini
0f21e7869e README.md fixes
Miscellaneous spelling, grammar, and syntax fixes.
2015-11-25 00:38:58 -05:00
Matias Alejo Garcia
c553fbca91 Merge pull request #3479 from cmgustavo/release/v1.5.2
WIP: New release v1.5.2
2015-11-20 11:50:33 -03:00
Matias Alejo Garcia
76965f7ac0 Merge pull request #3505 from cmgustavo/bug/txp-01
Fix parse error of TXP. Removes unused variables
2015-11-20 11:48:14 -03:00
Gustavo Maximiliano Cortez
73c2fec6c9
Fix parse error of TXP. Removes unused variables 2015-11-20 11:39:59 -03:00
Matias Alejo Garcia
196ea4ccef Merge pull request #3503 from cmgustavo/bug/join-01
Fix join wallet - parseSecret
2015-11-20 10:23:59 -03:00
Gustavo Maximiliano Cortez
f2fb9f390c
Fix join wallet - parseSecret 2015-11-20 10:22:10 -03:00
Matias Alejo Garcia
d520f99fce Merge pull request #3496 from cmgustavo/bug/run-browserify
Browserify bitcore-wallet-client before concat
2015-11-19 15:57:58 -03:00
Gustavo Maximiliano Cortez
ed8c198da1
Browserify bitcore-wallet-client before concat 2015-11-19 15:51:49 -03:00
Matias Alejo Garcia
510141141e Merge pull request #3493 from bechi/fixes/history-sync
fix style on history sync
2015-11-19 15:25:41 -03:00
bechi
bd4e6917a7 fix spinner 2015-11-19 15:17:44 -03:00
bechi
5858bfc5b4 fix style on history sync 2015-11-19 11:28:43 -03:00
Gustavo Maximiliano Cortez
8e05bdcb14 Merge pull request #3484 from matiu/bug/fix-wallet-list2
sanitize wallet list
2015-11-19 11:28:08 -03:00
Matias Alejo Garcia
870f2fa718 update bwc 2015-11-19 11:17:27 -03:00
Matias Alejo Garcia
f49c48cd64 Merge pull request #3491 from bitpay/revert-3490-bug/history-sync-02
Revert "fix style on history sync"
2015-11-19 11:03:47 -03:00
Matias Alejo Garcia
d9e58c541d Revert "fix style on history sync" 2015-11-19 11:03:40 -03:00
Matias Alejo Garcia
ca6621125a Merge pull request #3490 from bechi/bug/history-sync-02
fix style on history sync
2015-11-19 11:01:17 -03:00
bechi
c7bed7dfc9 fix style on history sync 2015-11-19 10:58:07 -03:00
Matias Alejo Garcia
1aa3cccff7 rm angular-bitcore-wallet-client deps, replace it with bwc alone 2015-11-18 20:30:28 -03:00
Matias Alejo Garcia
2e7cd8770c sanitize wallet list 2015-11-18 16:53:25 -03:00
Gustavo Maximiliano Cortez
87718ca54c
New release v1.5.2 2015-11-18 14:39:10 -03:00
Matias Alejo Garcia
18ddf8e298 fix Units in history after change 2015-11-18 10:30:28 -03:00
Matias Alejo Garcia
8c2edd3afe fix isDevel log error 2015-11-18 10:30:21 -03:00
Matias Alejo Garcia
8314a1c91c Merge pull request #3469 from cmgustavo/bug/history-note-to
Removes note: and to: prefix
2015-11-16 16:07:27 -03:00
Gustavo Maximiliano Cortez
fa13ee3347
Removes note: and to: prefix 2015-11-16 15:53:09 -03:00
Matias Alejo Garcia
95217cef02 Merge pull request #3419 from cmgustavo/ref/global-preferences-sidebar
Moves the global preferences to the sidebar
2015-11-16 11:00:52 -03:00