mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,174 Commits 4 Branches 148 Tags 4.3 GiB
3890c9cb51
Commit Graph

751 Commits

Author SHA1 Message Date
Manfred Karrer
c4d561b7aa
Merge pull request #2242 from sqrrm/dao-avoid-bsq-burn 
Dao avoid bsq burn
 2019-02-03 22:59:30 +01:00
Manfred Karrer
f6e8473324
Improve logs 2019-02-03 21:22:35 +01:00
Manfred Karrer
002f225bdd
Merge branch 'master' into dao-add-filter-flag-for-disable-dao 2019-02-03 21:13:06 +01:00
Manfred Karrer
0232fadad5
Rename heightOfFirstBlock to heightOfFirstBlockInCycle 2019-02-03 18:49:57 +01:00
Manfred Karrer
90d0f4a9af
Add key event handler for republishing all governance data 2019-02-03 18:45:57 +01:00
Manfred Karrer
39d94eec99
Show myVote as invalid if not included in result list 2019-02-03 16:38:51 +01:00
sqrrm
686bd2f90e
Merge branch 'master' into dao-avoid-bsq-burn 2019-02-03 15:59:32 +01:00
Manfred Karrer
0c53699bc9
Add checkbox for disabling DAO 2019-02-03 00:20:48 +01:00
Devin Bileck
f873fab49d
Add execute permission for shell scripts 2019-01-31 10:39:14 -08:00
Christoph Atteneder
bf94810126
Merge pull request #2342 from ManfredKarrer/dao-show-menu-item 
Dao show menu item
 2019-01-30 13:10:16 +01:00
Christoph Atteneder
d1246ca192
Merge pull request #2328 from ManfredKarrer/dao-improve-exception-handling 
Dao improve exception handling
 2019-01-30 13:03:57 +01:00
Christoph Atteneder
3787a9eb00
Merge pull request #2331 from ManfredKarrer/dao-avoid-multiple-button-clicks 
Dao avoid multiple button clicks
 2019-01-30 13:03:13 +01:00
Christoph Atteneder
86c9845523
Merge pull request #2333 from ManfredKarrer/dao-fix-phase-display 
Fix incorrect phase display
 2019-01-30 13:02:36 +01:00
Christoph Atteneder
15201cb5da
Merge pull request #2335 from ManfredKarrer/dao-vaious-bug-fixes 
Dao various bug fixes
 2019-01-30 13:02:02 +01:00
Christoph Atteneder
4a709cbd97
Fix group separation line issue 2019-01-30 13:00:19 +01:00
Manfred Karrer
201f9a0fbc
Delete tor files at startup 
We get sometimes Tor startup problems which is related to some tor
files in the tor directory. It happens more often if the application
got killed (not graceful shutdown).
Creating all tor files newly takes about 3-4 sec. longer and it does
not benefit from cache files.
TODO: We should fix those startup problems in the netlayer library,
once fixed there we can remove that call at the
Bisq startup again.
 2019-01-30 11:38:43 +01:00
Manfred Karrer
e8d0ed1504
Add more DAO info text and buttons. Remove other tabs 2019-01-30 11:08:34 +01:00
Manfred Karrer
36c286de5d
Add distance to button 2019-01-30 09:02:27 +01:00
Manfred Karrer
7dc5404b84
Enable DAO menu, show dao info text and button 2019-01-30 08:54:54 +01:00
Manfred Karrer
9d1efb2bd6
Add URL validator for proposal link field 2019-01-29 22:45:12 +01:00
Manfred Karrer
925d5df654
Fixes https://github.com/bisq-network/bisq/issues/2292 2019-01-29 22:25:14 +01:00
Manfred Karrer
e0e85b5d38
Fixes https://github.com/bisq-network/bisq/issues/2268 2019-01-29 22:01:35 +01:00
Manfred Karrer
1e6777bb09
Use feedback style instead of confirmation at proposla publish success popup 2019-01-29 21:32:09 +01:00
Manfred Karrer
ed5e5e6d47
Fixes https://github.com/bisq-network/bisq/issues/2124 2019-01-29 21:22:49 +01:00
Manfred Karrer
a7dbbf4c54
Set width of error popup to 1100px to avoid overflow 2019-01-29 21:06:29 +01:00
Manfred Karrer
93d5d39d6f
Fixes https://github.com/bisq-network/bisq/issues/2297 2019-01-29 20:55:05 +01:00
Manfred Karrer
98242c9232
Fixes https://github.com/bisq-network/bisq/issues/2299 2019-01-29 20:53:03 +01:00
Manfred Karrer
2b416c067d
Fix incorrect phase display 
Fixes https://github.com/bisq-network/bisq/issues/2300
 2019-01-29 20:20:25 +01:00
