653 Commits

Author	SHA1	Message	Date
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
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