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

8989 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
475569eb47
Fix issue with animation at start 2019-04-11 16:19:35 -05:00
Manfred Karrer
b8cd1ffe70
Fix rowSpan 2019-04-11 15:11:27 -05:00
Manfred Karrer
6b009d4af0
Merge branch 'master' into rc_v1.0.0 2019-04-11 14:15:22 -05:00
Manfred Karrer
2a1f8d5dad
Merge pull request #2697 from ripcurlx/remove-non-core-languages 
Remove non core languages
 2019-04-11 12:22:31 -05:00
Manfred Karrer
9a1338c7fa
Merge pull request #2696 from ripcurlx/add-slide-animation 
Add slide animation for DAO launch popup
 2019-04-11 12:20:31 -05:00
Manfred Karrer
d7195c4671
Merge pull request #2699 from ripcurlx/improve-overlay-button-handling 
Improve space management in button bar of overlays
 2019-04-11 12:18:40 -05:00
Manfred Karrer
e6f12dab85
Merge pull request #2700 from ripcurlx/fix-deselection-of-proposal 
Add missing check to prevent re-selection of proposal
 2019-04-11 12:18:08 -05:00
Christoph Atteneder
a16428e9c1
Add missing check to prevent re-selection of selected select-proposal-window that was just closed 2019-04-11 17:37:34 +02:00
Christoph Atteneder
d8c8e48392
Add missing import 2019-04-11 17:11:40 +02:00
Christoph Atteneder
b01e1c9228
Set close button to same width as action button to not truncate translations in that case 2019-04-11 17:06:18 +02:00
Christoph Atteneder
a863bf6375
Move DontShowAgainCheckbox into same HBox as buttons to prevent overlapping. Fixes #2681. 2019-04-11 17:05:58 +02:00
Christoph Atteneder
ce9aae297d
Update transifex script with new core languages 2019-04-11 15:57:47 +02:00
Christoph Atteneder
dc239ddfe5
Save horizontal space and clean-up MainView 2019-04-11 15:47:12 +02:00
Christoph Atteneder
d6615e1efd
Remove non-core languages based on discussion on Transifex 2019-04-11 15:13:37 +02:00
Christoph Atteneder
781194c32f
Merge pull request #2680 from HarryMacfinned/update-removed-assets-list 
Update CurrencyUtil.java
 2019-04-11 15:03:57 +02:00
Christoph Atteneder
5bff4dc455
Add slide animation 2019-04-11 14:47:30 +02:00
Manfred Karrer
0ac2cbf499
Add TODO for fixing issue with not disabled buttons 2019-04-10 21:47:09 -05:00
Manfred Karrer
a8b3d96e26
Fix resource key 2019-04-10 21:08:05 -05:00
Manfred Karrer
f551bd9803
Merge pull request #2688 from ripcurlx/add-dao-launch-popup 
Add DAO launch popup
 2019-04-10 11:11:18 -05:00
Manfred Karrer
e5f4299a77
Merge pull request #2689 from ripcurlx/adapt-update-popup 
Adapt update popup
 2019-04-10 11:03:27 -05:00
Christoph Atteneder
bf3fe2ca83
Change dao link 2019-04-10 17:59:24 +02:00
Christoph Atteneder
ed26b4d63f
Improve cheaper fees screenshot and popup layout 2019-04-10 17:40:23 +02:00
Manfred Karrer
68436f5f85
Merge branch 'master' into rc_v1.0.0 
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVotePayload.java
 2019-04-10 09:39:15 -05:00
Christoph Atteneder
bbfe663f52
Darken background less, to feel less dark. 2019-04-10 16:38:25 +02:00
Christoph Atteneder
94c1cf3499
Updated translations based on https://github.com/bisq-network/bisq/pull/2688#issuecomment-481709119 2019-04-10 16:31:57 +02:00
Manfred Karrer
6aca2cd64c
Merge pull request #2690 from ripcurlx/align-hyperlinks 
Remove unnecessary negative left padding
 2019-04-10 09:22:04 -05:00