Manfred Karrer
40e3d257d3
Add dontShowAgain flag to popup 
In case the user manage to vote multiple times we dont show a error
popup but only a warning popup and add the dont show again checkbox.
It is not possible to do that in the UI but not invalid from the DAO
rules.
 2019-01-29 15:49:19 +01:00
Manfred Karrer
2314889a25
Reset UI at button click instead of callback from publishing 
We reset UI without waiting for callback as callback might be slow
and then the user could create multiple votes.
 2019-01-29 15:45:43 +01:00
Manfred Karrer
5e10ecb466
Reset UI at button click instead of callback from publishing 
We reset UI without waiting for callback as callback might be slow
and then the user could create multiple proposals.
 2019-01-29 15:35:31 +01:00
Manfred Karrer
b087b95826
Merge pull request #2329 from ManfredKarrer/dao-fix-snapshot-issue 
Dao fix snapshot issue
 2019-01-29 15:33:15 +01:00
Manfred Karrer
688fad7647
Add null checks for proposalDisplay 2019-01-29 15:17:28 +01:00
Manfred Karrer
5804ff3cf0
Remove empty onParseTxsCompleteAfterBatchProcessing methods 
Make onParseTxsCompleteAfterBatchProcessing default in listener
 2019-01-29 14:59:10 +01:00
Manfred Karrer
32f4c20175
Refactor: Rename onParseTxsComplete to onParseTxsCompleteAfterBatchProcessing 2019-01-29 14:57:21 +01:00
Manfred Karrer
75943052d1
Show vote result exception in UI 
- Show vote result exception in Vote result View when selecting the
cycle where the vote result exception happened
 2019-01-29 13:22:37 +01:00
Manfred Karrer
e42c9d4f76
Don't show popup at vote result exception 2019-01-29 13:22:37 +01:00
Manfred Karrer
8b7646a9df
Merge pull request #2315 from ripcurlx/fix-multiple-payment-account-selection-disabled 
Not disable the payment account selection in take offer screen
 2019-01-25 15:00:51 +01:00
Christoph Atteneder
8013aa2076
Disable payment accounts combobox so it is clear that it cannot be selected anymore 2019-01-25 13:50:30 +01:00
Christoph Atteneder
dced3c1f4e
Not disable the payment account selection in take offer screen as long DAO is not live 2019-01-25 13:47:35 +01:00
Christoph Atteneder
59a515d291
Extend progress status label over two columns to prevent truncation 2019-01-24 19:52:13 +01:00
Christoph Atteneder
ee55aa3e09
Remove filter for offerbook teaser tables 2019-01-24 19:48:37 +01:00
Manfred Karrer
e847a863c9
Merge pull request #2316 from ripcurlx/fix-multiple-payment-account-import 
Not show warning popup for imported payment accounts
 2019-01-24 18:05:28 +01:00
Christoph Atteneder
cb3fa50f22
Improve resizing of buy and sell tables 2019-01-24 15:45:07 +01:00
Christoph Atteneder
17ab1efacc
Not show warning popup for imported payment accounts 2019-01-24 14:39:46 +01:00
Devin Bileck
20fc55d5a5
Fix incorrect time shown in phase duration 
The phase duration was showing the hour in am/pm (1-12) rather than the
hour in the day (0-23).
 2019-01-23 16:50:19 -08:00
Christoph Atteneder
efcee3e28f
Fix broken test 2019-01-23 22:31:46 +01:00
Manfred Karrer
83d67e3532
Merge pull request #2310 from ripcurlx/fix-tradecurrency-selection 
Fix trade currency handling for multiple currency payment accounts
 2019-01-23 20:07:20 +01:00
Manfred Karrer
fc815eed77
Fix testclass 2019-01-23 13:47:10 +01:00
Manfred Karrer
200c90b7aa
Merge pull request #2251 from ManfredKarrer/refactor-fee-estimation 
Refactor fee estimation
 2019-01-23 13:44:27 +01:00
