Commit graph

5926 commits

Author SHA1 Message Date
Chris Beams
2731e044fb
Use 'master' tor-binary Maven repository
For reasons detailed in bisq-network/bisq-p2p@b1528bf3.

This change also regenerates the `dependencyVerification` block, which
is necessary in any case after the upgrade of tor binaries, but note
especially that for unknown reasons, commenting out certain dependencies
items is now no longer necessary as it was in commit
53a9009b06.
2018-03-22 00:34:30 +01:00
Manfred Karrer
83b3deda92
Merge pull request #1473 from cbeams/gradle
Migrate build from Maven to Gradle
2018-03-21 09:51:16 -05:00
Chris Beams
53a9009b06
Comment out problematic dependency verifications
Problem: The dependency commented out in this commit, when left
uncommented cause any Gradle composite build that includes this
(`bisq-desktop`) build to fail with, for example, the following error:

    No dependency for integrity assertion found:
    com.github.bisq-network.libdohj:libdohj-core

Solution: Comment them out until someone can dig into the gradle-witness
plugin, figure out why these specific entries cause these failures, and
fix it. Note that the commented entries work as expected when this
Gradle build is used outside the context of a composite build.
2018-03-21 12:37:55 +01:00
Chris Beams
fa492836bb
Remove Maven build 2018-03-21 06:16:32 +01:00
Chris Beams
c19d3a0742
Replace Maven with Gradle in docs and scripts
This commit takes a pass through all documentation and scripts,
replacing any remaining `mvn` commands with their `gradle` equivalents,
replacing `target/*` paths with their `build/*` equivalents, and so on.

Note that the instruction to install Maven has been removed entirely
from documentation and scripts, as opposed to instructing users to
install Gradle, because with the Gradle wrapper (the `gradlew` script in
the root of this repository), it is unnecessary to install Gradle at
all. Users may still do this with, e.g. `brew install gradle` if they
like, but otherwise can get everything they need done with `./gradlew`
commands.

This commit also replaces lowercase 'bisq' with capitalized 'Bisq' where
appropriate in documentation.

Like the previous commit, this is a best-effort approach, and not all
scripts are perfectly up-to-date and tested. Indeed, many of the docs
and scripts we have now are essentially legacy documents and should
probably be scrapped or reworked completely.
2018-03-21 06:15:01 +01:00
Chris Beams
86a5a711c0
Update macOS packaging script
This commit is *not* a complete re-working of the scripts under package,
but is rather just enough of a re-working of the
package/osx/create_app.sh script to verify that the new Gradle build
creates a suitable fat executable jar for use in this script.

These changes have been tested with the following commands:

    cd package/osx
    ./create_app.sh
    open ../../deploy/Bisq-0.6.7.dmg

Then double-clicking the Bisq icon from the mounted DMG. Bisq starts up
as expected, without errors.

Further work will be required to update the package/osx/finalize.sh
script as well as the package/linux/ and package/windows/ scripts prior
to the next (0.7.0) release. For now, however, enough work has been done
to verify that the Gradle build creates the fat jar these scripts need.
2018-03-21 06:15:00 +01:00
Chris Beams
27cc933c4e
Verify dependency checksums with gradle-witness plugin
This performs the same function that the maven-enforcer-plugin did in
the pom removed by the previous commit, and also includes a more
comprehensive / up-to-date set of dependencies.