Christoph Atteneder
3a3a11ed26
Make blurred background even darker based on #2337. 2019-04-10 16:15:03 +02:00
Christoph Atteneder
33fc7daf84
Remove unnecessary negative left padding 2019-04-10 16:03:12 +02:00
Christoph Atteneder
bc3aed4aeb
Adapt update popup to general information popup and darken blurred background for regular popups 2019-04-10 15:52:45 +02:00
Christoph Atteneder
17d5f2ac4a
Add DAO launch popup 2019-04-10 12:29:51 +02:00
Christoph Atteneder
83770dbfd4
Add votes as shared translation 2019-04-10 12:29:51 +02:00
Christoph Atteneder
ce731564a3
Add proposal as shared translation 2019-04-10 12:29:51 +02:00
Manfred Karrer
2945150e7e
Merge pull request #2674 from ManfredKarrer/add-more-info-to-dao-monitor 
Handle dao state conflicts better
 2019-04-09 12:19:41 -05:00
Manfred Karrer
a1be8a4ee7
Make base class protected and remove Inject annotation 2019-04-09 12:10:03 -05:00
Manfred Karrer
44cf1dced7
Fix wrong order or arguments 2019-04-09 12:08:10 -05:00
Harry MacFinned
5aa22cef93
Update CurrencyUtil.java 
add BURST+STEEM to the list of removed assets
 2019-04-09 07:27:39 +00:00
Manfred Karrer
8e82fa6654
Handle dao state conflicts better 
- Check if conflicting node is seed node or not. Show info in list entry
and only show resync button and red color in text if conflict is with
seed node.
- At resync move all p2p network data to a dedicated directory so they
will be reloaded from the seeds.
 2019-04-08 16:39:13 -05:00
Christoph Atteneder
ee7864bc34
Revert to SNAPSHOT versions 2019-04-08 12:12:01 +02:00
Christoph Atteneder
f9a0dd1502
Bump version number 2019-04-08 12:10:59 +02:00
Christoph Atteneder
27a2772875
Update DBs 2019-04-08 11:11:00 +02:00
Christoph Atteneder
4bec31583e
Update translations 2019-04-08 11:05:58 +02:00
Christoph Atteneder
f4c65c4d6e
Merge pull request #2665 from ManfredKarrer/use-crypt-hash-at-role 
Use cryptographic hash from protobuffer serialized data instead of hashCode
 2019-04-08 10:44:30 +02:00
Christoph Atteneder
2846b1881b
Merge pull request #2667 from ManfredKarrer/protect-against-late-blind-vote-publishing 
Protect against late blind vote publishing
 2019-04-08 10:43:48 +02:00
Christoph Atteneder
33a04bba57
Merge pull request #2669 from ManfredKarrer/close-printwriter-before-rename-temp-file 
Close printWriter before renaming temp file
 2019-04-08 10:42:37 +02:00
Christoph Atteneder
2f3dd40623
Merge pull request #2670 from ManfredKarrer/add-new-filter-option 
Add filter for min required version for DAO
 2019-04-08 10:42:09 +02:00
Manfred Karrer
ef3081e89c
Fix incorrect equality check 2019-04-07 20:49:53 -05:00
Manfred Karrer
d916101564
Fix missing argument in test 2019-04-07 20:31:53 -05:00
Manfred Karrer
38a6d58254
Add filter for min required version for DAO 2019-04-07 18:58:17 -05:00
Manfred Karrer
ffb50b6406
Change lock time fro bonds from 75 days to 110 days. 
See https://github.com/bisq-network/proposals/issues/53#issuecomment-480641730
 2019-04-07 18:27:57 -05:00
Manfred Karrer
2e5055cf56
Remove outdated db files 2019-04-07 18:03:30 -05:00