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

2848 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Rosseel
5fa2053502 use open offer manager instead 2016-10-26 07:40:43 +02:00
Mike Rosseel
bcfbb3e7d6 Merge remote-tracking branch 'origin' into issue544-api 2016-10-25 21:56:02 +02:00
Manfred Karrer
d781c4d4cc Merge pull request #673 from jonathancross/account-view 
Repurposing Account view popup as intro
 2016-10-25 03:07:59 +02:00
Jonathan Cross
708bc5cf9b
Repurposing Account view popup as intro 2016-10-25 02:42:15 +02:00
Mike Rosseel
e0dc5788eb Merge remote-tracking branch 'origin/Development' into issue544-api 2016-10-20 22:35:26 +02:00
Mike Rosseel
c0558cce00 Merge branch 'issue544-api' of github.com:bitsquare/bitsquare into issue544-api 2016-10-20 22:34:59 +02:00
Manfred Karrer
e3bd595048 Merge branch 'master' into Development 2016-10-20 13:03:22 +02:00
Manfred Karrer
c8c1eaff7d Merge pull request #658 from haiqu/Development 
Fix documentation Java version 112 iss #657
 2016-10-20 13:02:21 +02:00
Rob Judd
402208f48b Fix documentation Java version 112 iss #657 2016-10-20 19:15:44 +10:00
Manfred Karrer
2f5c1a926a Check if supported crypto key length is > 128 (security policy adopted in Oracel JDK) 2016-10-20 01:45:19 +02:00
Manfred Karrer
9a3cc19efa V 0.4.9.7 2016-10-20 00:10:45 +02:00
Manfred Karrer
3ea9ad4712 Cleanup formatting, organize imports 2016-10-19 23:44:49 +02:00
Manfred Karrer
9a72532538 Prepare for v 0.4.9.7 2016-10-19 23:39:50 +02:00
Manfred Karrer
1c88ff0e9b
Cleanup formatting 2016-10-19 23:38:49 +02:00
Manfred Karrer
0f4ec7919e Cleanup formatting 2016-10-19 23:29:22 +02:00
Manfred Karrer
416c011c48
Cleanup formatting 2016-10-19 23:18:51 +02:00
Manfred Karrer
342386b480 Cleanup formatting 2016-10-19 23:16:54 +02:00
Manfred Karrer
696487147e Cleanup formatting 2016-10-19 23:06:16 +02:00
Manfred Karrer
f7e9a2f105 Add Forum link, cleanup... 2016-10-19 22:59:58 +02:00
Manfred Karrer
22250574d8 Prepare for v 0.4.9.7 2016-10-19 22:04:46 +02:00
Manfred Karrer
046dc5a786 Send answer data to peer when using Interac e-Transfer 2016-10-19 22:02:26 +02:00
Manfred Karrer
2132835f39 Added new altcoins: Anoncoin, DarkNet 2016-10-19 18:43:43 +02:00
Manfred Karrer
a258a0d23c Added new altcoins: Waves, GameCredits, PotCoin, Omni, Stratis, ReddCoin, VeriCoin, Radium 2016-10-19 18:16:30 +02:00
Manfred Karrer
211b07ff59 Added new payment methods: Chase QuickPay, Interac e-Transfer 2016-10-19 17:49:32 +02:00
Manfred Karrer
ed72442f5c Move i18n files to in_dev directory 2016-10-19 17:46:07 +02:00
Manfred Karrer
c64dd97749 Move i18n files to in_dev directory, because the currnet translations only include a small subset of all strings and we don't want to mix english with translates version in the UI. 
Once all strings in the app are supported by property files we can use them in the main directory
 2016-10-19 16:56:17 +02:00
Manfred Karrer
0a28cefff6 Require min. java verison 1.8.0_122 (includes SortedList bugfix) 2016-10-19 16:54:46 +02:00
Manfred Karrer
f076a840f5 Remove jdkfix module (new jdk version 8_u_122 includes the SorteList bugfix) 2016-10-19 16:53:06 +02:00
Manfred Karrer
4ca8f8578a Merge remote-tracking branch 'origin/Development' into Development 2016-10-19 11:57:46 +02:00
Manfred Karrer
5c3adeb77a Merge pull request #654 from haiqu/Development 
Crypto security update
 2016-10-19 11:57:13 +02:00
Rob Judd
62661212f2 Crypto security update 2016-10-19 15:38:53 +10:00
Manfred Karrer
a88e12ac75 Use timespan in trade statistics 2016-10-19 01:45:30 +02:00
Manfred Karrer
020b479c0c Dont translate Faster Payment 2016-10-18 20:54:14 +02:00
Manfred Karrer
6640d3fa5f Allow empty input for bridges to clear stored bridges in preferences 2016-10-18 20:53:39 +02:00
Manfred Karrer
a57d331ad5 Merge pull request #649 from haiqu/Development 
Development - German translation i18n
 2016-10-18 20:49:13 +02:00
Manfred Karrer
8236a21348 Merge branch 'master' into Development 
Conflicts:
	doc/build.md
 2016-10-18 20:45:59 +02:00
Manfred Karrer
c5883e5afb Merge pull request #652 from jonathancross/build-notes 
Updates to Build notes
 2016-10-18 20:42:37 +02:00
Jonathan Cross
7a11be43a4
Build notes: Mac OSX, jdkfix updates and move JCE unlimited Strength to extern link 2016-10-18 19:06:42 +02:00
Rob Judd
78812d7a79 Merge pull request #1 from layer1gfx/patch-1 
Update German translation
 2016-10-18 14:17:38 +10:00
layer1gfx
28f09a8d14 Update German translation 
updated the German translation for displayStrings_de.properties
 2016-10-18 10:45:14 +08:00
Manfred Karrer
f67fda0286 Merge pull request #642 from haiqu/i18n 
Add i18n branch to Development
 2016-10-17 23:02:56 +02:00
Rob Judd
9bc4865de2 Croatian translation from Petar 2016-10-17 16:04:46 +10:00
Manfred Karrer
bf74bf49bd Fix wording 2016-10-16 16:55:54 +02:00
Mike Rosseel
b040582f87 Merge branch 'Development' into issue544-api 
# Conflicts:
#	pom.xml
 2016-10-16 12:18:33 +02:00
Manfred Karrer
9f3cbac0d5 Use create offer fee from FeePolicy in remove offer popups 2016-10-15 13:08:16 +02:00
Manfred Karrer
5f9f7109d1 Merge pull request #647 from haiqu/iss646 
Iss646 Can't scroll to bottom of trades list
 2016-10-15 12:56:41 +02:00
Manfred Karrer
6e0dbb6853 Merge pull request #645 from haiqu/iss615 
Fix Iss615 Removing an offer should specify fee amount
 2016-10-15 12:55:57 +02:00
Rob Judd
743145d933 Issue #646 Can't scroll to bottom of trades list 2016-10-15 12:31:53 +10:00
Rob Judd
96d2dd0111 Issue #615 2016-10-15 10:53:44 +10:00
Rob Judd
4ccc5a9cea Minor edit 2016-10-15 10:35:09 +10:00