Chris Beams
6e60f0aa74
Organize imports with common layout ( bisq-network/style#2 )
2018-03-14 21:02:11 +01:00
Chris Beams
a0ace4a05c
Merge pull request #1459 from cbeams/simplify-token-listing
...
Move 'util.validation' package down to bisq-core
2018-03-14 16:14:37 +01:00
Manfred Karrer
c6d21614c6
Delete empty comp request views
2018-03-14 01:31:10 -05:00
Manfred Karrer
1ee87e52e3
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/bisq/desktop/main/dao/compensation/CompensationRequestDisplay.java
# src/main/java/bisq/desktop/main/dao/compensation/CompensationRequestView.java
# src/main/java/bisq/desktop/main/dao/compensation/CompensationView.java
# src/main/java/bisq/desktop/main/dao/compensation/active/ActiveCompensationRequestView.java
# src/main/java/bisq/desktop/main/dao/compensation/create/CreateCompensationRequestView.java
# src/main/java/bisq/desktop/main/dao/compensation/past/PastCompensationRequestView.java
# src/main/java/bisq/desktop/main/overlays/windows/TorNetworkSettingsWindow.java
2018-03-14 01:28:28 -05:00
Manfred Karrer
398f292493
Apply changes in comp. request view. Remove outdated vote views.
2018-03-14 01:16:27 -05:00
Manfred Karrer
3bad924c89
Remove double license header
2018-03-14 00:53:13 -05:00
Manfred Karrer
526e81bb7c
Change comp request view
2018-03-14 00:49:44 -05:00
Manfred Karrer
2d89453736
Reformat and organize imports
2018-03-14 00:23:33 -05:00
Chris Beams
d7231a4736
Move bisq.{common => core}.[locale,monetary]
...
See bisq-network/bisq-common@0f05e69
See bisq-network/bisq-core@68459a4
2018-03-13 15:29:14 +01:00
Chris Beams
7f578d9238
Move bisq.{desktop.util => core.payment}.validation
2018-03-13 12:51:26 +01:00
Manfred Karrer
88462c1180
Leave CFBundleIdentifier to io.bisq.Bisq
...
io.bisq.Bisq is the registered app ID at Apple for code signing.
It can be changed but I prefer to postpone that for later.
2018-03-12 21:49:17 -05:00
Manfred Karrer
5ec8782ea8
Merge pull request #1454 from cbeams/repackage
...
Rename and repackage bisq-desktop
2018-03-12 10:59:05 -05:00
Chris Beams
dc8150e7df
Organize imports
...
This change adds a .idea/codeStyles/Project.xml file that orders all
imports from higher-level layers to lower-level layers, with blank lines
between different major packages.
The purpose of this approach is to allow the reader to scan the imports
in a file efficiently to understand what kind of work the class does,
what layers it touches, and so forth. Keeping imports clean and ordered
by layer can be a powerful tool in keeping a codebase well organized and
tangle-free over time.
bisq.* packages are always sorted at the top.
2018-03-12 15:21:02 +01:00
Chris Beams
0a0832ada3
Remove commented lines from logback config
2018-03-12 12:39:22 +01:00
Chris Beams
5f4fd6e1af
Move AGPL license header to top of Java source files
2018-03-12 12:32:26 +01:00
Chris Beams
7d11fbd6dc
Add AGPL license header to Java sources where missing
2018-03-12 12:24:38 +01:00
Chris Beams
a60a6b05de
Capitalize 'Bisq' in AGPL license header text
2018-03-12 12:22:30 +01:00
Chris Beams
c68d0f4af2
Repackage {io.bisq.gui => bisq.desktop}
2018-03-12 09:31:14 +01:00
Chris Beams
ac652ea388
Repackage {io.bisq.core => bisq.core}
2018-03-12 08:30:27 +01:00
Chris Beams
3146ccabe0
Repackage {io.bisq.network => bisq.network}
2018-03-12 08:17:33 +01:00
Chris Beams
4efea636e5
Repackage {io.bisq.common => bisq.common}
2018-03-12 06:17:52 +01:00
Chris Beams
15589eddf0
Rename groupid {io.bisq => network.bisq}
2018-03-12 05:51:40 +01:00
Chris Beams
eef9062a69
Add missing reactfx dependency
...
This had been getting pulled in transitively through the old
io.bisq.exchange:core artifact's parent pom. Now that we're depending on
the io.bisq:bisq-core, there is no parent pom in the mix anymore, and
the reactfx dependency must to be explicitly declared here.
2018-03-10 22:06:38 +01:00
Chris Beams
6cef0ffb94
Update Travis CI Slack notification config
...
The configuration was still set up to send notifications to #bisq-core.
Now it will send them to #bisq-desktop.
2018-03-10 22:05:38 +01:00
Chris Beams
cd5078749f
Update bisq-core GAV coordinates
2018-03-10 21:53:54 +01:00
Chris Beams
83a6e74a5a
Merge pull request #1449 from cbeams/isolate-desktop
...
Isolate 'gui' module and rename to 'bisq-desktop'
2018-03-10 19:01:12 +01:00
Chris Beams
6e25a9b28d
Rename artifact desktop => bisq-desktop
2018-03-10 18:51:09 +01:00
Chris Beams
3f0e85e65b
Remove gui path from scripts and .gitignore
2018-03-10 18:51:09 +01:00
Chris Beams
d42524df66
Remove now-obsolete CODEOWNERS file
2018-03-10 18:51:09 +01:00
Chris Beams
96ffc7d498
Hoist gui module to top level and adapt pom
2018-03-10 18:51:08 +01:00
Chris Beams
2c0392bceb
Move common module to new bisq-common repository
2018-03-10 17:31:14 +01:00
Chris Beams
231c8b7e0f
Move network module to new bisq-p2p repository
2018-03-10 17:29:29 +01:00
Chris Beams
970095f9ab
Move core module to new bisq-core repository
2018-03-10 17:29:25 +01:00
Manfred Karrer
209fdffedf
Remove consensus module
2018-03-10 10:59:05 -05:00
Manfred Karrer
3af5975be0
Move io.bisq.consensus.UsedForTradeContractJson to io.bisq.common.consensus.UsedForTradeContractJson
2018-03-10 10:57:24 -05:00
Manfred Karrer
4dda4401e2
Rename RestrictedByContractJson to UsedForTradeContractJson
2018-03-10 10:52:58 -05:00
Manfred Karrer
0cd1318436
Apply to new data structure
2018-03-10 10:22:59 -05:00
Manfred Karrer
a8962c833a
Merge branch 'handle-genesis-change' of https://github.com/sqrrm/exchange into sqrrm-handle-genesis-change
...
# Conflicts:
# core/src/main/java/io/bisq/core/dao/node/consensus/GenesisTxController.java
2018-03-10 10:22:43 -05:00
Manfred Karrer
87a4924893
Apply formatting
2018-03-10 10:15:50 -05:00
Manfred Karrer
b44fdc9cd7
Merge branch 'list-wmcc' of https://github.com/WorldMobileCoin/bisq-exchange into WorldMobileCoin-list-wmcc
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:15:06 -05:00
Manfred Karrer
cc065e6c85
Rearrange code positions
2018-03-10 10:13:55 -05:00
Manfred Karrer
afe47c3ad7
Merge branch 'list-ROIcoin' of https://github.com/ghobson2013/exchange into ghobson2013-list-ROIcoin
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-03-10 10:13:47 -05:00
Manfred Karrer
68dd8d9831
Rearrange code positions
2018-03-10 10:12:00 -05:00
Manfred Karrer
7cb674a0a4
Merge branch 'master' of https://github.com/swordfish6975/exchange into swordfish6975-master
...
# Conflicts:
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:11:49 -05:00
Manfred Karrer
b5786f038f
Rearrange code positions
2018-03-10 10:09:25 -05:00
Manfred Karrer
e9a0d7e3ff
Merge branch 'list-din-altcoin' of https://github.com/dinerocoin/exchange into dinerocoin-list-din-altcoin
...
# Conflicts:
# core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
# gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2018-03-10 10:08:57 -05:00
Manfred Karrer
cd04e1b0f9
Put new code for altcoin in right places.
2018-03-10 10:06:42 -05:00
Manfred Karrer
8754f41c1e
Merge branch 'master' of https://github.com/angelcoinmoney/exchange into angelcoinmoney-master
2018-03-10 10:01:41 -05:00
Manfred Karrer
f3d4989b11
Merge remote-tracking branch 'origin/master'
2018-03-10 09:38:35 -05:00
Chris Beams
38b51f2175
Merge pull request #1448 from cbeams/extract-modules
...
Move statistics and monitor modules to separate repositories
2018-03-10 15:24:26 +01:00
