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
7,839 Commits 4 Branches 148 Tags 4.3 GiB
74c2c0cf61
Commit Graph

7839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
9ae166fb13
Merge branch 'noirofficial-master' 2019-01-07 23:43:12 +01:00
Manfred Karrer
6a1b1c078f
Cleanup formatting 2019-01-07 23:42:56 +01:00
Manfred Karrer
1d72fe2059
Merge branch 'master' of https://github.com/noirofficial/bisq into noirofficial-master 2019-01-07 23:42:00 +01:00
Manfred Karrer
83bdda663f
Merge branch 'piratelinux-list-bitmark' 2019-01-07 23:39:14 +01:00
Manfred Karrer
b2de7bad0a
Cleanup formatting 2019-01-07 23:39:03 +01:00
Manfred Karrer
7ff6ad46cc
Merge branch 'list-bitmark' of https://github.com/piratelinux/bisq into piratelinux-list-bitmark 2019-01-07 23:36:11 +01: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
Manfred Karrer
21f14b65d9
Add Grin 2019-01-07 23:28:57 +01:00
wrkzdev
1670e404ee List WrkzCoin (WRKZ) 
Author:    wrkzdev <40448869+wrkzdev@users.noreply.github.com>
Date:      Wed Dec 19 21:44:27 2018 +0700
 2019-01-07 16:14:01 -05:00
Manfred Karrer
9bde232675
Merge pull request #2215 from ripcurlx/fix-minor-ui-issues 
UI improvements
 2019-01-07 17:05:25 +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
c1c9a18056
Merge pull request #2176 from khaledalam/list-webchain-asset 
List Webchain (WEB)
 2019-01-07 15:38:44 +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
0112c2e480
Merge pull request #2213 from ManfredKarrer/reduce-maker-fee 
Reduce maker fee
 2019-01-07 12:56:58 +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
cd42cf1fb2
Merge branch 'simplify-fee-model' into reduce-maker-fee 2019-01-07 12:20:03 +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
Christoph Atteneder
5553b3b465
Merge pull request #2190 from devinbileck/update-linux-packaging-process 
Update linux packaging process
 2019-01-07 11:51:25 +01:00
Christoph Atteneder
b03e96821c
Change path structure to match new build process on Linux and Windows 2019-01-07 11:15:48 +01:00
Christoph Atteneder
6966047bc4
Fix wrong path of tools.jar 2019-01-07 11:15:14 +01:00
Christoph Atteneder
148cd30b39
Not clean up old installer of same version as it also deletes the new file on Ubuntu 2019-01-07 11:09:06 +01:00
Christoph Atteneder
dbb8483be0
Run file permission workaround properly for jar-already-exists use case 2019-01-07 10:58:26 +01:00
Christoph Atteneder
fcd7ae961b
Not run everything with root user 2019-01-07 10:56:51 +01:00
Christoph Atteneder
12db932d6e
Not override JAVA_HOME 
Developer should configure this properly on its local machine before running the script
 2019-01-07 10:55:45 +01:00
Christoph Atteneder
c985bf64c2
Merge pull request #2187 from CaveSpectre11/2134-focus-color 
Focus color of buttons should be more saturated/darker (Issue #2134)
 2019-01-07 08:59:50 +01:00
Christoph Atteneder
75e9e99d87
Merge pull request #2205 from j3ko/hotfix/take_offer 
Update offer button state on account change
 2019-01-07 08:51:40 +01:00
Manfred Karrer
e3a17d2ef5
Reduce maker fee, increase take fee 
- Reduce maker fee to 0,1%, increase take fee to 0,3%

As approved by proposal
https://github.com/bisq-network/proposals/issues/65
 2019-01-07 02:07:08 +01:00
Manfred Karrer
5be44132ba
Apply code inspection 
- Add null and isPresent checks
 2019-01-07 01:58:09 +01:00
Manfred Karrer
af439a86ad
Remove market price based fee calculation 2019-01-07 01:52:32 +01:00
Manfred Karrer
3c8bdafd71
Merge pull request #2211 from devinbileck/configure-default-system-jdk 
Configure default system JDK
 2019-01-07 01:19:57 +01:00
Devin Bileck
04d7a6f7e2
Configure default system JDK 
The install_java.sh script was not setting the appropriate java and
javac as default. This is not an issue if no other JDK is installed, but
if so it could cause the wrong JDK to be used. So it now sets the
appropriate default system JDK.

Also, added a comment at the top of the install_java.sh and
install_java.bat files indicating it configures the default system
JDK and informs the user how to go about selecting a different
default JDK if necessary.
 2019-01-06 16:13:57 -08:00
Manfred Karrer
1c14b07fa1
Add null check 2019-01-06 13:05:46 +01:00
Manfred Karrer
3c08a2739f
Merge pull request #2178 from tau3/feature/refactor-ballot-service 
Unit test for BallotListService
 2019-01-06 04:06:03 +01:00
Manfred Karrer
578c56c21b
Add null check at getMyTradeLimit 
Other small changes:
- Remove final from User as http-api branch will require to extend it.
- Add comment
 2019-01-06 03:44:50 +01:00
Manfred Karrer
dbc028e821
Use transaction from onSuccess callback 2019-01-06 03:40:56 +01:00
Manfred Karrer
3bfcd86532
Use List instead of ArrayList as type 2019-01-06 03:39:07 +01:00
Manfred Karrer
622282a446
Clone AddressEntryList at toProtoMessage 2019-01-06 03:36:59 +01:00
Manfred Karrer
618281cee9
Remove BisqFacade 2019-01-06 03:34:14 +01:00
Manfred Karrer
c7f8faa804
Implement BisqSetupCompleteListener at BisqExecutable 2019-01-06 03:30:27 +01:00
Manfred Karrer
a41b4a5ffc
Merge pull request #2199 from ManfredKarrer/dao-fix-performance-issue-at-parsing 
Dao: Fix performance issue at parsing
 2019-01-05 20:08:15 +01:00