Christoph Atteneder
0a7c85f7d8
Use selected trade currency if available in payment account 2019-01-23 13:16:55 +01:00
Christoph Atteneder
d44823afd6
Bind currency combobox to trade currency from model 
Remove data logic from view model that is set in data model
 2019-01-23 13:16:19 +01:00
Manfred Karrer
90e95e5d2e
Make fields private 2019-01-23 12:32:28 +01:00
Manfred Karrer
64f65e01a0
Fix typos 2019-01-23 12:32:18 +01:00
Christoph Atteneder
f8d77de642
Improve exception if offer of removed assets is edited 2019-01-22 17:33:38 +01:00
Manfred Karrer
7b2d00fc27
Merge pull request #2265 from ripcurlx/update-installer-background 
Update installer background image
 2019-01-14 20:15:39 +01:00
Christoph Atteneder
2fe5092b8c
Merge pull request #2247 from devinbileck/fix-windows-install-custom-translations 
Fix windows install custom translations
 2019-01-14 17:01:12 +01:00
Christoph Atteneder
be70eb1b83
Merge branch 'master' of github.com:bisq-network/bisq into rpm-package 
# Conflicts:
#	desktop/package/linux/package.sh
 2019-01-14 15:06:07 +01:00
Christoph Atteneder
ae9f13c09d
Update installer background image 2019-01-14 14:50:06 +01:00
Christoph Atteneder
bfda268eaf
Merge pull request #2248 from devinbileck/improve-JAVA_HOME-override 
Improve JAVA_HOME override
 2019-01-14 11:33:53 +01:00
Christoph Atteneder
265b15150b
Merge pull request #2252 from ManfredKarrer/reduce-code-duplication 
Move util code from UI to core
 2019-01-14 11:30:45 +01:00
Devin Bileck
7a16b3f3c6
Fix CurrencyListTest when locale is not en_US 
When declaring a fiat currency and only providing the currency code,
it uses the system locale to get the currency display name.
This potentially causes different sorting results in
testUpdateWhenNotSortNumerically when locale is not en_US.

Now, it specifies the en_US locale when defining the fiat currencies
for this test.

Fixes https://github.com/bisq-network/bisq/issues/2259
 2019-01-13 22:27:06 -08:00
Manfred Karrer
28d0db8ac8
Fix missing param in test class 2019-01-12 00:16:57 +01:00
Manfred Karrer
3c35f46b64
Move util code from UI to core 
Move code to OfferUtil and PaymentAccountUtil to avoid code duplication
once http-API gets merged
 2019-01-12 00:14:55 +01:00
Manfred Karrer
d09296e86c
Use TxFeeEstimationService 
- feeTxSizeEstimationRecursionCounter was never reset, so that caused
 probably bugs by ignoring fee estimation after it was called >10 times.
 The default size was used then so the bug was not very obvious as long
 the tx size was not very large.
 2019-01-11 23:23:30 +01:00
Devin Bileck
ed7a7df2ad
Merge branch 'master' of https://github.com/bisq-network/bisq into rpm-package 
# Conflicts:
#	desktop/package/linux/package.sh
#	desktop/package/linux/rpm.sh
 2019-01-11 11:36:23 -08:00
Devin Bileck
cad6b61ffd
Improve JAVA_HOME override 
Check to see if javapackager exists prior to overriding JAVA_HOME
in package scripts.
 2019-01-11 11:30:34 -08:00
Devin Bileck
7ca1a0f0b2
Fix windows install custom translations 
The Bisq.iss file must be saved using UTF-8 encoding with BOM for the
unicode custom messages to be displayed properly.
 2019-01-11 11:07:36 -08:00
Manfred Karrer
6e753a29f7
Merge pull request #2246 from ripcurlx/fix-ignored-test-cases 
Fix ignored tests
 2019-01-11 17:46:54 +01:00
Christoph Atteneder
fe864724f3
Configure jMockit for desktop module 2019-01-11 16:59:18 +01:00
Christoph Atteneder
e31a314904
Fix ignored test cases 2019-01-11 16:17:56 +01:00
Manfred Karrer
1a77ee669c
Merge pull request #2237 from ripcurlx/fix-chart-rendering 
Clear and re-assign series to fix rendering issues.
 2019-01-10 23:48:40 +01:00
