mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,714 Commits 4 Branches 148 Tags 4.3 GiB
7228228dc7
Commit Graph

6714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
7228228dc7
Merge branch 'master' into DAO-UI-hide-details 2018-10-23 11:52:44 -05:00
Christoph Atteneder
62b4b59895
Merge pull request #1805 from ripcurlx/remove-unnecessary-java-module-config 
Remove java 9 module configuration
 2018-10-23 18:17:42 +02:00
Christoph Atteneder
80544d52f4
Remove module configuration for openjfx libraries as they are not used as Java 9 modules. 2018-10-23 10:15:59 +02:00
Manfred Karrer
f8754969e9
Merge pull request #1803 from ManfredKarrer/move-javafx-dep-to-common 
Move javafx dependencies to common
 2018-10-22 17:01:12 -05:00
Manfred Karrer
d80af564ed
Move javafx dependencies to common 
For the upcoming API work we use java fx classes also in common (PR
is pending), so that is one reason to move that. But there was also an
issue on Linux (travis) as the platform property was not set in the
core gradle build file, but it is already defined in common.
 2018-10-22 16:01:02 -05:00
Manfred Karrer
2c26702c14
Merge pull request #1802 from ManfredKarrer/move-javafx-dep-to-core 
Move javafx dependencies to core
 2018-10-22 13:22:43 -05:00
Manfred Karrer
871e776509
Move javafx dependencies to core 
We use some javafx (Properties,...) classes in core as well, so we need
to have the dependency resolved there already.
 2018-10-22 13:17:06 -05:00
Manfred Karrer
d7e779daf5
Add TODO note to old build scripts 
Also remove outdated file for updating bitcoinj
 2018-10-22 13:09:33 -05:00
Manfred Karrer
8b55f6f3d9
Merge pull request #1801 from ripcurlx/remove-openjfx-checksum 
Remove openjfx checksum until implementation for platform specific libraries is finished
 2018-10-22 13:01:24 -05:00
Christoph Atteneder
3f04be9d30
Remove openjfx checksum until implementation for platform specific libraries is finished 2018-10-22 19:57:25 +02:00
Manfred Karrer
39847840cd
Merge pull request #1800 from ripcurlx/fix-checksum-issues 
Remove platform specific libraries in checksum
 2018-10-22 12:22:46 -05:00
Christoph Atteneder
4fe45d3b8b
Remove platform specific libraries in checksum 2018-10-22 18:58:19 +02:00
Christoph Atteneder
63a9435df5
Merge pull request #1794 from devinbileck/openjdk10 
Use OpenJDK10
 2018-10-22 15:05:45 +02:00
Christoph Atteneder
c231187daa
Add checksums for new openjfx libraries 2018-10-22 09:42:35 +02:00
Manfred Karrer
7e64cd2348
Update link 2018-10-20 11:30:34 -05:00
Devin Bileck
861d8143ac
Add comment to clarify usage of buildscript block 2018-10-20 08:45:08 -07:00
Devin Bileck
5ae96b74b1
Remove unnecessary content from build.gradle 2018-10-20 08:25:17 -07:00
Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings 
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
 2018-10-19 23:43:07 -05:00
Manfred Karrer
75e0daefbf
Merge branch 'master' into DAO-UI-hide-details 2018-10-19 21:01:53 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Devin Bileck
cff51d5e49
Update README 2018-10-19 16:10:06 -07:00
Devin Bileck
2be4d3d8aa
Add mainClassName to common/build.gradle 
Fix the following error:
  A problem was found with the configuration of task ':common:startScripts'.
  > No value has been specified for property 'mainClassName'.
 2018-10-19 15:54:47 -07:00
Devin Bileck
48c196b5d1
Switch to OpenJDK10 in Gradle builds 
Oracle JDK10 is EOL and is no longer available for download.
So switch to OpenJDK10 in Gradle builds.
 2018-10-19 15:46:01 -07:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements 
Persitence of DAO state
 2018-10-18 16:15:28 -05:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
15177e6537
Add comment 2018-10-17 14:21:31 -05:00
Manfred Karrer
b37de6a507
Merge pull request #1781 from m52go/refine-shutdown-message 
Refine shutdown message to warn about open offers
 2018-10-17 11:02:58 -05:00
Manfred Karrer
dbe5cf6f85
Replace double quote with single 
Double quotes are only needed when a placeholder ({0}) is used in the text. Otherwise it would show 2 quotes.
 2018-10-17 11:02:34 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Manfred Karrer
0c5df1061c
Change delay for storage from 2 sec to 200 ms 2018-10-17 10:52:37 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04:00
Christoph Atteneder
9ce8b215e1
Merge pull request #1775 from devinbileck/fix-take-offer-view 
Hide text that is not applicable in take offer view
 2018-10-17 10:17:31 +02:00
Manfred Karrer
6d18a9ea78
Rename BsqState to DaoState 2018-10-17 00:13:42 -05:00
Manfred Karrer
e6f44ff1ae
Comment out BsqState in PB definitions 2018-10-16 23:22:50 -05:00
Manfred Karrer
a308469ac6
Support for persisted bsqState as resource file 
- Move DecryptedBallotsWithMerits list and EvaluatedProposal list to
BsqState

- Use StoreService for handling persistence of snapshots
 2018-10-16 23:21:11 -05:00
Manfred Karrer
8e46b1760f
Add new storage type to p2p library 
- We introduce a new basic storage type for reading from a resource file
if available and reading initial db file if available. That is required
for the snapshots of the DaoState which will be shipped with the source
code.

- We separate the support for maps to MapStoreService
 2018-10-16 23:16:52 -05:00
Devin Bileck
5e27cbb2f6
Fix field visibility for fixed amount offer 2018-10-16 14:52:41 -07:00
Manfred Karrer
d33298d087
Add more tests 2018-10-16 13:53:58 -05:00
Manfred Karrer
dabe6907e1
Fix missing sorting 2018-10-16 12:40:10 -05:00
Devin Bileck
d435afdd03
Merge remote-tracking branch 'upstream/master' into fix-take-offer-view 2018-10-16 10:06:11 -07:00
Manfred Karrer
254059b411
Fix typo 2018-10-16 11:57:50 -05:00
Manfred Karrer
1fadef15ef
Merge branch 'ManfredKarrer-arbitration-system-improvements' 2018-10-16 11:51:24 -05:00
Manfred Karrer
ce5a8b4f19
Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
 2018-10-16 11:48:11 -05:00
Manfred Karrer
dc6c25ed81
Merge branch 'master' into arbitration-system-improvements 2018-10-16 11:32:07 -05:00
Christoph Atteneder
05c47ae1d6
Merge pull request #1767 from devinbileck/labels-truncated-with-display-scaling 
Workaround for JDK-8199592; text being truncated at certain display scaling levels
 2018-10-16 12:16:30 +02:00
Christoph Atteneder
ad5e2329ce
Merge pull request #1774 from devinbileck/fix-preferences-view-combobox-selection 
Fix preferences view combobox selection
 2018-10-16 12:08:19 +02:00
Christoph Atteneder
866ea007dd
Merge pull request #1771 from devinbileck/fix-arbitrator-language-selection 
Fix arbitrator language selection
 2018-10-16 12:00:04 +02:00
Manfred Karrer
2133b37837
Merge pull request #1706 from Mentors4EDU/List-EtherStone-(ETHS) 
List EtherStone (ETHS)
 2018-10-15 12:30:59 -05:00
Manfred Karrer
6a6f648142
Merge pull request #1723 from blur-network/list-blur-asset 
List Blur (BLUR)
 2018-10-15 12:29:57 -05:00