1680 commits

Author	SHA1	Message	Date
Chris Beams	6ffa52a006	Rename bitsquare/bitsquare => bisq-network/bisq-exchange	2017-08-23 15:36:17 +02:00
Manfred Karrer	a7c0f1d16f	Merge branch 'Development' into DAO_phase1	2017-08-09 12:48:56 +02:00
Manfred Karrer	e8c46c9709	Merge branch 'master' into Development ... # Conflicts: # doc/build.md	2017-08-09 12:48:07 +02:00
Chris Beams	6ece78352f	Replace snapshot versions of JitPack deps with fixed SHAs (#899)	2017-08-09 12:41:18 +02:00
Chris Beams	ae05c015b9	Consume custom bitcoinj/libdojh/btcd deps via JitPack (#899) ... This change removes the need to clone and build bisq's forks of bitcoinj, libdohj and btcd-cli4j in order to build bisq itself.	2017-08-09 12:13:47 +02:00
Manfred Karrer	94203b9101	Add BSQ dashboard/statistics	2017-07-29 03:09:39 +02:00
Manfred Karrer	2a67d39d53	Cleanup	2017-07-29 00:04:31 +02:00
Manfred Karrer	db865800fb	Check for null and 0 values at setting market price	2017-07-28 13:37:26 +02:00
Manfred Karrer	50065bb5c9	Use BSQ testnet explorer for testnet	2017-07-28 01:32:44 +02:00
Manfred Karrer	6cee58824e	Add new mainnet geneis tx. Make genesisTx nullable in BsqChainState. Shuffle seedNodeAddresses and remove candiates from list. Add null checks. Filter invlaid OP_RETURN data.	2017-07-28 00:40:17 +02:00
Manfred Karrer	b593f89638	Add BTC TESTNET genesis tx, remvoe LTC genesis txs	2017-07-27 18:00:48 +02:00
Manfred Karrer	0016e33640	Add network selector to resource EntryMap file name	2017-07-27 18:00:18 +02:00
Manfred Karrer	2e8030cfb4	Add default configs	2017-07-27 17:59:05 +02:00
Mike Rosseel	779d388070	Merge branch 'Development' into issue544-api	2017-07-27 08:42:56 +02:00
Manfred Karrer	c744cb5a96	Merge branch 'Development' into DAO_phase1	2017-07-26 21:38:21 +02:00
Mike Rosseel	592bea9dad	make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test	2017-07-26 16:37:59 +02:00
Manfred Karrer	ba2fc3c162	Merge branch 'Development' into DAO_phase1	2017-07-26 13:21:07 +02:00
Manfred Karrer	1857cc0b30	Show latest trade price as market price for currencies which have no external price feed provided but have been traded in Bisq	2017-07-26 11:44:28 +02:00
Manfred Karrer	03c33964a7	Add more selectors to filter.	2017-07-26 00:07:44 +02:00
Mike Rosseel	6d782cdd73	adding command-line switch to GUI, ENABLE_API	2017-07-25 18:31:11 +02:00
Mike Rosseel	8602108ef3	Merge branch 'Development' into issue544-api	2017-07-25 16:36:27 +02:00
Mike Rosseel	dc4e169602	update dependency versions for api (dropwizard/swagger compatibility): guava, jackson-annotations.	2017-07-25 16:32:19 +02:00
Manfred Karrer	72a7104f94	Refactoring: Merge BsqBlockVo into BsqBlock, TxInputVo into TxInput and TxOutputVo into TxOutput	2017-07-24 20:05:50 +02:00
Mike Rosseel	537a99eb0f	adding healthchecks, adapting offer_make to new ctor (wip), adding banner, start of swagger integration	2017-07-18 17:32:44 +02:00
Mike Rosseel	337610ef7c	Merge branch 'Development' into issue544-api	2017-07-17 13:19:24 +02:00
Manfred Karrer	a7f3d68cb1	Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir).	2017-07-17 10:05:08 +02:00
Mike Rosseel	cda82172e3	Merge branch 'Development' into issue544-api ... Conflicts: .idea/codeStyleSettings.xml	2017-07-17 09:03:15 +02:00
Manfred Karrer	c237c64550	Ignore failing tests, add TODO	2017-07-16 17:12:45 +02:00
Manfred Karrer	b7d8a0acb6	set version 0.5.2	2017-07-16 16:29:10 +02:00
Manfred Karrer	a2563fd0d4	Cleanup, improve comments, small refactorings	2017-07-16 16:06:05 +02:00
Manfred Karrer	bbacd09074	Fix missing break	2017-07-16 15:32:43 +02:00
Manfred Karrer	0b6c3c04da	Fix tests	2017-07-16 03:29:52 +02:00
Manfred Karrer	25f9368990	Add info for wallet restore	2017-07-16 02:35:03 +02:00
Manfred Karrer	50d9c453ba	Fix wrong decimals for fiat price and volume for offer json	2017-07-16 02:34:26 +02:00
Manfred Karrer	349ae774a8	Increase trade limits to 2 BTC for OK_PAY and Altcoins	2017-07-16 01:16:35 +02:00
Manfred Karrer	51e8aae991	Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract)	2017-07-16 00:34:46 +02:00
Manfred Karrer	04fa5f079f	Remove email from bank accounts and fasterpayment	2017-07-15 23:09:13 +02:00
Manfred Karrer	f8ed97cb2e	Merge branch 'Development' into 0.5.2 ... # Conflicts: # core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java	2017-07-15 14:57:42 +02:00
Manfred Karrer	edb5de0ac6	Fix fees, update to libdohj 0.14.2	2017-07-15 14:52:17 +02:00
Manfred Karrer	ca9e53a2ab	Remove email from sepa account	2017-07-15 13:12:09 +02:00
Mike Rosseel	b2f6d7435c	added dash as base currency	2017-07-14 20:20:19 +02:00
Manfred Karrer	2a55758d3b	Merge branch 'Development' into 0.5.2	2017-07-14 11:42:16 +02:00
Manfred Karrer	4b5b305389	Merge branch 'master' into Development	2017-07-14 11:41:39 +02:00
Manfred Karrer	6bbac2903b	Change version nr back to 0.5.1 (0.5.2 is not ready yet)	2017-07-14 11:41:20 +02:00
Manfred Karrer	27105efe8e	Handle nullable winner in DisputeResult for PB	2017-07-12 10:42:39 +02:00
Manfred Karrer	947a95385f	Use TxType.UNDEFINED_TX_TYPE instead of TxType.UNDEFINED	2017-07-11 23:31:17 +02:00
Manfred Karrer	bba9b5179c	Rename UNDEFINED to UNDEFINED_TX_TYPE (PB does not allow same enum items in diff. enums ;-()	2017-07-11 23:11:07 +02:00
Manfred Karrer	c9203d481a	Check against UNDEFINED instead of null	2017-07-11 23:03:13 +02:00
Manfred Karrer	7860116a27	Add UNDEFINED to TxType as default value	2017-07-11 23:02:49 +02:00
Manfred Karrer	c7ccb56ca5	Add NewBestBlockListener to update BSQ tx UI if best chain has changed	2017-07-11 23:01:40 +02:00