Christoph Atteneder
190d2d5122
Clear and re-assign series to fix rendering issues. 
Fixes #2136.
 2019-01-10 15:08:23 +01:00
sqrrm
83aa0d7a77
Initialize Set to avoid nullpointer access 2019-01-10 14:30:10 +01:00
Bernard Labno
7e9bc1fee8
Altcoin disclaimer 2019-01-09 12:24:35 +01:00
Christoph Atteneder
d320380e80
Set back to SNAPSHOT 2019-01-08 19:56:23 +01:00
Christoph Atteneder
b18a143c0c
Bump version number 2019-01-08 19:54:33 +01:00
Devin Bileck
24ecbcdfb3
Merge branch 'master' of https://github.com/bisq-network/bisq into rpm-package 
# Conflicts:
#	desktop/package/linux/package.sh
#	desktop/package/linux/rpm.sh
 2019-01-08 09:26:43 -08:00
Christoph Atteneder
307a5b8822
Set back to SNAPSHOT 2019-01-08 16:48:22 +01:00
Christoph Atteneder
d6543377cf
Bump version number 2019-01-08 16:37:28 +01:00
Christoph Atteneder
7c4fcfa43d
Adapt for changed build directories 2019-01-08 16:36:26 +01:00
Christoph Atteneder
5f5e153d66
Add script for updating store dbs 2019-01-08 10:52:48 +01:00
Manfred Karrer
724247fe73
Don't show filtered currencies 
- For supporting Grin we want to add it to the next release but Grin
is not launched yet (15.1.2018 is launch date). We deactivate the asset
by using the filter message and enable it at launch date.
To support that at the altcoin account screen this commit implements
the required code.
 2019-01-08 02:39:08 +01:00
Devin Bileck
6e8b1279fc
Added back changes from other commits 2019-01-07 17:06:38 -08:00
Devin Bileck
c2ca632eff
Merge branch 'master' of https://github.com/bisq-network/bisq into rpm-package 
# Conflicts:
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
 2019-01-07 16:57:40 -08:00
Manfred Karrer
d5a53e9fdf
Merge pull request #2207 from ManfredKarrer/preparations-for-http-api 
Preparations for http api
 2019-01-07 23:31:05 +01:00
Christoph Atteneder
d889825f65
Improve padding of password input window 2019-01-07 17:03:30 +01:00
Christoph Atteneder
d32ee388b7
Disable payment accounts combobox in pay funds screen 2019-01-07 16:49:43 +01:00
Christoph Atteneder
946d1ec13c
Remove unnecessary select column 2019-01-07 16:34:27 +01:00
Christoph Atteneder
eb7dfa05d7
Make roll over effect a more subtle to improve readability 2019-01-07 16:27:30 +01:00
Christoph Atteneder
2a79f1a8af
Show information popup if more than one payment account is available for offer 
I still used a popup as it is a more rare case that someone sets up multiple accounts of the same payment method for its first offer.
 2019-01-07 16:16:00 +01:00
Christoph Atteneder
83a812a0f9
Show more verbose action when taking an existing offer 2019-01-07 16:03:52 +01:00
Christoph Atteneder
321fc2710d
Reduce line height 2019-01-07 16:03:21 +01:00
Christoph Atteneder
77338c7d32
Merge pull request #2163 from devinbileck/update-windows-packaging-process 
Update windows packaging process
 2019-01-07 14:25:30 +01:00
Christoph Atteneder
584b5557c3
Remove BOM as it fails during build process on Windows 10 2019-01-07 14:07:48 +01:00
Manfred Karrer
c947b85822
Merge pull request #2212 from ManfredKarrer/simplify-fee-model 
Simplify fee model
 2019-01-07 12:56:48 +01:00
Manfred Karrer
f0eb12df06
Remove param from CreateOfferViewModelTest 2019-01-07 12:19:45 +01:00
Christoph Atteneder
c82c0e5296
Not override JAVA_HOME 2019-01-07 12:19:41 +01:00
Christoph Atteneder
3d2817e884
Manually merge back changes from master 2019-01-07 12:15:26 +01:00
Christoph Atteneder
9fce7e2d9d
Merge branch 'master' of github.com:bisq-network/bisq into update-windows-packaging-process 
# Conflicts:
#	desktop/package/windows/Bisq.iss
 2019-01-07 11:57:30 +01:00