Matias Alejo Garcia
|
c0360e7beb
|
plugin system v0
|
2014-09-15 14:07:43 -03:00 |
|
Matias Alejo Garcia
|
2849f773e2
|
change name to Encrypted
|
2014-09-15 14:07:43 -03:00 |
|
Matias Alejo Garcia
|
1ce3f82d0a
|
add angular-load
|
2014-09-15 14:06:56 -03:00 |
|
Matias Alejo Garcia
|
38756063ad
|
Merge pull request #1403 from cmgustavo/bug/05-typos
typos: BIP32 master extended private key (hex)
|
2014-09-15 13:57:27 -03:00 |
|
Gustavo Maximiliano Cortez
|
03eb6488ec
|
typos: BIP32 master extended private key (hex)
|
2014-09-15 13:04:44 -03:00 |
|
Gustavo Maximiliano Cortez
|
d4ec48aadd
|
Merge pull request #1371 from matiaspando/error/informPasswordNotMatching
Error/inform password not matching
|
2014-09-15 11:06:16 -03:00 |
|
Matias Pando
|
3818044a2e
|
Translations fixed
|
2014-09-15 10:50:06 -03:00 |
|
Gustavo Maximiliano Cortez
|
6efa6dbf96
|
Merge pull request #1308 from eordano/grunt-jsdoc
JSDocs generated by grunt
|
2014-09-15 09:40:32 -03:00 |
|
Esteban Ordano
|
313efa9503
|
Fixes old version of grunt
|
2014-09-13 23:49:56 -03:00 |
|
Esteban Ordano
|
027043bd6f
|
JSDocs generated by grunt
|
2014-09-13 23:49:56 -03:00 |
|
Matias Pando
|
a599251b39
|
Fixed
|
2014-09-13 09:24:20 -03:00 |
|
bechi
|
2bb61501bb
|
fix ui
|
2014-09-13 09:24:20 -03:00 |
|
Matias Pando
|
4de113fa19
|
Translation added
|
2014-09-13 09:20:21 -03:00 |
|
Matias Pando
|
72d2e16415
|
Fixed
|
2014-09-13 09:20:21 -03:00 |
|
Matias Pando
|
de43990882
|
Conflicts fixed
|
2014-09-13 09:20:21 -03:00 |
|
Gustavo Maximiliano Cortez
|
ce95cb264d
|
Merge pull request #1389 from maraoz/wording/txs
Wording fixes
|
2014-09-12 19:04:37 -03:00 |
|
Manuel Araoz
|
8c422640aa
|
wording fix
|
2014-09-12 13:24:10 -07:00 |
|
Manuel Araoz
|
80b86ca2ab
|
fixes #1325
|
2014-09-12 13:15:43 -07:00 |
|
Matias Alejo Garcia
|
c596535ca7
|
Merge pull request #1384 from maraoz/wording/adv-settings
wording fix
|
2014-09-12 15:30:08 -03:00 |
|
Gustavo Maximiliano Cortez
|
d0d49f17ef
|
Merge pull request #1353 from matiaspando/feature/skipBackup
Skiping backup
|
2014-09-12 15:27:58 -03:00 |
|
Manuel Araoz
|
ce975ed0ab
|
wording fix
|
2014-09-12 11:23:44 -07:00 |
|
Matias Pando
|
0698c70cce
|
Conflicts fixed
|
2014-09-12 14:56:19 -03:00 |
|
Matias Pando
|
873f854eb8
|
Skip avoid waiting for other copayers
|
2014-09-12 13:29:41 -03:00 |
|
Matias Pando
|
b7373367a1
|
Skip avoid waiting for other copayers
|
2014-09-12 13:25:52 -03:00 |
|
Matias Pando
|
da08f52d67
|
Showing message only when the copayer may create a backup
|
2014-09-12 12:55:36 -03:00 |
|
bechi
|
7847cd5067
|
fix style
|
2014-09-12 12:55:36 -03:00 |
|
bechi
|
778086ca1d
|
fix text color
|
2014-09-12 12:55:36 -03:00 |
|
Matias Pando
|
db7d33682e
|
Solving conflicts
|
2014-09-12 12:55:36 -03:00 |
|
Matias Pando
|
2b540264a5
|
Conflicts solved
|
2014-09-12 12:55:36 -03:00 |
|
Matias Pando
|
ecea1a654d
|
If the copayer upload a backup it does not wait for others
|
2014-09-12 12:55:36 -03:00 |
|
Matias Pando
|
84dbcb038a
|
Fixed
|
2014-09-12 12:55:36 -03:00 |
|
Gustavo Maximiliano Cortez
|
c9ccc4f085
|
Merge pull request #1369 from isocolsky/rename_backup
Added copayer nickname to backup name
|
2014-09-12 12:02:25 -03:00 |
|
Ivan Socolsky
|
8d7e420524
|
No copayer nickname on 1-1 wallets
|
2014-09-12 11:10:45 -03:00 |
|
Ivan Socolsky
|
7cf2a474dd
|
removed old test
|
2014-09-12 10:41:17 -03:00 |
|
Ivan Socolsky
|
81a73e6f2a
|
resolved
|
2014-09-12 10:40:47 -03:00 |
|
Matias Alejo Garcia
|
94221a312f
|
Merge pull request #1370 from cmgustavo/bug/02-ux
Fix address list for small devices
|
2014-09-12 10:36:23 -03:00 |
|
Matias Alejo Garcia
|
bf3840f77c
|
Merge pull request #1356 from isocolsky/bug/subscribe
Separated subscribeToAddresses from getAddressesInfo
|
2014-09-12 10:35:57 -03:00 |
|
Ivan Socolsky
|
19a8733a9c
|
resolved conflicts
|
2014-09-12 10:28:16 -03:00 |
|
Ivan Socolsky
|
1f83f85189
|
separated subscribeToAddresses from getAddressesInfo
|
2014-09-12 10:25:38 -03:00 |
|
Gustavo Maximiliano Cortez
|
6e5e0846d0
|
Fix indentation
|
2014-09-11 22:09:43 -03:00 |
|
Gustavo Maximiliano Cortez
|
d02a159f76
|
Fix address list for small screen
|
2014-09-11 22:04:11 -03:00 |
|
Matias Alejo Garcia
|
9b8ecea1bd
|
Merge pull request #1355 from bechi/bugs/01-ui
fix column on send section
|
2014-09-11 20:32:19 -03:00 |
|
Matias Alejo Garcia
|
3cd4b9c1b0
|
Merge pull request #1368 from cmgustavo/feature/01-grunt
Added config.js to grunt watch, also mobile.js and init.js
|
2014-09-11 20:28:47 -03:00 |
|
Matias Alejo Garcia
|
d358330d1d
|
Merge pull request #1281 from maraoz/refactor/settings
Refactor settings
|
2014-09-11 20:28:21 -03:00 |
|
Manuel Aráoz
|
bd734dfe31
|
Merge pull request #4 from bechi/temp
fix with tony's feedback
|
2014-09-11 15:07:38 -07:00 |
|
bechi
|
187db9c49b
|
fix with tony's feedback
|
2014-09-11 19:01:31 -03:00 |
|
Manuel Aráoz
|
36cdc057a6
|
Merge pull request #3 from maraoz/revert-2-temp
Revert "fix layout style"
|
2014-09-11 14:39:11 -07:00 |
|
Manuel Aráoz
|
4711558d76
|
Revert "fix layout style"
|
2014-09-11 14:39:04 -07:00 |
|
Manuel Aráoz
|
2465c838d1
|
Merge pull request #2 from bechi/temp
fix layout style
|
2014-09-11 14:32:45 -07:00 |
|
bechi
|
6be87a440f
|
fix layout style
|
2014-09-11 16:44:05 -03:00 |
|