Note that the gradle-witness jar checked in here is one built from the
pull request in signalapp/gradle-witness#26.
2018-03-21 06:15:00 +01:00
Chris Beams
6e87bee784
Add Gradle build 2018-03-21 06:14:48 +01:00
Manfred Karrer
11049d1e5e
Cleanup, small refactorings 2018-03-20 23:24:23 -05:00
Manfred Karrer
11deab6453
Create data structures and tx for blind voting 2018-03-20 23:03:58 -05:00
Manfred Karrer
443abc0ec6
Add Capability.VOTE. Add VoteService to persistedDataHosts. 2018-03-20 22:40:15 -05:00
Manfred Karrer
887ac0f19b
Use PROPOSAL insted of COMPENSATION_REQUESTS in Phase enum 2018-03-20 09:25:13 -05:00
Manfred Karrer
74c2cfc6ca
Add icons 2018-03-20 08:09:36 -05:00
Manfred Karrer
8adedf6729
Merge pull request #1471 from ManfredKarrer/voting
Add UI for Voting
2018-03-20 07:56:31 -05:00
Chris Beams
9cb2e07b9b
Add common IDEA file templates (bisq-network/style#8) 2018-03-20 10:10:52 +01:00
Manfred Karrer
21974116d1
Add UI for Voting 2018-03-19 21:31:19 -05:00
Manfred Karrer
1bfbd258d3
Merge pull request #1470 from ManfredKarrer/voting
Add validation for description text. Fix wrong proposal type.
2018-03-19 13:19:19 -05:00
Manfred Karrer
118cbb5cf6
Add validation for description text. Fix wrong proposal type. 2018-03-19 11:20:37 -05:00
Manfred Karrer
c27e1d4cea
Remove call of getDirectionLabel method from actionColumn 2018-03-19 09:55:36 -05:00
Manfred Karrer
bc009ad2f2
Use AutoTooltipLabel as type in FormBuilder.addHBoxLabelComboBox 2018-03-19 09:52:41 -05:00
Manfred Karrer
0df3cccc02
Merge pull request #1469 from ripcurlx/fix-css-issues-in-messages
Fix style issues in support messages
2018-03-19 09:42:48 -05:00
Manfred Karrer
2d0521eea0
Merge pull request #1468 from ripcurlx/fix-total-btc-column-values-duplication
Reset column cell properly when re-used with null values
2018-03-19 09:38:26 -05:00
Christoph Atteneder
f1533285df
Reset styles to prevent random style issues 2018-03-19 10:13:08 +01:00
Christoph Atteneder
bbc07a432a
Add static highlight style to prevent roll over effect 2018-03-19 10:12:54 +01:00
Christoph Atteneder
78fd51cf1e
Reset column cell properly when null 2018-03-19 09:44:46 +01:00
Christoph Atteneder
9a03d53131
Merge pull request #1463 from ripcurlx/make-buy-sell-btc-screen-more-user-friendly
Making Buy/Sell BTC screen more user friendly (Part 1)
2018-03-19 08:41:20 +01:00
Chris Beams
730e583783
Add visual guide at 90-character Javadoc margin
Per bisq-network/style#5
2018-03-16 11:57:23 +01:00
Chris Beams
8f25bf3170
Wrap lines automatically at 120 character margin
Problem: bisq-network/style#3 indicates code should be wrapped at 120
characters, but it is likely that people will forget and that this habit
will only change slowly.

Solution: Configure IDEA to wrap lines automatically when typing past
120 characters, forcing the reminder to happen in real time. If this
becomes a nuisance, we can remove it later.

Note that this change also explicitly sets the RIGHT_MARGIN value to
120, even though this is already IDEA's default value. This is simply
to be explicit and self-documenting.
2018-03-16 11:40:33 +01:00
Chris Beams
35231e2ade
Preserve blank lines in .properties files
This setting is actually necessary only in bisq-common, but it has been
added to the shared codeStyles/Project.xml in bisq-network/dao so as to
be able to copy the same configuration file to all bisq-* projects.
2018-03-16 11:37:29 +01:00
Chris Beams
63a5aaedf4
Normalize .idea/codeStyles/*.xml EOF newlines
IDEA does strips EOF newlines in these files, so this commit adds an
exception to the usual rule about inserting them. This will avoid
spurious whitespace diffs on these files in the future.
2018-03-16 11:33:38 +01:00
Chris Beams
fb12bbf119
Fix syntax error in Travis CI config 2018-03-15 09:26:26 +01:00
Chris Beams
e8048b8ae1
Reduce Travis CI Slack notification frequency
Per https://docs.travis-ci.com/user/notifications/#Configuring-Slack-notifications
the default setting for Travis Slack notifications is to send a message
on every successful build. This commit changes this frequency, such that
notifications are always sent when builds fail and only sent when builds succeed
after a previous failure.
2018-03-15 08:44:19 +01:00
Manfred Karrer
261c1f56e0
Merge pull request #1461 from sqrrm/add-votingdashboard
Add missing VotingDashboardView.fxml
2018-03-14 20:08:51 -05:00
Chris Beams
6e60f0aa74
Organize imports with common layout (bisq-network/style#2) 2018-03-14 21:02:11 +01:00
Christoph Atteneder
ee45c6a218
Align filter horizontal 2018-03-14 17:59:17 +01:00
Christoph Atteneder
623dbe94a9
Use shorter lambda expression 2018-03-14 17:58:49 +01:00
Christoph Atteneder
e6fd619d1d
Fix rebase errors 2018-03-14 17:33:56 +01:00
Christoph Atteneder
5eb5df58e2
Align filters horizontal 2018-03-14 17:19:17 +01:00
Christoph Atteneder
2feffea57e
Add help popover for amount and volume column 2018-03-14 17:18:38 +01:00
Christoph Atteneder
5db43ee115
Adapt trader column to new column title 2018-03-14 17:14:37 +01:00
Christoph Atteneder
6ec683fb68
Change order of trader and action button columns 2018-03-14 17:14:37 +01:00
Christoph Atteneder
fdd9c87eca
Always use "Take offer" on action button 2018-03-14 17:14:36 +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
sqrrm
86dfc3bd84
Add missing VotingDashboardView.fxml 2018-03-14 14:28:49 +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