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

6417 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
1b4572a898
Merged 2018-08-04 22:18:41 +02:00
Manfred Karrer
608e80965b
Improve proposal and voting views 2018-08-04 22:07:41 +02:00
Manfred Karrer
d28205d960
Fix screen update 2018-08-02 11:24:34 +02:00
Manfred Karrer
70e086d414
Merge pull request #1611 from TheCircleFoundation/list-ccx-asset 
List Conceal (CCX)
 2018-07-30 08:55:58 +02:00
lumenano
83154f3869 List Conceal (CCX) 2018-07-29 12:38:44 +03:00
Manfred Karrer
5f8185a838
Add combined proposal vote view 2018-07-27 00:50:19 +02:00
Manfred Karrer
d2eae6b99e
Change order of dependencies 
Just to retrigger a travis build as for some strange reasons core does not get resolved.
 2018-07-26 18:14:31 +02:00
Manfred Karrer
1755388efa
Merge pull request #1610 from ManfredKarrer/refact-generics 
Refact generics
 2018-07-26 12:47:04 +02:00
Manfred Karrer
af614dfeff
Add combined proposal vote view (WIP) 2018-07-25 16:16:59 +02:00
Manfred Karrer
149c5a2fc0
Add types for addLabelComboBox 2018-07-25 15:27:21 +02:00
Manfred Karrer
84664006a4
Merge branch 'refact-generics' into voting 
# Conflicts:
#	src/main/proto/pb.proto

Merge branch 'refact-generics' into voting

# Conflicts:
#	src/main/java/bisq/desktop/main/dao/DaoView.java
#	src/main/java/bisq/desktop/main/dao/voting/VotingView.java
#	src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
#	src/main/java/bisq/desktop/util/GUIUtil.java
 2018-07-25 15:22:43 +02:00
Manfred Karrer
d841a93e34
Add SafeVarargs annotation at Navigation.navigateTo 2018-07-25 15:08:03 +02:00
Manfred Karrer
8d70aad2a1
Use generics for FormBuilder.ListView 2018-07-25 14:54:40 +02:00
Manfred Karrer
f4beb7e911
Use generics for FormBuilder.Combobox 2018-07-25 14:48:55 +02:00
Manfred Karrer
4dad49399f
Remvoe title and description from Proposal 2018-07-25 13:10:12 +02:00
Manfred Karrer
058617442a
Rename result views 2018-07-25 00:14:46 +02:00
Manfred Karrer
1c71b7ca73
Fix missing confidence icon, show genesis tx in tx view 2018-07-25 00:09:04 +02:00
Manfred Karrer
1ab7868287
Improve UI for results 2018-07-24 18:21:05 +02:00
Manfred Karrer
577633f5bb
Add nullable, cleanup 2018-07-23 21:53:36 +02:00
Manfred Karrer
4ad66b6f6b
Add EqualsAndHashCode to PersistableLists 
- fix row display in proposal display
 2018-07-23 13:56:20 +02:00
Manfred Karrer
39a685956f
Improve bonded roles table 2018-07-23 13:36:50 +02:00
Manfred Karrer
af08f57744
Merge branch 'master' into notifications 2018-07-23 11:35:50 +02:00
Manfred Karrer
ee4d8dc3e3
Merge branch 'master' into voting 2018-07-23 11:35:00 +02:00
Manfred Karrer
5c4f06c163
Merge pull request #1607 from ManfredKarrer/f2f 
Implements Face to Face payment method
 2018-07-23 11:11:04 +02:00
Christoph Atteneder
62ffe4c0d6
Continue to show prompt text until text is entered also in TextArea 2018-07-23 10:13:22 +02:00
Manfred Karrer
ccd3e9c5ba
Add BondedRoles proposal and views 2018-07-23 02:22:18 +02:00
Manfred Karrer
6077cca35f
Add bonds for selecting bond id 2018-07-22 02:16:27 +02:00
Manfred Karrer
68e2389c30
Changes from review of bond confiscation PR 2018-07-22 00:12:20 +02:00
Manfred Karrer
86c3f248eb
Merge pull request #13 from sqrrm/dao 
Dao
 2018-07-21 21:24:36 +02:00
sqrrm
369ed5bff9
Rename burn bond to confiscate bond 2018-07-21 20:29:27 +02:00
sqrrm
71e3aed7b1
Burn bonds when proposal is accepted 
Add bond id for bonds tied to role. Currently as a manual field to
test things out. Should be some kind of automatically generated hash
eventually.
 2018-07-21 19:58:58 +02:00
sqrrm
c40072e74d
Add burn bond proposal 2018-07-21 19:58:58 +02:00
Manfred Karrer
771a48991c
Add popup or vote result per proposal 2018-07-21 18:30:00 +02:00
Manfred Karrer
caff652487
Add display of all params 2018-07-21 16:29:37 +02:00
Manfred Karrer
c1a1608ae9
Change dummy dev account to AliPayAccount 2018-07-21 12:30:01 +02:00
Manfred Karrer
792371e126
Complete F2F payment method 2018-07-21 01:01:09 +02:00
Manfred Karrer
46342663ab
Add F2F payment method 2018-07-20 22:48:25 +02:00
Manfred Karrer
5e07a94a3c
Fix wrong values for vote and issuance 2018-07-19 17:17:13 +02:00
Manfred Karrer
e1f23be46e
Add vote result view 2018-07-19 16:44:35 +02:00
Manfred Karrer
f27a7461c8
Rename classes 2018-07-18 23:19:53 +02:00
Manfred Karrer
288f4a7d89
Update proposal view on height change 2018-07-18 23:16:09 +02:00
Manfred Karrer
7dd28e9156
Fix wrong removal of listener 2018-07-18 22:51:29 +02:00
Manfred Karrer
cf9b51a0d5
Add proposalFee text field 2018-07-18 21:41:56 +02:00
Manfred Karrer
bcc1b88bfc
Fix confirmations list view 2018-07-18 21:14:31 +02:00
Manfred Karrer
547fb2f070
Apply code analysis, cleanups 2018-07-18 21:05:38 +02:00
Manfred Karrer
18163b7991
Rename StateService to BsqStateService 2018-07-18 19:43:41 +02:00
Manfred Karrer
513350ff67
Refactor state listeners 2018-07-18 19:23:24 +02:00
Manfred Karrer
29d95c2bd9
Improve UI 2018-07-17 18:20:52 +02:00
Manfred Karrer
eeb9006452
Fix UI bug with dashboard view 2018-07-17 17:44:35 +02:00
Manfred Karrer
24915aff59
Add check for android 2018-07-16 23:42:23 +02:00