Chris Beams
61547d6a83
Add Editorconfig settings
...
Per https://github.com/bisq-network/docs/blob/master/CONTRIBUTING.adoc .
See comments in #959 for details.
2017-10-20 10:13:19 +02:00
Manfred Karrer
c26896fb1d
Merge branch 'mrosseel-docker-seednode-pr' into Development
2017-10-19 10:41:33 -05:00
Manfred Karrer
5cd47a610f
Remove space
2017-10-19 10:41:22 -05:00
Mike Rosseel
5ddec3e4f2
Dockerfile for a hidden service seednode
...
Adds Dockerfile and docker-compose.yml files to easily build a new
seednode from the latest master branch. The Dockerfile assumes you
have a hostname and private_keys.
Also small fixes to SeedNode/SeedNodeMain.
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-19 14:33:43 +02:00
Manfred Karrer
92434c4851
Merge branch 'mrosseel-api-pr1' into Development
2017-10-13 10:14:44 -05:00
Manfred Karrer
46b2a14954
Fix wrong getMakerFee method, cleanup
2017-10-13 10:12:32 -05:00
Manfred Karrer
ca171bcb43
Merge branch 'api-pr1' of https://github.com/mrosseel/bisq-exchange into mrosseel-api-pr1
2017-10-13 09:16:53 -05:00
Mike Rosseel
0d411707e5
Documentation and cleanup of Offer related classes
...
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-10-13 14:40:18 +02:00
Manfred Karrer
ffa4902765
Merge branch 'ManfredKarrer-Development' into Development
2017-10-12 21:36:53 -05:00
Manfred Karrer
b2579fbfdd
Add new languages: Chinese, Hungarian, Romanian, Russian, French, Turkish
2017-10-12 21:33:00 -05:00
Manfred Karrer
b0f451a2df
Merge remote-tracking branch 'upstream/Development' into Development
2017-10-12 19:11:26 -05:00
Manfred Karrer
2cbe7454aa
Merge branch 'master' into Development
2017-10-12 14:24:10 -05:00
Manfred Karrer
8cc6c01b3d
Merge remote-tracking branch 'origin/master'
2017-10-12 14:23:55 -05:00
Manfred Karrer
9543b01d81
Merge branch 'master' into Development
2017-10-12 14:11:10 -05:00
Manfred Karrer
b835e7f5a5
Add missing param to log
2017-10-12 13:48:12 -05:00
Mike Rosseel
68048bc2d3
Removing all changes to make GUI work with the API
...
The other changes in GUI, namely small refactoring to have the GUI
and the API use the same methods to calculate things have been
left in place.
2017-10-12 17:32:59 +02:00
Mike Rosseel
6f030a4656
Merge branch 'api-pr1' of github.com:mrosseel/bisq-exchange into api-pr1
2017-10-12 16:20:56 +02:00
Mike Rosseel
8a1c26a01a
Merge branch 'api-pr1' of github.com:mrosseel/bisq-exchange into api-pr1
2017-10-12 16:20:19 +02:00
Mike Rosseel
f6d0664798
Merge branch 'api-pr1' of github.com:mrosseel/bisq-exchange into api-pr1
2017-10-12 16:17:33 +02:00
Mike Rosseel
482871a603
Merge branch 'api-pr1' of github.com:mrosseel/bisq-exchange into api-pr1
2017-10-12 16:17:10 +02:00
Mike Rosseel
1f3e9dadfb
Merge branch 'api-pr1' of github.com:mrosseel/bisq-exchange into api-pr1
2017-10-12 16:14:34 +02:00
Mike Rosseel
c79d9e992c
Reverting non-relevant changes
2017-10-12 16:12:21 +02:00
Mike Rosseel
a8bcc4a9e3
Reverting non-relevant changes
2017-10-12 15:07:52 +02:00
Manfred Karrer
ad049caccb
Change name of IOP from Fermet to Internet Of People
2017-10-11 15:19:11 -05:00
Manfred Karrer
5d0c2d65c3
Change restrictiron for pw lenght from 50 to 500 chars
2017-10-11 15:17:01 -05:00
Manfred Karrer
5fb49b45bc
Change text for lost trade fee
2017-10-11 14:59:58 -05:00
Mike Rosseel
0755cac9d1
Merge remote-tracking branch 'origin/Development' into api-pr1
...
Conflicts:
common/src/main/java/io/bisq/common/locale/LocaleUtil.java
2017-10-11 14:38:34 +02:00
Manfred Karrer
0c86ae9354
Add Altcoin Ellaism
2017-10-11 07:28:58 -05:00
Manfred Karrer
9732301dbd
Merge branch 'ManfredKarrer-Development2' into Development
2017-10-11 07:23:20 -05:00
Manfred Karrer
4c08fa8679
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange into ManfredKarrer-Development2
2017-10-11 07:22:06 -05:00
Manfred Karrer
01cf823d7a
Prepare merge Dev
2017-10-11 07:21:50 -05:00
Manfred Karrer
e179475bb9
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange
2017-10-11 07:14:01 -05:00
Mike Rosseel
f1d37433ef
Remove API module
...
The API module will be hosted in a separate repo, so it shouldn't be
in this one. GUI module will reference the API artifact created by
that other repo to allow the command-line switch to function on
first checkout of the bisq project.
2017-10-10 11:11:39 +02:00
Mike Rosseel
fbfb9ccc50
Merge branch 'Development' into issue544-api
2017-10-09 16:11:37 +02:00
Mike Rosseel
91b5d93bf0
Add support documents
...
Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
2017-10-09 16:05:45 +02:00
Manfred Karrer
ca71f4464f
Put altcoin Ellaism to right position in list
2017-10-08 21:15:38 -05:00
Manfred Karrer
8ac5d51bdd
Merge branch 'ellaismer-Development' into Development
2017-10-08 21:14:51 -05:00
Manfred Karrer
a8c81871c9
Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development
2017-10-08 21:12:02 -05:00
Manfred Karrer
c6d649f2db
Merge branch 'eljobe-fix-until-misuse'
2017-10-08 21:09:59 -05:00
Manfred Karrer
a76b4d17f5
Show better text in PeerInfo if 0 trades
2017-10-08 21:03:08 -05:00
Manfred Karrer
361a520048
Remove sum column in market offerbook tables
2017-10-08 20:48:11 -05:00
Manfred Karrer
4522f50149
Fix wrong fee group at Create offer screen. Improve wording
2017-10-08 20:39:09 -05:00
Manfred Karrer
3963924359
Change Maker fee to Trade fee
2017-10-08 20:03:20 -05:00
Manfred Karrer
e26037c59f
Change Taker fee to Trade fee
2017-10-08 20:00:37 -05:00
Manfred Karrer
cb24b973ba
Don't show fee and security deposit fields if BSQ is not enabled
2017-10-08 19:53:52 -05:00
Manfred Karrer
6904c545b0
Improve logging
2017-10-08 19:53:04 -05:00
Pepper Lebeck-Jobe
ec393aea5f
Change "until" to "by" in three places
...
This common grammatical error for German-speakers can sound
particularly strange to native English speakers. The rule
is subtle, but these two sentences mean the same thing:
1. You have until 12am to place your drink order.
2. You must place your drink order by 12am.
2017-10-08 17:35:40 +02:00
Manfred Karrer
ab5e8a386b
Merge branch 'eljobe-fix-id-padding'
2017-10-06 21:26:42 -05:00
Manfred Karrer
ec2b941f15
Merge branch 'fix-id-padding' of https://github.com/eljobe/exchange into eljobe-fix-id-padding
2017-10-06 21:26:26 -05:00
Manfred Karrer
15a5f75877
Merge remote-tracking branch 'upstream/Development' into Development
2017-10-06 21:04:53 -05:00
