Manfred Karrer
2e8030cfb4
Add default configs
2017-07-27 17:59:05 +02:00
Manfred Karrer
2f322f7a33
Merge branch 'Development' into DAO_phase1
2017-07-27 17:12:24 +02:00
Manfred Karrer
2d6fa2be6f
Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain
2017-07-27 17:12:14 +02:00
Manfred Karrer
53de6ee4ad
Append bisq to check out command
2017-07-27 11:51:15 +02:00
Manfred Karrer
4ee0ebe127
Add command for git checkout of bisq
2017-07-27 11:50:35 +02:00
Mike Rosseel
3f4c607b33
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-27 08:43:09 +02:00
Mike Rosseel
779d388070
Merge branch 'Development' into issue544-api
2017-07-27 08:42:56 +02:00
Manfred Karrer
5af504095e
Fix bug with sorting offers
...
https://github.com/bitsquare/bitsquare/issues/869#issuecomment-318004502
2017-07-27 01:10:07 +02:00
Silvio Marano
69efbaf00e
Update Bisq.iss
...
the lines
SetupIconFile={localappdata}\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq.ico
are wrong, Bisq folder is located in {localappdata} and the icons are inside Bisq\ path so a more coherent change would be
SetupIconFile={localappdata}\Bisq\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq\Bisq.ico
but even this would be wrong since SetupIconFiledirective as it is used on compile time only and should contain the absolute path to the icon
Same issue on `WizardSmallImageFile={localappdata}\Bisq-setup-icon.bmp `
2017-07-26 21:47:01 +02:00
Manfred Karrer
c744cb5a96
Merge branch 'Development' into DAO_phase1
2017-07-26 21:38:21 +02:00
Manfred Karrer
33284a8abd
Merge pull request #890 from SMH17/patch-2
...
Update Bisq.iss
2017-07-26 21:36:15 +02:00
Silvio Marano
0d965d3749
Update Bisq.iss
...
the lines
SetupIconFile={localappdata}\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq.ico
are wrong, Bisq folder is located in {localappdata} and the icons are inside Bisq\ path
so a more coherent change would be
SetupIconFile={localappdata}\Bisq\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq\Bisq.ico
but even this would be wrong since SetupIconFile directive as it is used on compile time only and should contain the absolute path to the icon
2017-07-26 21:24:15 +02:00
Mike Rosseel
592bea9dad
make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test
2017-07-26 16:37:59 +02:00
Mike Rosseel
3747ac5db0
add support script
2017-07-26 16:35:41 +02:00
Mike Rosseel
b3335ae25e
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-26 16:34:51 +02:00
Mike Rosseel
5e58853d9c
adding trade_detail, trade_list, payment_started, payment_received and move_funds_to_bisq_wallet
2017-07-26 16:34:27 +02:00
Manfred Karrer
ba2fc3c162
Merge branch 'Development' into DAO_phase1
2017-07-26 13:21:07 +02:00
Manfred Karrer
88243866dd
Merge remote-tracking branch 'origin/Development' into Development
2017-07-26 13:17:15 +02:00
Manfred Karrer
b6c5d872bd
Add all african counties
2017-07-26 13:17:08 +02:00
Manfred Karrer
1857cc0b30
Show latest trade price as market price for currencies which have no external price feed provided but have been traded in Bisq
2017-07-26 11:44:28 +02:00
Manfred Karrer
03c33964a7
Add more selectors to filter.
2017-07-26 00:07:44 +02:00
Manfred Karrer
493b3a4f11
Add BSQ address validation
2017-07-25 22:14:48 +02:00
Manfred Karrer
894923fb5e
Enable dev mode
2017-07-25 22:14:35 +02:00
Manfred Karrer
40fd9a664b
Enable BSQ
2017-07-25 22:14:27 +02:00
Mike Rosseel
242276c105
adapt scripts to api name change
2017-07-25 20:40:22 +02:00
Mike Rosseel
6d782cdd73
adding command-line switch to GUI, ENABLE_API
2017-07-25 18:31:11 +02:00
Mike Rosseel
8602108ef3
Merge branch 'Development' into issue544-api
2017-07-25 16:36:27 +02:00
Mike Rosseel
dc4e169602
update dependency versions for api (dropwizard/swagger compatibility): guava, jackson-annotations.
2017-07-25 16:32:19 +02:00
Mike Rosseel
c5ada6b586
rename api to model package, swagger works
2017-07-25 16:30:49 +02:00
Manfred Karrer
73e9c66a12
Add note for lombok plugin
2017-07-25 15:47:39 +02:00
Mike Rosseel
0c1cf298f6
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-25 13:35:13 +02:00
Manfred Karrer
72a7104f94
Refactoring: Merge BsqBlockVo into BsqBlock, TxInputVo into TxInput and TxOutputVo into TxOutput
2017-07-24 20:05:50 +02:00
Manfred Karrer
92d803d08c
Merge branch 'master' into Development
2017-07-24 19:27:18 +02:00
Manfred Karrer
87ba5cabeb
Add IOTA and EOS
2017-07-24 19:26:47 +02:00
Manfred Karrer
614344218f
Use url instead of file name for log at daownloader
2017-07-23 01:58:26 +02:00
Manfred Karrer
7d1ab5c315
Merge pull request #878 from yousefamar/patch-1
...
Update AUR link
2017-07-22 22:52:28 +02:00
Yousef Amar
9243bac3b9
Update AUR link
2017-07-22 18:39:31 +02:00
Mike Rosseel
412e19923c
utility scripts
2017-07-20 16:38:49 +02:00
Mike Rosseel
47a5e85e5f
api headless startup - wip
2017-07-20 14:38:03 +02:00
Mike Rosseel
2ca286e428
small fixes
2017-07-19 22:42:05 +02:00
Mike Rosseel
537a99eb0f
adding healthchecks, adapting offer_make to new ctor (wip), adding banner, start of swagger integration
2017-07-18 17:32:44 +02:00
Mike Rosseel
337610ef7c
Merge branch 'Development' into issue544-api
2017-07-17 13:19:24 +02:00
Manfred Karrer
a7f3d68cb1
Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir).
2017-07-17 10:05:08 +02:00
Mike Rosseel
47e771ef84
changing api version
2017-07-17 09:26:53 +02:00
Mike Rosseel
cda82172e3
Merge branch 'Development' into issue544-api
...
Conflicts:
.idea/codeStyleSettings.xml
2017-07-17 09:03:15 +02:00
Manfred Karrer
225fdb1e46
Version 0.5.2
2017-07-17 01:27:47 +02:00
Manfred Karrer
2d599cf6a5
Add missing jarFile for srcfiles
2017-07-17 00:18:21 +02:00
Manfred Karrer
6c1e803220
Improve check for showing popup
2017-07-16 23:11:05 +02:00
Manfred Karrer
2fe77aadd4
Optimize startup performance
2017-07-16 22:39:15 +02:00
Manfred Karrer
484b5411b9
use lower case for log file
2017-07-16 20:24:17 +02:00
