Commit Graph

34 Commits

Author SHA1 Message Date
Christoph Atteneder
0edbb1733c
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
#	desktop/src/main/java/bisq/desktop/util/FormBuilder.java
2018-10-16 10:09:37 +02:00
Manfred Karrer
3689e4cbf1
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/src/main/java/bisq/core/dao/state/SnapshotManager.java
2018-09-25 19:58:15 -05:00
Christoph Atteneder
2dfb0de1aa
Update code style 2018-09-19 09:06:35 +02:00
Christoph Atteneder
59551772a7
Redesign splash screen 2018-09-19 09:00:38 +02:00
Christoph Atteneder
11384ab807
Update imports for de.jensd.fx and optimize imports 2018-04-17 11:17:35 +02:00
Chris Beams
04bace7a28
Disable IDEA wrap on typing
See bisq-network/style#3
2018-03-23 23:29:57 +01:00
Chris Beams
9cb2e07b9b
Add common IDEA file templates (bisq-network/style#8) 2018-03-20 10:10:52 +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
6e60f0aa74
Organize imports with common layout (bisq-network/style#2) 2018-03-14 21:02:11 +01: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
SimonTuberlin
ad96e1f494 Prepared DownloadUtil task and updateAlert window 2017-07-03 13:11:11 +02:00
Manfred Karrer
11c5c92879 Merge branch 'master' into Development
# Conflicts:
#	.idea/codeStyleSettings.xml
2017-06-28 14:48:47 +02:00
Manfred Karrer
0456c43012 Copied over from Development branch (git merge failed) for v.5.0 2017-06-28 14:47:06 +02:00
Manfred Karrer
e1e8c4a428 Update app icons and build scripts 2017-06-27 02:50:31 +02:00
Manfred Karrer
e258b17e7a Update license with Bisq instead of bisq 2017-06-27 01:39:11 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
0480e44fd7 Update code style settings 2016-10-31 12:34:08 +01:00
Manfred Karrer
dab1b56e75 Update code settings file 2016-09-04 14:57:03 -05:00
Manfred Karrer
e747392323 v0.4.9.6 2016-09-04 14:48:38 -05:00
Manfred Karrer
956843ca14 Apply primary market based direction, add BTC if "buyer" or "seller" is used in info text, remove embedded app version in offerID, 2016-08-28 18:01:53 +02:00
Manfred Karrer
c6ece486ed move network code to module 2015-10-28 02:12:00 +01:00
Manfred Karrer
b72c5aaebf Change formatting rule RIGHT_MARGIN 2015-02-14 22:11:02 +01:00
Chris Beams
b890f37216
Introduce top-level viewfx package
Move general-purpose ui infrastructure to this new package, leaving
what's in io.bitsquare.gui truly specific to Bitsquare.
2014-11-25 22:08:50 +01:00
Chris Beams
8746ab74de
Restore GPL copyright header configuration
This partially reverts changes (accidentally) made in fb89f08, restoring
IDEA copyright header configuration files back to their original state
as committed in d5e7b6c.
2014-10-05 19:49:51 +02:00
Chris Beams
041d8ec7a7
Upgrade to BitcoinJ 0.12-SNAPSHOT
- Update imports to reflect BitcoinJ's repackaging, including:

   git grep -l 'import com.google.bitcoin' | \
   xargs perl -p -i -e 's/import com.google.bitcoin/import org.bitcoinj/'

   git grep -l 'com.google.bitcoin' | \
   xargs perl -p -i -e 's/com.google.bitcoin/org.bitcoinj/'

 - Replace use of BitcoinJ's CoinFormat, which has now been renamed to
   MonetaryFormat, using:

   git grep -l 'CoinFormat' | \
   xargs perl -p -i -e 's/CoinFormat/MonetaryFormat/g'

 - Fix calls to BitcoinJ's Script#correctlySpends, whose signature has
   changed from 0.11 => 0.12.

See #98
2014-10-02 16:07:27 +02:00
Manfred Karrer
fb89f087f0 fixed app dir problem with update to gradle. 2014-08-28 18:24:42 +02:00
Chris Beams
a31aa9c883
Organize import statements 2014-08-26 16:01:34 +02:00
Chris Beams
424d4e8ff8
Format else statements on new line
Based on Manfred's existing IDEA settings
2014-08-26 16:01:33 +02:00
Chris Beams
1ad1d318e8
Wrap lines at 120 chars 2014-08-26 16:01:33 +02:00
Chris Beams
9c3df7375a
Add IDEA formatting settings 2014-08-26 16:01:31 +02:00
Chris Beams
d5e7b6cfdb
Add IDEA copyright configuration 2014-08-26 15:56:14 +02:00