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

3317 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
bfa06b57e2 Add string for offerView 2017-03-06 22:53:48 -05:00
Manfred Karrer
931d34ea82 Merge branch 'Development' into doa_with_translations 
# Conflicts:
#	gui/src/main/java/io/bitsquare/gui/main/market/MarketView.fxml
#	gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
#	gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
#	gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
 2017-03-06 21:25:10 -05:00
Manfred Karrer
9567393bb6 Remove text string in fxml files 2017-03-06 21:17:10 -05:00
Manfred Karrer
e9fd330447 Merge pull request #768 from undso/scrollpanes 
Scrollpanes in market section
 2017-03-06 20:48:07 -05:00
Alexander Friedrichs
aa7615cd99 Removed unused code lines 2017-03-06 23:51:39 +01:00
Alexander Friedrichs
c35ce6bb79 Scrollpanes in market section 2017-03-06 23:37:53 +01:00
Manfred Karrer
7f5441b953 Merge remote-tracking branch 'origin/Allow_reopen_dispute' into doa_with_translations 2017-03-06 15:08:46 -05:00
Manfred Karrer
5bc1ee2257 Merge branch 'Allow_reopen_dispute' into Development 2017-03-06 15:06:15 -05:00
Manfred Karrer
96f208f82b Allow re-opening of a dispute (in case the arbitrator has not received it) 2017-03-06 14:49:29 -05:00
Manfred Karrer
cea8b7d992 delay removeEntryFromMailbox call to avoid repeated application of the same msg 2017-03-06 14:47:45 -05:00
Mike Rosseel
e06db65629 fix various mailbox related errors 2017-03-06 12:21:45 +01:00
Manfred Karrer
bbb6d5d244 remove string from fxml, refactor naming (WIP) 2017-03-05 20:41:04 -05:00
Manfred Karrer
0982346636 Add translation strings for TradesChartsView 2017-03-05 19:33:36 -05:00
Manfred Karrer
9edf504018 Add translation strings for SpreadView 2017-03-05 18:47:13 -05:00
Manfred Karrer
d3380bb450 Add translation strings for market and market.offerbook 2017-03-05 18:30:08 -05:00
Manfred Karrer
1e55c1249e Merge branch 'DAO' into doa_with_translations 2017-03-05 17:51:31 -05:00
Manfred Karrer
20f53f3ee6 Merged Scroll pane PR (https://github.com/bitsquare/bitsquare/pull/766, https://github.com/bitsquare/bitsquare/pull/765) 2017-03-05 17:47:07 -05:00
Manfred Karrer
795327ed78 Merged Scroll pane PR (https://github.com/bitsquare/bitsquare/pull/766, https://github.com/bitsquare/bitsquare/pull/765) 2017-03-05 17:46:55 -05:00
Manfred Karrer
20189b7128 Merge pull request #766 from undso/issue_755 
Scale GUI to fit in 1024x700 pixel #755
 2017-03-05 17:19:02 -05:00
Manfred Karrer
ecd0ff9971 Merge pull request #765 from undso/scrollpane_to_account_screen 
Add scrollpane to account screen #708
 2017-03-05 15:13:27 -05:00
Alexander Friedrichs
20103cba7e Scale GUI to fit in 1024x700 pixel #755 2017-03-05 17:21:34 +01:00
Manfred Karrer
1470fbb444 Added all resources for MainView 2017-03-04 23:23:30 -05:00
Manfred Karrer
aae59466d4 Rename BSResources to Res 2017-03-04 19:00:58 -05:00
Manfred Karrer
a9fa5420ca Remove PersistedP2PStorageData_old 2017-03-04 18:59:23 -05:00
Manfred Karrer
f626509158 Apply resources to BitsquareApp and MainView (WIP) 2017-03-04 18:58:27 -05:00
Manfred Karrer
01cd10c79b Add PersistedP2PStorageData_old 2017-03-04 18:56:43 -05:00
Alexander Friedrichs
f829d04986 Add scrollpane to account screen #708 2017-03-04 23:38:13 +01:00
Manfred Karrer
1bffdd3eaa Add PromptText to tet area input field 2017-03-04 17:36:59 -05:00
Manfred Karrer
3441286d46 Add null check 2017-03-04 17:36:36 -05:00
Manfred Karrer
f0bf3daddf Update top altcoin list 2017-03-04 17:21:33 -05:00
Manfred Karrer
55472fd280 Update jdk version in doc files 2017-03-04 17:19:31 -05:00
Manfred Karrer
560cb0af80 Show sat/byte at tx print 2017-03-04 13:31:52 -05:00
Manfred Karrer
bcd47f663a Update MIN_NONDUST_OUTPUT from 546 to 2730 (https://github.com/bitcoinj/bitcoinj/blob/master/core/src/main/java/org/bitcoinj/core/Transaction.java) 2017-03-04 13:31:32 -05:00
Manfred Karrer
e553a038f5 Add DevFlags.DEV_ARBITRATOR to support dev keys. Autofill key if DEV_ARBITRATOR is set 2017-03-03 18:37:33 -05:00
Manfred Karrer
63c4bc546f Add TODO 2017-03-03 10:57:06 -05:00
Manfred Karrer
4a52ad5be1 Add comment 2017-03-03 10:39:47 -05:00
Manfred Karrer
002211b7f6 Reset sub version nr to 1 2017-03-03 10:38:28 -05:00
Mike Rosseel
9041960e74 set null fields to the default protobuffer values, otherwise Offer classes are not the same on both sides of the wire 2017-03-02 22:43:53 +01:00
Manfred Karrer
28a704ed85 Fix bug with backup path when path became invalid. Improve backup handling and UI. 2017-03-01 20:46:17 -05:00
Manfred Karrer
bbe7192041 Refactor Wallet classes 2017-03-01 19:49:23 -05:00
Manfred Karrer
7ad15f8567 Add PersistedP2PStorageData 2017-03-01 18:30:14 -05:00
Manfred Karrer
27306cee11 Add checkpoint for testnet (again) 2017-03-01 18:29:43 -05:00
Manfred Karrer
c6897f730a Update comment 2017-03-01 11:33:34 -05:00
Manfred Karrer
f5b503deaf Update bip 44 nr to 142 2017-03-01 11:33:05 -05:00
Manfred Karrer
55e7871777 Rename shutDownDone to shutDownComplete at WalletsSetup. 2017-03-01 11:27:54 -05:00
Manfred Karrer
0d863fc163 Remove testnet checkpoint 2017-03-01 11:26:40 -05:00
Manfred Karrer
68494bd83d Update to checkpoint of block: 
000000000000000002884993a2b7306aa7b2af94b6ffe00bc7c689738f7816c6 from: 2017-01-22
 2017-03-01 11:26:00 -05:00
Mike Rosseel
c25e083cbe fix protobuffer bugs, nullcheck for truncatedString utility 2017-03-01 16:28:27 +01:00
Mike Rosseel
cc08e31546 logging changes 2017-03-01 16:26:40 +01:00
Mike Rosseel
fd9e48d8b7 revert to as close as the old version as possible 2017-03-01 16:26:07 +01:00