Manfred Karrer
0c26833608
Update rpc port for regtest
2018-09-14 12:33:37 -05:00
Christoph Atteneder
cbefd37561
Merge pull request #1685 from ripcurlx/merge-remaining-repositories
...
Merge missing repositories into mono repository
2018-09-14 16:13:35 +02:00
Christoph Atteneder
d1be121b57
Merge statsnode repository at fc0a288
2018-09-14 11:53:35 +02:00
Christoph Atteneder
3de0a8b964
Merge seednode repository at eedf81c
2018-09-14 11:51:34 +02:00
Christoph Atteneder
a55673fe52
Merge relay repository at 5c730b0
2018-09-14 11:48:49 +02:00
Christoph Atteneder
9a7b761549
Merge pricenode repository at 85df033
2018-09-14 11:45:35 +02:00
Christoph Atteneder
ecef18a437
Merge monitor repository at fd01ee4
2018-09-14 11:42:51 +02:00
Christoph Atteneder
f1447e8a9b
Merge pull request #1684 from arunasurya/grammar-fixes
...
Improve grammar of Welcome text
2018-09-14 08:52:02 +02:00
Aruna Surya
cd5c5eda65
Improve grammar of Welcome text
2018-09-13 20:01:10 +02:00
Christoph Atteneder
968d0dfe7c
Merge pull request #1682 from cbeams/check-asset-sorting
...
Check bisq.asset.Asset sort order during CI
2018-09-13 17:11:14 +02:00
Chris Beams
9ec47d2292
Check bisq.asset.Asset sort order during CI
...
This check had been set up for some time in the original
bisq-network/bisq-assets repository.
2018-09-13 08:06:37 +02:00
Chris Beams
83cd8d0345
Merge pull request #1680 from knil79/fix/updated_readme_newversion
...
Update readme.md with the new tested IDEA version, 2018.2
2018-09-12 16:30:50 +02:00
KristianNilsen
155bfba83a
Updated readme.md with the tested IDEA version 2018.2
2018-09-12 15:52:22 +02:00
Christoph Atteneder
2f317962b5
Merge pull request #1674 from arunasurya/seed-grammar
...
Improve grammar of seed info
2018-09-12 09:42:42 +02:00
Aruna Surya
a89d22118d
Improve grammar of seed info
2018-09-11 21:40:40 +02:00
Christoph Atteneder
22dcd17ef1
Merge pull request #1673 from cbeams/install-lombok
...
Add installing Lombok to build instructions
2018-09-11 18:28:40 +02:00
Chris Beams
7dab42f451
Add installing Lombok to build instructions
...
Also, separate one-time IDEA configuration items from details of
importing the project.
2018-09-11 15:30:29 +02:00
Manfred Karrer
fc5868912a
Merge pull request #1670 from ripcurlx/add-missing-step-two
...
Add mentioned step 2 in build doc
2018-09-10 08:30:27 -05:00
Christoph Atteneder
d4ec79c95b
Add mentioned step 2
2018-09-10 12:20:01 +02:00
Christoph Atteneder
3d62605597
Merge pull request #1661 from cbeams/overhaul-readme
...
Overhaul README
2018-09-07 15:48:13 +02:00
Chris Beams
ac6d93162a
Overhaul README
...
As a follow-on to the monorepo reconsolidation (#1650 ):
- Revise and shorten "What is Bisq" section
- Remove outdated sections
- Remove sections documented elsewhere
- Add instructions for building, running and importing into IDEA
2018-09-07 15:21:56 +02:00
Christoph Atteneder
708d9a4325
Merge pull request #1650 from ripcurlx/create-mono-repository
...
Create mono repository
2018-09-05 17:35:03 +02:00
Christoph Atteneder
4f7161a0a4
Update checksum for forked repositories
2018-09-05 11:38:16 +02:00
Christoph Atteneder
4339d33592
Adapt to new path structure
2018-09-05 11:24:19 +02:00
Christoph Atteneder
5d4e99c210
Merge 'Update and add new checksums':5e9f48d1e129053d53dfc9f3bd36ad76142265c9
2018-09-05 11:23:27 +02:00
Christoph Atteneder
00bce03695
Fix Javadoc errors
2018-09-05 11:20:44 +02:00
Christoph Atteneder
ca825410bc
Improve gitignore
2018-09-05 11:20:22 +02:00
Chi Nul
c3dc3c5086
Update gradle to 4.9
2018-09-05 11:19:58 +02:00
Chi Nul
918269b6ea
Merge "desktop: Update gradle scripts for monorepo":5f14cf8b4146f4eb25b7bd03f7f44e129c97be17 from @chirhonul
2018-09-05 11:19:20 +02:00
Chi Nul
14efcbce98
Merge "Update root gradle scripts":9c628bb873cbfd7fd9c56fbbd022470a205561f9 from @chirhonul
2018-09-05 11:15:30 +02:00
Chi Nul
08bd373587
assets: Drop now unnecessary files
2018-09-05 11:10:20 +02:00
Christoph Atteneder
df4944bd3f
Add assets to settings file
2018-09-05 11:09:58 +02:00
Christoph Atteneder
b013c71ff5
Merge assets repository at 2a7e17f
2018-09-05 11:08:28 +02:00
Christoph Atteneder
b8c7981049
Clean p2p build file
2018-09-05 11:02:02 +02:00
Chi Nul
91cb4a9c28
p2p: Drop now unnecessary files
2018-09-05 11:01:12 +02:00
Christoph Atteneder
7a5eb33b67
Merge commit for @chirhonul 's commit "core: Drop now unnecessary files" 8cd93def30bd7039f5c8da77c1c9eff0a8cc35d8
2018-09-05 11:00:49 +02:00
Christoph Atteneder
b35f8e5161
Adapt p2p reference in build files
2018-09-05 10:53:30 +02:00
Christoph Atteneder
27b6fa6a09
Merge p2p repository at eb22118
2018-09-05 10:52:42 +02:00
Christoph Atteneder
4c470d39e1
Adapt core reference in build files
2018-09-05 10:51:21 +02:00
Christoph Atteneder
049655b685
Merge core repository at 4597613
2018-09-05 10:48:22 +02:00
Christoph Atteneder
df9dc6e089
Adapt common reference in build files
2018-09-05 10:46:27 +02:00
Christoph Atteneder
fce7f45a41
Merge common project at 6085d83
2018-09-05 10:39:56 +02:00
Chi Nul
9014925d1c
Move witness gradle plugin to desktop
2018-09-05 10:27:23 +02:00
Christoph Atteneder
c1c38a3ceb
Move desktop to subdirectory
2018-09-05 09:50:29 +02:00
Manfred Karrer
6d1c03b269
Merge pull request #1646 from ManfredKarrer/mk_master
...
Small improvements in DAO code
2018-09-01 17:52:50 +02:00
Manfred Karrer
9ccdfcfc5d
Fix wrong list of ballots in blind vote phase
2018-08-29 12:39:24 +02:00
Manfred Karrer
a5088704c6
Rename DecryptedVote to DecryptedBallotsWithMerits
2018-08-29 12:04:18 +02:00
Manfred Karrer
c0134a3e01
Move ValidationException to other package
2018-08-29 11:54:20 +02:00
Manfred Karrer
3236a79a63
Merged master
2018-08-29 11:06:00 +02:00
Christoph Atteneder
cd2a86d4aa
Merge pull request #1642 from chirhonul/1808-fixup-script
...
Verify all checksums in prepare-system.sh
2018-08-28 13:24:19 +02:00
