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
5,192 Commits 4 Branches 148 Tags 4.3 GiB
b930e18ce0
Commit Graph

5192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph Atteneder
b930e18ce0
Increase vertical gap 2018-02-13 10:00:46 +01:00
Christoph Atteneder
ac20997c05
Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process 2018-02-12 11:52:57 +01:00
Chris Beams
ed0148bfee
Enable running tests in Travis CI 
This change removes the custom `script` command, falling back to Travis
CI's default Maven script command, which, per [1] is:

    mvn test -B

The effect is that tests should now be run, which is particularly useful
for incoming pull requests.

See https://github.com/bisq-network/exchange/pull/1309#issuecomment-363776458
for context.

[1]: https://docs.travis-ci.com/user/languages/java/#Maven-Default-Script-Command
 2018-02-08 13:30:54 +01:00
Chris Beams
8d44f750f6
Do not steal focus when selecting disputes 
This commit reverts a change added in
f0a985ea0d (#1311) that made it impossible
to scroll through arbitration tickets with the arrow keys, because on
selecting each dispute/ticket, the input text area would steal focus
away.

Now, the input text field still gets auto-focused when the dispute view
is opened, but does not try to steal / auto-focus when scrolling through
/ selecting individual disputes.
 2018-02-08 09:24:56 +01:00
Christoph Atteneder
83a890be43
Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process 2018-02-08 09:22:46 +01:00
Chris Beams
4ac2343219
Merge pull request #1326 from blabno/feature/1058-make-arbitration-chat-messages-selectable 
Make arbitration chat messages selectable
 2018-02-08 08:37:22 +01:00
Manfred Karrer
82bc3bd6eb
Merge pull request #1329 from ripcurlx/fix-broken-css-alignment 
Fix wrong css alignment.
 2018-02-06 13:46:02 -05:00
Manfred Karrer
fb28766052
Merge pull request #1330 from blabno/feature/configurable-address-in-localp2p-mode 
Configurable hostname in localhost p2p mode.
 2018-02-06 13:45:26 -05:00
Bernard Labno
c12fb0c29b Configurable hostname in localhost p2p mode. 2018-02-06 15:31:20 +01:00
Christoph Atteneder
be826c8686
Fix wrong css alignment. 2018-02-06 14:42:58 +01:00
Christoph Atteneder
d03dd58144
Add info pop over for trade period 2018-02-06 11:18:57 +01:00
Christoph Atteneder
ba1a8c3982
Add InfoTextField for displaying additional information in a TextField 2018-02-05 19:16:56 +01:00
Bernard Labno
6499cf8168 Make arbitration chat messages selectable 2018-02-05 16:00:47 +01:00
Christoph Atteneder
b1aa86a57c
Add account age translation 2018-02-05 10:13:09 +01:00
Christoph Atteneder
09807a0744
Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process 
# Conflicts:
#	common/src/main/resources/i18n/displayStrings_ro.properties
 2018-02-05 10:09:55 +01:00
Manfred Karrer
1bd222c5e9
Merge pull request #1311 from blabno/feature/1208-use-auto-focus-on-the-first-input-field-on-all-screens 
Use auto focus on the first input field on all screens
 2018-02-03 09:33:59 -05:00
Bernard Labno
f0a985ea0d Use auto focus on the first input field on all screens 2018-02-03 12:28:37 +01:00
Manfred Karrer
53ec4b2404
Merge pull request #1307 from stellitecoin/master 
Add Stellite Coin
 2018-02-02 20:11:12 -05:00
Manfred Karrer
629c8b59df
Merge pull request #1318 from tau3/bugfix/1315/connection-lock-problem 
bugfix/1315/connection-lock-problem
 2018-02-02 19:56:43 -05:00
Manfred Karrer
5ab1a3bfe8
Merge pull request #1323 from stevenkain/patch-6 
Update displayStrings_ro.properties
 2018-02-02 19:47:48 -05:00
stevenkain
2f0a6c1bc9
Update displayStrings_ro.properties 
New translation
 2018-02-03 00:53:56 +02:00
Christoph Atteneder
bd4692f520
Fix wrong expectation of formatter method and add new translations for handling trade limits 2018-02-02 15:31:47 +01:00
Christoph Atteneder
76046c3de6
Remove trade date until from max trade period 2018-02-02 15:27:19 +01:00
Christoph Atteneder
75f0b4ad71
Remove translation that is not used 2018-02-02 15:21:45 +01:00
Sergey Rozhnov
f159de6bb4 Implemented result awaiting in SynchronizedProtoOutputStream 2018-02-02 16:29:21 +04:00
Sergey Rozhnov
3e27d69e03 Integrated Connection class with SynchronizedProtoOutputStream 2018-02-02 16:10:40 +04:00
Sergey Rozhnov
98eabf84fa Implemented SynchronizedProtoOutputStream 2018-02-02 15:55:20 +04:00
Sergey Rozhnov
5fc7364973 Added initial implementation of ProtoOutputStream class 2018-02-02 14:30:31 +04:00
Chris Beams
f8af7d57b3
Suggest @ripcurlx as reviewer on /gui/* PRs (#1317) 2018-02-02 10:01:32 +01:00
Chris Beams
ba2b73a7c6
Add CODEOWNERS file 
See comments within.
 2018-02-02 09:54:20 +01:00
Manfred Karrer
b21d04819b
Merge branch 'ripcurlx-fix-formatter-when-showSeconds-used' 2018-02-01 15:54:22 -05:00
Manfred Karrer
1ed3b86fe9
Merge branch 'fix-formatter-when-showSeconds-used' of https://github.com/ripcurlx/exchange into ripcurlx-fix-formatter-when-showSeconds-used 2018-02-01 15:53:54 -05:00
Manfred Karrer
1149a46837
Merge branch 'ripcurlx-use-info-icon-for-funds' 2018-02-01 15:52:43 -05:00
Manfred Karrer
c21198b5fb
Fix missing import 2018-02-01 15:48:41 -05:00
Manfred Karrer
433363b633
Add new param BsqBlockChain 2018-02-01 14:13:09 -05:00
Manfred Karrer
ee9b133f65
Merge branch 'Development' 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java
 2018-02-01 14:10:42 -05:00
Manfred Karrer
8fa0e88bec
Merge branch 'tau3-feature/refactor-fill-currency-list-items' 2018-02-01 13:57:45 -05:00
Manfred Karrer
f49e0effb3
Merge branch 'feature/refactor-fill-currency-list-items' of https://github.com/tau3/exchange into tau3-feature/refactor-fill-currency-list-items 2018-02-01 13:50:05 -05:00
Manfred Karrer
a03854d999
Merge branch 'tau3-feature/refactor-transaction-view' 2018-02-01 13:48:16 -05:00
Manfred Karrer
6bce8f0cc6
Merge branch 'feature/refactor-transaction-view' of https://github.com/tau3/exchange into tau3-feature/refactor-transaction-view 2018-02-01 13:38:29 -05:00
Manfred Karrer
7cd96363ff
Merge #1297 2018-02-01 13:29:25 -05:00
Manfred Karrer
e84009e07f
Merge branch 'tau3-feature/1285/account-offer-validation' 2018-02-01 13:18:56 -05:00
Manfred Karrer
26db1270a5
Merge branch 'feature/1285/account-offer-validation' of https://github.com/tau3/exchange into tau3-feature/1285/account-offer-validation 2018-02-01 13:08:47 -05:00
Sergey Rozhnov
29d3e26f34 Added headers for new classes 2018-02-01 20:21:20 +04:00
Sergey Rozhnov
ce4c084878 Refactored unit tests for CurrencyList; integrated Currency list with dependent classes 2018-02-01 20:15:18 +04:00
Sergey Rozhnov
3c246bdb69 Implemented unit tests for CurrencyList class 2018-02-01 19:47:17 +04:00
Sergey Rozhnov
e9efcf996b Refactored CurrencyList class 2018-02-01 19:13:39 +04:00
Christoph Atteneder
89a3939728
Add fee and deposit information to total funds to pay field 2018-02-01 15:05:24 +01:00
Sergey Rozhnov
7b07ce1777 Extracted comparing logic into a separate method 2018-02-01 17:06:42 +04:00
Christoph Atteneder
dffa5528bb
Use copy to clipboard tooltip 2018-02-01 14:01:39 +01:00