Commit graph

4193 commits

Author SHA1 Message Date
Mike Rosseel
68a7e7c9c5 check that the corrent paymentaccount is used for this offer 2017-09-04 19:59:40 +02:00
Mike Rosseel
d826efc984 update dependencies to fix the build 2017-09-04 14:23:16 +02:00
Mike Rosseel
9101aa367b fix startup issues in some cases, where the p2pservice calls an onmessage before the storagefile is initialised.
Aligning Api module with other modules by using the AppSetupWithP2P class.
2017-09-04 13:26:56 +02:00
Mike Rosseel
46641200bc adding more checks to offer_make, provide a cleaner/easier feedback mechanism between proxy/api.
Use threading to wait for offer creation results, add callback for errors.
Most exceptions coming from the bisq code are now propagated to the api result.
Added market check to forbid offers on non-existing markets.
TODO: further testing of rest api, adding checks
2017-09-02 11:39:27 +02:00
Mike Rosseel
9456b00127 Merge branch 'Development' into issue544-api 2017-08-28 09:31:45 +02:00
Manfred Karrer
902e3de80a Rename ShadowCash to Particl (https://github.com/bisq-network/bisq-exchange/issues/911) 2017-08-27 12:42:01 +02:00
Manfred Karrer
e8c46c9709 Merge branch 'master' into Development
# Conflicts:
#	doc/build.md
2017-08-09 12:48:07 +02:00
Chris Beams
6ece78352f
Replace snapshot versions of JitPack deps with fixed SHAs (#899) 2017-08-09 12:41:18 +02:00
Chris Beams
ae05c015b9
Consume custom bitcoinj/libdojh/btcd deps via JitPack (#899)
This change removes the need to clone and build bisq's forks of
bitcoinj, libdohj and btcd-cli4j in order to build bisq itself.
2017-08-09 12:13:47 +02:00
Chris Beams
3f19fe3065
Send Travis success notifications to Slack only on status change (#898)
Previously every successful build was triggering a notification to be
sent to Slack, and this is too noisy.
2017-08-09 10:27:10 +02:00
Chris Beams
3b73516ad6
Pin maven-enforcer-plugin version to 1.4.1 (#897)
A new version (v3.0.0-M1) of the enforcer plugin was released on July
27th. If for whatever reason that new version ends up in the local ~/.m2
cache, it results in broken builds because the new version's checksum
gets validated instead of the older v1.4.1 checksum being validated.
This is because the version provided to check was set simply to
'RELEASE', i.e. an alias indicating "whatever the latest release happens
to be". This commit fixes #897 and avoids these potential build failures
by pinning the version explicitly to v1.4.1. This forces the correct
checksum to get validated, in turn causing the build to pass as
expected.
2017-08-09 10:15:14 +02:00
Chris Beams
145bce6bf3
Send Travis CI notifications to Slack (#898)
Per instructions at
https://docs.travis-ci.com/user/notifications#Configuring-slack-notifications
2017-08-09 10:08:42 +02:00
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
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
2d6fa2be6f Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain 2017-07-27 17:12:14 +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
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
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
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
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