Commit graph

6593 commits

Author SHA1 Message Date
Christoph Atteneder
1c783e436e
Update fontawesome library 2018-09-14 15:28:51 +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
Christoph Atteneder
64370f7adb
Fix JMockit setup 2018-09-13 10:46:07 +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
b071c24f08
Capitalize GreenBlockCoin correctly 2018-09-13 08:02:03 +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
672e3622b6
Add -srcdir for Java 10 javapackager 2018-09-11 20:09:22 +02:00
Christoph Atteneder
2efe20a63f
Add temporary workaround for running desktop build 2018-09-11 19:00:45 +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
dd6a37291f
Change progress indicator skin to work with Java 9+ 2018-09-10 15:00:03 +02:00
Christoph Atteneder
d4ec79c95b
Add mentioned step 2 2018-09-10 12:20:01 +02:00
DATSEC
14999bfc3d List Starwels (MAI)
Resubmission. Original one:
https://github.com/bisq-network/bisq-assets/pull/82
Official project URL:
https://www.zerogate.tk/139H5wy8H3tgXwJ33mXpwmm4oCfjKUo7dY/
Official block explorer URL: http://91.240.86.126:3001/
2018-09-09 14:57:13 +03:00
BTC2CoreDevs
cb8ca7666e List Bitcoin 2 (BTC2)
Resubmission. Original one: https://github.com/bisq-network/bisq-assets/pull/105
- Already ACKed.

Official project URL: https://www.bitc2.org/
Official block explorer URL: https://www.bitc2.org/block-explorer/

Suggestion: In case of a dispute, the seller of BTC2 should tell the transaction ID (hash). He/she can obtain that easily from the block explorer or from the Bitcoin 2 Core wallet by clicking the Transactions Tab, then clicking the transaction and copy-pasting the transaction ID.
2018-09-07 17:21:46 +03: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
13266b26da
Use FXCollections instead of not existing ObservableListWrapper 2018-09-07 14:04:56 +02:00
Christoph Atteneder
8ed7f4218f
Add not working JMockit setup (help wanted) 2018-09-07 14:03:52 +02:00
Christoph Atteneder
e319449186
Make power mock tests Java 10 compatibile 2018-09-07 14:02:22 +02:00
Christoph Atteneder
5d239711da
Update travis Java version 2018-09-07 13:04:15 +02:00
Christoph Atteneder
bd9a208977
Update source compatibility to Java 10 2018-09-07 11:35:45 +02:00
Scott Donald
1520918f99 List Quantum Resistant Ledger (QRL) 2018-09-07 17:41:34 +10:00
ksynb
3c53c45638 List Neos (NEOS) 2018-09-07 01:04:16 -04:00
mobitglobal
0f619b1065 List MobitGlobal (MBGL) 2018-09-07 00:02:27 +02:00
vasyl golub
32341ba7e5 List Greenblockcoin (GBK) 2018-09-06 14:21:07 -07:00
BoubonicNugz
3a97a2d3e7 List PZDC (PZDC) 2018-09-06 14:17:21 -07:00
Aleksey D
0221947a13 List Loki (LOKI) 2018-09-06 22:43:16 +03:00
alaniz
95f9fc5395 List Kekcoin (KEK) 2018-09-06 18:54:39 +01:00
Christoph Atteneder
73e4ee5f47
Update lombok library 2018-09-05 18:54:18 +02:00
Christoph Atteneder
47251914ca
Remove files that use classes that can't be accessed anymore 2018-09-05 18:48:29 +02:00
Christoph Atteneder
9b4b062e81
Clean up errors for testing 2018-09-05 18:45:31 +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