mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity
7730 commits 3 branches 150 tags 4.1 GiB
Commit graph

194 commits

Author SHA1 Message Date
Chris Beams
f8ec6beedf
Remove unused $junitVersion 
Per review comments at
https://github.com/bisq-network/bisq/pull/1862#discussion_r230646331.
 2018-11-05 11:02:16 +01:00
Chris Beams
3913988f66
Remove unnecessary application of 'java-base' plugin 
This was needed at the root level for a while when first porting the
build back to the monorepo, but is no longer necessary now.
 2018-11-04 19:01:55 +01:00
Chris Beams
743a7692b7
Remove unnecessary seednode resources config 
This looks to have been a copy and paste error when originally setting
up the seednode build.
 2018-11-04 19:00:44 +01:00
Chris Beams
adb3e9e3c6
Remove unnecessary :desktop:test javaagent config 2018-11-04 19:00:04 +01:00
Chris Beams
22b92f7057
Use two blank lines between configure blocks 
To increase readability
 2018-11-04 18:43:20 +01:00
Chris Beams
5cdacbe336
Extract variables for duplicate dependency versions 2018-11-04 18:41:56 +01:00
Chris Beams
cb4f6edd9a
Minimize common subproject javafx dependencies 2018-11-04 18:16:07 +01:00
Chris Beams
3cd467cc9f
Pull up remaining statsnode config to root 2018-11-04 18:00:56 +01:00
Chris Beams
b0886dd02d
Pull up remaining seednode config to root 2018-11-04 18:00:10 +01:00
Chris Beams
9c82b3076a
Pull up remaining relay config to root 2018-11-04 17:58:37 +01:00
Chris Beams
15b81df32f
Pull up remaining pricenode config to root 2018-11-04 17:57:28 +01:00
Chris Beams
2f7c5f1150
Pull up remaining p2p config to root 2018-11-04 17:46:03 +01:00
Chris Beams
e97625cfc3
Pull up remaining monitor config to root 2018-11-04 17:41:37 +01:00
Chris Beams
3c54be2d4f
Pull up remaining desktop config to root 
And also relocate gradle-witness jar and config (back) to root-level
gradle/witness dir.
 2018-11-04 17:37:32 +01:00
Chris Beams
0f5e9b794c
Pull up remaining core config to root 2018-11-04 17:18:46 +01:00
Chris Beams
d4edb81d87
Pull up remaining common config to root 2018-11-04 16:55:33 +01:00
Chris Beams
c8956567e4
Pull up remaining assets config to root 2018-11-04 16:45:00 +01:00
Chris Beams
bd1e7e273f
Pull up application plugin config to root 2018-11-04 16:27:52 +01:00
Chris Beams
1cdb39ab60
Pull up JesusMcCloud repo to root 
Not all subprojects need it, but most do.
 2018-11-04 14:28:14 +01:00
Chris Beams
f6a68f8aef
Pull up common JavaCompile config to root 2018-11-04 14:20:55 +01:00
Chris Beams
4e1fa914a2
Pull up common repositories to root build.gradle 2018-11-04 14:20:55 +01:00
Chris Beams
95c8b8ddfa
Pull up application and configuration of java plugin 2018-11-04 14:20:55 +01:00
Chi Nul
14efcbce98
Merge "Update root gradle scripts":9c628bb873cbfd7fd9c56fbbd022470a205561f9 from @chirhonul 2018-09-05 11:15:30 +02:00
Christoph Atteneder
c1c38a3ceb
Move desktop to subdirectory 2018-09-05 09:50:29 +02:00
Christoph Atteneder
eebcde814c
Use correct version number 2018-08-23 13:08:19 +02:00
Christoph Atteneder
ed3e90c2d4
Revert version to -SNAPSHOT 2018-08-22 13:22:29 +02:00
Christoph Atteneder
c866f9d903
Update version number for release 2018-08-22 13:06:28 +02:00
Manfred Karrer
05c3db3f58
Add dependencyVerification items 
- There are still issues with libdohj and btcj. If the gradle task is
run it fails because it cannot resolve core....
 2018-08-21 23:26:44 +02:00
