mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity
9776 commits 3 branches 150 tags 4.1 GiB
Commit graph

9776 commits

This branch
This branch
All branches
Author SHA1 Message Date
sqrrm
b823a9f31b
Merge pull request #3284 from christophsturm/caffeinate 
Use /usr/bin/caffeinate to disable power management on macOS
 2019-09-18 16:29:52 +02:00
Jason Davies
047ec4abaa
Add Ergo (ERG) without Bouncy Castle dependency. 
See #3195.
 2019-09-18 12:44:05 +01:00
battleofwizards
2d4abbe143
Remove controlsfx dependency 
The controlsfx is a huge JavaFX components library (0.83MB as JAR).

Turns out, we only use a single component, the PopOver. Fortunately,
the PopOver is self-contained and easy to pull out from controlsfx.

This commit embeds the PopOver in the project and removes controlsfx
dependency. The embedded version is exactly the same as previously
used in the project, so no change in semantics should occur.
 2019-09-18 11:52:50 +02:00
Christoph Atteneder
19a1910bba
Merge pull request #3279 from battleofwizards/remove-reactfx 
Remove reactfx dependency
 2019-09-18 09:46:52 +02:00
battleofwizards
2290eb2875
Remove showing FPS rate in developer mode 2019-09-18 09:34:46 +02:00
battleofwizards
9ea6b2163e
Remove reactfx dependency 
The reactfx was a 0.33MB dependency / 238 Java source files.

We only used it for FxTimer helper and to measure FPS in development mode.

The small FxTimer class got copied over into the project,
so there is no change in semantics.

The FPS measurement got replaced w/ com.sun.javafx.perf.PerformanceTracker,
an internal but long stable part of JavaFx. This is probably not a problem,
because it only concerns a rarely used, developer feature.
 2019-09-18 09:34:46 +02:00
Christoph Sturm
feadfb86a0 Add an explaining comment 2019-09-17 18:42:46 +02:00
Christoph Sturm
f2ec433cc2 use /usr/bin/caffeinate to disable power management on macOS 2019-09-17 18:22:46 +02:00
Christoph Sturm
219c5a0ba5 use gradle dist with sources for better IDE experience. 2019-09-17 18:22:37 +02:00
Christoph Atteneder
736da2a006
Merge pull request #3278 from erciccione/DAO-username 
Change dao.proposal.display.name to 'Exact GitHub username'
 2019-09-17 17:05:37 +02:00
Christoph Atteneder
8327c1fd12
Merge pull request #3281 from chimp1984/small-fixes-for-formatter-refactoring 
Use static method, remove unused formatter field
 2019-09-17 17:05:02 +02:00
chimp1984
b26a15600d
Use static method, remove unused formatter field 2019-09-17 16:56:30 +02:00
Christoph Atteneder
37eef84e57
Merge pull request #3280 from bisq-network/release/v1.1.6 
Release/v1.1.6
 2019-09-17 16:32:53 +02:00
Christoph Atteneder
cc3128d4e0
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.1.6 
# Conflicts:
#	core/src/main/java/bisq/core/offer/OfferUtil.java
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/MainView.java
#	desktop/src/main/java/bisq/desktop/main/MainViewModel.java
#	desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
 2019-09-17 15:52:51 +02:00
erciccione
072fb137bb
Change dao.proposal.display.name to 'Exact GitHub username' 2019-09-17 11:10:54 +02:00
Florian Reimair
4f8fb24cf3
Added rough bisq version metric 2019-09-16 19:02:46 +02:00
Florian Reimair
6964adca19
Sort hashes by hitcount 2019-09-16 19:02:45 +02:00
Christoph Atteneder
c0563fba1b
Revert to SNAPSHOT version 2019-09-16 11:21:39 +02:00
wiz
db62d0df0f
Update IP address for @mrosseel's 2 hard-coded BTC nodes 2019-09-16 09:26:30 +02:00
Christoph Atteneder
85f9ead931
Merge pull request #3262 from wiz/fix-mrosseel-btcnode-ip-addresses 
Update IP address for @mrosseel's 2 hard-coded BTC nodes
 2019-09-16 09:26:15 +02:00
wiz
8327d35ad5
Remove bitcoin4-fullnode.csg.uzh.ch / 192.41.136.217 btcnode 2019-09-16 09:25:37 +02:00
Christoph Atteneder
771b0fb844
Merge pull request #3264 from wiz/remove-tbocek-btcnode 
Remove bitcoin4-fullnode.csg.uzh.ch / 192.41.136.217 btcnode
 2019-09-16 09:25:01 +02:00
wiz
683b8b590a
Remove bitcoin4-fullnode.csg.uzh.ch / 192.41.136.217 btcnode 2019-09-15 11:06:19 +09:00
wiz
ec9cc04eb8
Update IP address for @mrosseel's 2 hard-coded BTC nodes 2019-09-15 09:50:57 +09:00
wiz
2782ae0e0e
Remove extra field from JapanBankTransferForm::addFormForBuyer() 2019-09-14 21:06:28 +02:00
Christoph Atteneder
b1e2483b67
Merge pull request #3260 from wiz/fix-japan-bank-account-gui-further 
Remove extra field from JapanBankTransferForm::addFormForBuyer()
 2019-09-14 21:06:15 +02:00
