mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,407 Commits 4 Branches 148 Tags 4.3 GiB
1ba98d4283
Commit Graph

3407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
1ba98d4283
Merge branch 'ManfredKarrer-Development' into Development 2017-09-17 10:19:30 -05:00
Manfred Karrer
1aa3038a07
Merge WACoin 2017-09-17 10:16:00 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development 
Merge master to Development
 2017-09-16 12:28:49 -05:00
Manfred Karrer
0087e19db9
Merge branch 'ZencashOfficial-Development' into Development 
Merge Zencash PR 919
 2017-09-16 12:23:07 -05:00
Manfred Karrer
7daee4f212
Remove comment 2017-09-16 12:22:20 -05:00
Manfred Karrer
262c947d85
Merge PR 919 (ZenCash) 2017-09-16 12:16:54 -05:00
Manfred Karrer
c6e5f7882d Merge pull request #924 from Pranacoin/Development 
Add new altcoin with code "PNC"
 2017-09-16 11:08:56 -05:00
Manfred Karrer
71ce1bdade Merge pull request #931 from ManfredKarrer/master 
Fix broken links and remove a developer log
 2017-09-16 10:33:10 -05:00
Manfred Karrer
a9b1a9bd5b
Remove single opening quote in dispute message 2017-09-16 10:31:52 -05:00
Manfred Karrer
13a95317bc
Fix broken link to Arbitration system 2017-09-16 10:25:10 -05:00
Manfred Karrer
9c77da778e
Remove developer log 2017-09-16 10:11:39 -05:00
Manfred Karrer
b723f28edc Merge remote-tracking branch 'origin/master' 2017-09-13 20:00:04 -05:00
Manfred Karrer
b99b268f12 Update EntryMap_BTC to actual state 2017-09-13 19:59:37 -05:00
Казьмина Татьяна
daaeddb968 Add new altcoin with code "PNC": additional code in AltCoinAddressValidator and AltCoinAddressValidatorTest and 2 specific classes: PNCAddressValidator and PNCParams. 2017-09-09 15:23:00 +03:00
smrtz
728e178828 Adds ZenCash Support 2017-09-05 18:38:59 -04:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange} 
This is a follow on to 6ffa52a00. bisq-network/bisq-exchange is too
verbose, and other repositories have been shortened as well, e.g.
bisq-network/price-relay-node has become bisq-network/pricenode.
 2017-09-05 14:55:42 +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
1eee939754 Merge pull request #912 from stevenkain/patch-4 
Update displayStrings.properties
 2017-08-26 09:41:45 +02:00
stevenkain
2fb74f4936 Update displayStrings.properties 2017-08-25 23:35:15 +03:00
stevenkain
aa87319fca Update displayStrings.properties 2017-08-25 23:34:30 +03:00
stevenkain
50310338b4 Update displayStrings.properties 2017-08-25 23:05:06 +03:00
Chris Beams
ede1f90167
Upgrade to latest HEAD of our libdohj fork 2017-08-23 15:43:36 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange 2017-08-23 15:36:17 +02:00
Chris Beams
391910576b
Update to depend on latest commit in libdohj-core 
Depending on this commit ensures that we do not transitively depend on
bitcoinj snapshots.
 2017-08-21 16:22:11 +02:00
WACoinsTeam
41450d7543 Add WACoins coin 2017-08-20 21:51:54 +02:00
Manfred Karrer
8747f0e099 Merge pull request #904 from stevenkain/patch-3 
Update displayStrings.properties
 2017-08-10 16:17:49 +02:00
stevenkain
a3b1a5ff6a Update displayStrings.properties 
Senders name -> Sender's name
 2017-08-10 16:54:45 +03:00
Manfred Karrer
79f31f56ae Merge pull request #901 from stevenkain/patch-2 
Update displayStrings.properties
 2017-08-09 18:37:36 +02:00
stevenkain
fd683db2d4 Update displayStrings.properties 2017-08-09 19:14:42 +03: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
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
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
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
dc4e169602 update dependency versions for api (dropwizard/swagger compatibility): guava, jackson-annotations. 2017-07-25 16:32:19 +02:00
Manfred Karrer
73e9c66a12 Add note for lombok plugin 2017-07-25 15:47:39 +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