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
7003 commits 3 branches 150 tags 4.1 GiB
Commit graph

7003 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Beams
813d2ae1a6
Make @ripcurlx, @ManfredKarrer /desktop code owners 2018-11-03 11:24:16 +01:00
Chris Beams
26eada4310
Make @blabno /assets code owner 2018-11-03 11:24:16 +01:00
Chris Beams
7c42e52651
Make @ManfredKarrer default code owner 2018-11-03 11:15:41 +01:00
Chris Beams
90945a3ae4
Add CODEOWNERS 
Per docs at https://help.github.com/articles/about-codeowners/
 2018-11-03 11:00:44 +01:00
Manfred Karrer
32f709c2c9
Merge pull request #1858 from ripcurlx/create-offer-adaptions 
Redesign: Create Offer flow adaptions
 2018-11-02 11:40:19 -05:00
Christoph Atteneder
35c595e9ec
Additional polishing of the create offer flow 2018-11-02 17:27:18 +01:00
Christoph Atteneder
3167195f85
Different clean up tasks in the create offer process 2018-11-02 16:30:42 +01:00
Christoph Atteneder
b6fce24d0f
Use different style during when input is available and when read only to reduce height 2018-11-02 14:34:44 +01:00
Manfred Karrer
bc82974996
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:49:49 -05:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -05:00
Manfred Karrer
b3b080cfb2
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:04:23 -05:00
Manfred Karrer
c4862cdded
Merge pull request #1851 from ManfredKarrer/merged-sq-bonded-reputation 
Bonded reputation
 2018-11-01 12:03:26 -05:00
Manfred Karrer
b55ba273a1
Merge pull request #1829 from arunasurya/2018-10-04-fix-grammar 
Improve grammar of Background Info
 2018-11-01 12:03:07 -05:00
Manfred Karrer
48fa15ee89
Merge pull request #1852 from ManfredKarrer/add-dev-setup-guide 
Add dev setup guide
 2018-11-01 11:57:37 -05:00
Manfred Karrer
93b9dab8c1
Improve text 2018-11-01 11:56:45 -05:00
Manfred Karrer
cda97b7a5b
Fix typos, move files, remove file 2018-11-01 11:52:39 -05:00
Chris Beams
7f1da8a344
Fix typo in 'Running Bisq' section of README 2018-11-01 12:20:24 +01:00
Aruna Surya
6dd193b0f0
Improve grammar of Background Info 2018-11-01 08:16:38 +01:00
Manfred Karrer
60df87cb5c
Move DAO notes to contributing file 2018-10-31 22:11:25 -05:00
Manfred Karrer
bafe6f1842
Remove data dir locations 2018-10-31 22:10:07 -05:00
Manfred Karrer
8dab0d6347
Update wording and formatting 2018-10-31 22:08:48 -05:00
Manfred Karrer
12bfd21d8d
Update wording and formatting 2018-10-31 21:59:10 -05:00
Manfred Karrer
b5765647f3
Add dao section 2018-10-31 21:54:35 -05:00
Manfred Karrer
ebb9feeb2e
Fix wrong links 2018-10-31 21:48:03 -05:00
Manfred Karrer
c1b1b44b41
Add dev setup guide 
- Move outdated and not highly relevant files to sub directories
 2018-10-31 21:38:51 -05:00
Manfred Karrer
3c5a1dabe0
WIP bonded roles 2018-10-31 18:23:45 -05:00
Manfred Karrer
bdbcc5e7fd
Add dev values for lock time and proposal phase 2018-10-31 14:30:54 -05:00
Manfred Karrer
d92e0dd5bd
Add translation strings for roles 2018-10-31 14:30:14 -05:00
Manfred Karrer
f45517a237
Update to changed getter 2018-10-31 13:52:39 -05:00
Manfred Karrer
80066bda8c
Merge branch 'release-candidate-0.9.0' into sqrrm-bonded-reputation 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java
 2018-10-31 13:51:15 -05:00
Manfred Karrer
ad8a77d98d
Cleanup 2018-10-31 13:48:54 -05:00
Manfred Karrer
e14508055c
Fix merge errors 2018-10-31 13:23:38 -05:00
Manfred Karrer
c1768592a6
Merge pull request #1850 from ManfredKarrer/add-more-bonded-roles 
Add more bonded roles
 2018-10-31 13:18:24 -05:00
Manfred Karrer
a8b833c285
Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation 
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java
#	core/src/main/java/bisq/core/dao/DaoFacade.java
#	core/src/main/java/bisq/core/dao/governance/role/BondedRole.java
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java
 2018-10-31 13:17:57 -05:00
Manfred Karrer
590fa427e7
Merge pull request #1849 from ripcurlx/minor-ui-fixes 
Redesign: Adapt Funds section
 2018-10-31 13:00:16 -05:00
Manfred Karrer
3e81c6008b
Add more bonded roles 2018-10-31 12:59:08 -05:00
Christoph Atteneder
454ed6714a
Adapt OfferDetailsWindow to match design template 2018-10-31 17:35:21 +01:00
Christoph Atteneder
5221d766aa
Reintroduce more detailed tooltip for price provider 2018-10-31 15:17:35 +01:00
Christoph Atteneder
1b4891eb1c
Fix vertical alignment in table views 2018-10-31 11:34:01 +01:00
Christoph Atteneder
1540a2ee50
Clean up funds section 2018-10-31 11:18:11 +01:00
Christoph Atteneder
1057739f7a
Remove colons in network settings 2018-10-31 09:37:11 +01:00
Christoph Atteneder
797c935a28
Use TextField with label on top 2018-10-31 09:37:10 +01:00
Christoph Atteneder
ce9c1ab459
Merge pull request #1847 from ManfredKarrer/adjust-with-redesign 
Adjust in DAO views with redesign
 2018-10-31 09:35:57 +01:00
Manfred Karrer
2d3269a07a
Add getBsqPrice method to PriceFeedService 2018-10-30 20:46:26 -05:00
Manfred Karrer
0c9a1ad1a7
Fix layout 2018-10-30 20:27:34 -05:00
Manfred Karrer
5ced4e8927
Use param type for switch cases 2018-10-30 20:27:21 -05:00
Manfred Karrer
8049588bc1
Use param type for switch cases 
- Add maxDecrease and maxIncrease properties to param
 2018-10-30 20:27:04 -05:00
Manfred Karrer
df15399fdc
Fix bonding views 2018-10-30 18:57:55 -05:00
Manfred Karrer
3d3a1acad6
Rename classes 2018-10-30 18:49:48 -05:00
Manfred Karrer
944acc9e93
Fix layout for governance screens 2018-10-30 18:49:04 -05:00