Chris Beams
9c0469eb7e
Polish .travis.yml formatting
2017-08-09 10:08:42 +02:00
Chris Beams
f7a8fd19f0
Remove commented-out Travis IRC notification config
2017-08-09 10:08:42 +02:00
Manfred Karrer
9cfbba2013
Merge pull request #895 from stevenkain/patch-1
...
Update displayStrings.properties
2017-08-04 21:17:35 +02:00
stevenkain
c92f955060
Update displayStrings.properties
2017-08-04 21:57:03 +03:00
Manfred Karrer
2dee533d37
Set onAction in activate method
2017-07-29 03:16:57 +02:00
Manfred Karrer
94203b9101
Add BSQ dashboard/statistics
2017-07-29 03:09:39 +02:00
Manfred Karrer
2a67d39d53
Cleanup
2017-07-29 00:04:31 +02:00
Manfred Karrer
594fe882d9
update dev input field data
2017-07-28 20:04:57 +02:00
Manfred Karrer
5b5c0e66c7
Improve wording
2017-07-28 20:04:38 +02:00
Manfred Karrer
db865800fb
Check for null and 0 values at setting market price
2017-07-28 13:37:26 +02:00
Manfred Karrer
50065bb5c9
Use BSQ testnet explorer for testnet
2017-07-28 01:32:44 +02:00
Manfred Karrer
6cee58824e
Add new mainnet geneis tx. Make genesisTx nullable in BsqChainState. Shuffle seedNodeAddresses and remove candiates from list. Add null checks. Filter invlaid OP_RETURN data.
2017-07-28 00:40:17 +02:00
Manfred Karrer
667ad0bc95
Update btc conf file with stricter access
2017-07-27 19:48:37 +02:00
Mike Rosseel
c6f11429f1
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-27 18:44:28 +02:00
Mike Rosseel
79d6fe22a4
offer_take is code complete but needs to be tested further.
2017-07-27 18:44:02 +02:00
Manfred Karrer
473da57db1
Fix pom files (BC not included)
2017-07-27 18:14:34 +02:00
Manfred Karrer
b593f89638
Add BTC TESTNET genesis tx, remvoe LTC genesis txs
2017-07-27 18:00:48 +02:00
Manfred Karrer
0016e33640
Add network selector to resource EntryMap file name
2017-07-27 18:00:18 +02:00
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