wiz
cf2158062b
Remove extra field from JapanBankTransferForm::addFormForBuyer() 2019-09-15 03:50:31 +09:00
wiz
4cc636dfea
Fix various bugs related to Japan Bank Transfer payment method (#3258) 
* Fix various bugs related to Japan Bank Transfer payment method

* Add missing call to addFormForBuyer(), improve BuyerStep2View UI
* Fix Account Creation UI elements width to fill entire pane
* Fix Account Creation UI elements padding to avoid overlap
* Tweak trade display popup text and various strings
* Remove @Deprecated tag

* Remove unnecessary line break

* Improve layout of fields
 2019-09-14 19:57:24 +02:00
Christoph Atteneder
0ada9a342a
Merge pull request #3259 from chimp1984/remove-CapabilityRequiringPayload-from-GetBlocksRequest 
Remove CapabilityRequiringPayload from GetBlocksRequest
 2019-09-14 19:56:49 +02:00
wiz
f9687ad563 Fix various bugs related to Japan Bank Transfer payment method (#3258) 
* Fix various bugs related to Japan Bank Transfer payment method

* Add missing call to addFormForBuyer(), improve BuyerStep2View UI
* Fix Account Creation UI elements width to fill entire pane
* Fix Account Creation UI elements padding to avoid overlap
* Tweak trade display popup text and various strings
* Remove @Deprecated tag

* Remove unnecessary line break

* Improve layout of fields
 2019-09-14 19:55:58 +02:00
chimp1984
9f84f023fa
Remove CapabilityRequiringPayload from GetBlocksRequest 
We remove CapabilityRequiringPayload as it would cause problems if the
lite node connects to a new seed node and they have not exchanged
capabilities already. We need to improve capability handling the we
can re-enable it again. As this message is sent any only to seed nodes
it does not has any effect. Even if a lite node receives it it will
be simply ignored.
 2019-09-14 19:51:15 +02:00
sqrrm
e6179990bd
Merge pull request #3255 from ripcurlx/update-data-stores-and-dates-for-v1.1.6 
Update data stores and dates for v1.1.6
 2019-09-14 01:25:20 +02:00
Christoph Atteneder
457da44b0c
Bump version number 2019-09-13 19:20:26 +02:00
Ben
069e5c0bea Update ParseUtils methods 2019-09-13 20:14:29 +03:00
Christoph Atteneder
12809a3c0e
Merge pull request #3254 from ripcurlx/improve-mediation-ui 
Improve mediation ui
 2019-09-13 19:11:26 +02:00
Christoph Atteneder
690ceb013e
Fix typo 2019-09-13 18:55:04 +02:00
benk10
4a9623bd1b
Merge branch 'master' into fix-offer-volume-jumps 2019-09-13 17:30:05 +03:00
Christoph Atteneder
ac98a616f1
Update migration dates for v1.1.6 and remove testing code 2019-09-13 14:46:09 +02:00
Christoph Atteneder
f28d262a8a
Update data stores 2019-09-13 14:45:10 +02:00
Christoph Atteneder
bd656d5b3e
Rename review and accept or reject button to prevent confusion 2019-09-13 13:39:29 +02:00
Christoph Atteneder
15f71c9e02
Add information what to do next after mediation is completed 2019-09-13 12:16:40 +02:00
Christoph Atteneder
982f610a16
Add alternative text until mediation is activated 2019-09-13 11:57:57 +02:00
Christoph Atteneder
84d91582d6
Hide support request info, when trade is complete 2019-09-13 11:40:38 +02:00
Christoph Atteneder
8f2009683c
Fix typo fist > first 2019-09-13 11:24:40 +02:00
wiz
a09557fc45
Add new payment method: Japan Bank Transfer (furikomi) 2019-09-13 09:37:16 +02:00
wiz
4d2a51ebb0
Add new FormBuilder method for Label + TextField + AutocompleteComboBox 2019-09-13 09:36:56 +02:00
Christoph Atteneder
13f00a9f48
Merge pull request #3225 from wiz/japan-bank-transfer-payment-method 
Add new payment method: Japan Bank Transfer
 2019-09-13 09:36:09 +02:00
Christoph Atteneder
e84fffb13b
Merge pull request #3250 from chimp1984/remove-required-capability 
Remove CapabilityRequiringPayload from NewBlockBroadcastMessage
 2019-09-13 09:26:51 +02:00
wiz
fb385a0074
Add new payment method: Japan Bank Transfer (furikomi) 2019-09-13 11:46:21 +09:00
Ramesh
c246571003 List Noteblockhain [NTBC] 
Added NoteBlockchain coin related assets
 2019-09-12 20:56:20 -04:00