Manfred Karrer
9a9d574521
Update libdohj to 5047c80004, remove temp dependencyVerification items 
- remove temp dependencyVerification items to not break other builds
as dependencies have changed but they are still not correctly
resolved ;-(
 2018-08-21 20:33:30 +02:00
Manfred Karrer
7cdda97155
Merge branch 'master' into merged-voting 2018-08-15 16:27:09 +02:00
Manfred Karrer
814ade4f1c
Merged 2018-08-15 16:24:41 +02:00
Manfred Karrer
6499772580
Fix version number 2018-08-15 15:30:05 +02:00
Manfred Karrer
76cc2c8b05
Merge branch 'master' into voting 
# Conflicts:
#	src/main/resources/i18n/displayStrings.properties

Merge branch 'master' into voting

# Conflicts:
#	build.gradle
 2018-08-15 00:14:22 +02:00
Manfred Karrer
24991d739a
Change version from -SNAPSHOT to 0.9.0 2018-08-09 14:15:00 +02:00
Manfred Karrer
7bd22d1886
Remove grpc from build 2018-08-06 12:22:52 +02:00
Manfred Karrer
4a0c8b6dc1
Prepare for custom binary: 
- Set version 0.8.0
- Use Bisq_notifications as app name
- Improve Relay
- Fix build issues
 2018-08-06 02:11:58 +02:00
Manfred Karrer
dbad3950ae
Merge branch 'master' into notifications 2018-08-06 00:56:46 +02:00
Manfred Karrer
d2eae6b99e
Change order of dependencies 
Just to retrigger a travis build as for some strange reasons core does not get resolved.
 2018-07-26 18:14:31 +02:00
Manfred Karrer
4ec69f082e
Merge branch 'master' into voting 
# Conflicts:
#	build.gradle
#	src/main/java/bisq/core/CoreModule.java
#	src/main/java/bisq/core/dao/DaoModule.java
#	src/main/java/bisq/core/dao/DaoSetup.java
#	src/main/java/bisq/core/dao/vote/blindvote/BlindVoteService.java
#	src/main/java/bisq/core/dao/vote/proposal/ProposalService.java
#	src/main/java/bisq/core/dao/vote/votereveal/VoteRevealService.java
#	src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java
#	src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java
#	src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
#	src/main/resources/i18n/displayStrings_de.properties
#	src/main/resources/i18n/displayStrings_el.properties
#	src/main/resources/i18n/displayStrings_es.properties
#	src/main/resources/i18n/displayStrings_hu.properties
#	src/main/resources/i18n/displayStrings_pt.properties
#	src/main/resources/i18n/displayStrings_ro.properties
#	src/main/resources/i18n/displayStrings_ru.properties
#	src/main/resources/i18n/displayStrings_sr.properties
#	src/main/resources/i18n/displayStrings_zh.properties

Merge branch 'master' into voting

# Conflicts:
#	src/main/java/bisq/common/UserThread.java
#	src/main/proto/pb.proto

Merge branch 'master' into voting

# Conflicts:
#	src/main/java/bisq/desktop/app/BisqAppMain.java
#	src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
 2018-07-11 02:43:32 +02:00
Manfred Karrer
a0b05c0741
Add mobile notification view 2018-07-11 00:08:42 +02:00
Christoph Atteneder
2b85d84bde
Revert version to -SNAPSHOT 2018-07-04 13:46:35 +02:00
Christoph Atteneder
e465428b4b
Use version 0.7.1 instead of -SNAPSHOT and bump version number where required 2018-07-04 13:44:44 +02:00
Manfred Karrer
15ad8f8f40
Update gradle files 
- Move mavenLocal on top to resolve local jars first
- Comment out annotationProcessor and testAnnotationProcessor entries as
 they conflict with grpc build (don't know why). Complete project build
 works also without the annotationProcessor entries.
- Comment out btcd-cli4j entries in dependencyVerification as they cause
build failure. TODO investigate why...
 2018-06-29 11:59:40 +02:00
Manfred Karrer
3eb187acff
Remove http-api 2018-06-28 19:59:57 +02:00
Manfred Karrer
a21fed6b52
Merge branch 'api-integration' into voting 
# Conflicts:
#	src/main/java/bisq/core/arbitration/DisputeManager.java

Merge branch 'api-integration' into voting

# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/dao/BaseProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
#	src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
#	src/main/java/bisq/desktop/util/GUIUtil.java
 2018-06-16 14:48:20 +02:00
Manfred Karrer
ba011d4629
Merge branch 'api-integration' into voting 
# Conflicts:
#	src/main/java/bisq/core/arbitration/DisputeManager.java

Merge branch 'api-integration' into voting

# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/dao/BaseProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/ProposalListItem.java
#	src/main/java/bisq/desktop/main/dao/proposal/active/ActiveProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/closed/ClosedProposalsView.java
#	src/main/java/bisq/desktop/main/dao/proposal/make/MakeProposalView.java
#	src/main/java/bisq/desktop/main/dao/proposal/myvotes/MyVotesView.java
#	src/main/java/bisq/desktop/util/GUIUtil.java
 2018-06-16 14:22:51 +02:00
Manfred Karrer
9c3865a331
Use verbosity in getBlock rpc call to get all txs 
Update to btcd-cli4j cb5c474b
 2018-06-16 13:39:27 +02:00
Manfred Karrer
ac17955dbe
Add mavenLocal to repositories 2018-06-16 13:15:58 +02:00
Manfred Karrer
15baead905
Add mavenLocal, updatte hashes 2018-06-08 13:42:58 +02:00
Manfred Karrer
bf46320cbc
Merge branch 'refactoring-mainviewmodel' into api-integration 
# Conflicts:
#	build.gradle
#	src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
 2018-06-06 15:10:54 +02:00