Niyi Dada
b4f79f2e73
Fixed column indexing.
2019-08-06 11:35:59 +01:00
Niyi Dada
d12a6c2e0f
Reformatting completed.
2019-08-01 13:11:38 +01:00
Niyi Dada
09369c6043
Reformatting.
2019-08-01 12:29:05 +01:00
Niyi Dada
0fffbe670e
Columns added to export but hidden from view table.
...
- Transaction Fee
- Maker Fee
- Buyer Deposit
- Seller Deposit
2019-07-31 22:55:22 +01:00
Christoph Atteneder
fdf5364c47
Add domain layer for signed account age witnesses (credits ManfredKarrer and oscarguindzberg)
2019-07-30 11:38:57 +02:00
Christoph Atteneder
db25293d62
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-for-v1.1.3
...
# Conflicts:
# build.gradle
# desktop/package/linux/Dockerfile
# desktop/package/linux/package.sh
# desktop/package/linux/release.sh
# desktop/package/macosx/create_app.sh
# desktop/package/macosx/finalize.sh
# desktop/package/macosx/insert_snapshot_version.sh
# desktop/package/windows/package.bat
# desktop/package/windows/release.bat
# relay/src/main/resources/version.txt
2019-07-29 19:00:37 +02:00
Christoph Atteneder
d7cdd4be5c
Revert to SNAPSHOT version
2019-07-29 15:41:41 +02:00
sqrrm
50f350445c
Add checkpoint at block 586920
...
A checkpoint at block 586920 with hash
523aaad4e760f6ac6196fec1b3ec9a2f42e5b272 to avoid that clients in
a corrupt state continue running.
Ignore checkpointing if ignoreDevMsg is set
2019-07-28 20:32:19 +02:00
Christoph Atteneder
d498e43415
Bump version number
2019-07-26 10:41:47 +02:00
Christoph Sturm
c3d21806c4
rename Clock to ClockWatcher
...
* this class is not a clock but it watches the clock, detects standby
and runs periodic tasks.
* there is already a jdk method called clock
First i thought it should be called PeriodicTaskManager, now i find
ClockWatcher more fitting.
2019-07-24 16:39:03 +02:00
Niyi Dada
36002dbbcc
Added test for median statistics
2019-07-18 19:11:54 +01:00
Niyi Dada
36b462be27
Fix for issue 2955
2019-07-18 19:09:39 +01:00
Niyi Dada
58ce6af3eb
Fix for issue 2955
2019-07-18 19:07:15 +01:00
Niyi Dada
91c3337c37
Fixes for issues 2944 and 2955
2019-07-18 18:58:55 +01:00
Christoph Atteneder
a2c19fa785
Revert to SNAPSHOT version
2019-07-15 16:35:49 +02:00
Christoph Atteneder
59be5bc94e
Bump version number
2019-07-15 16:33:55 +02:00
Christoph Atteneder
3b915a3131
Merge pull request #2884 from sqrrm/hide-extremes
...
Add checkbox to hide extreme offers in chart
2019-07-12 10:33:48 +02:00
a123b
0ee23c7b4f
Fix missing payment info on SEPA Instant trades
2019-07-02 16:57:22 +02:00
a123b
2b171e4831
Fix offer editing for low volume offers
...
For very low volume offers, it can happen that the minimum buyer security
deposit by coin value is bigger than the maximum security deposit by
percentage of trade amount.
This caused the security deposit validity check in the offer editor to fail,
making it impossible to edit these offers.
This commit fixes the problem by setting the default percentage value to
the model instead of the calculated one in this specific case.
2019-06-29 17:03:19 +02:00
sqrrm
664c7c6f87
Remove extra UI element and text string
2019-06-21 11:20:45 +02:00
sqrrm
7a66febd52
Remove checkbox for hiding extremes
2019-06-20 12:07:58 +02:00
Christoph Atteneder
d53c3b387c
Merge pull request #2890 from sqrrm/display-param-change-value
...
Display changed param value at proposal time, fix #2692
2019-06-19 18:06:27 +02:00
sqrrm
386209bd99
Merge pull request #2888 from sqrrm/late-vote-reveal-handling
...
Late vote reveal handling
2019-06-19 12:54:51 +02:00
sqrrm
8c278a650a
Fix check for vote inclusion
2019-06-18 15:02:41 +02:00
sqrrm
212b779203
Use genesis height as fallback
2019-06-17 10:58:29 +02:00
sqrrm
29c48e9548
Display changed param value at proposal time, fix #2692
2019-06-16 15:49:30 +02:00
sqrrm
ba002b5207
Limit BSQ validator to 10M BSQ, fix #2727
2019-06-16 14:49:37 +02:00
sqrrm
12e46f027a
Indicate when vote wasn't included in result in proposalDisplay
2019-06-16 00:34:49 +02:00
sqrrm
98b4fe0d91
Show failed ballots as failed, fix #2704
2019-06-16 00:08:27 +02:00
sqrrm
fcfd302f62
Use proper vertical alignment for checkbox
2019-06-15 11:29:47 +02:00
sqrrm
23927af6a7
Add checkbox to hide extreme offers in chart
2019-06-14 14:08:49 +02:00
sqrrm
13f265122b
Add basic chat UI
...
Very basic switch between chat and overview per trade, improvements
needed on the UI.
2019-06-06 00:34:53 +02:00
Christoph Atteneder
5b841709d4
Revert to SNAPSHOT version
2019-06-04 10:53:42 +02:00
Christoph Atteneder
ca24ce0217
Bump version number
2019-06-04 10:49:00 +02:00
sqrrm
fb71c3245f
Test trade chat UI
2019-06-03 13:12:49 +02:00
sqrrm
3b87045133
Make attachments optional
2019-06-03 13:12:12 +02:00
agb19
9970571979
Fix "useless use of IPv6" in Tor socket
...
Implements the "possible fix" described in issue #2840 by appending the directive `java.net.preferIPv4Stack=true` to the JVM options.
Tested successfully on Debian 9 and Tails 3.14, using platform Tor and onion-grater.
2019-06-03 10:08:46 +00:00
sqrrm
b93e7bac56
Add trader chat
...
- Add communication messages to Trade protobuf message to be able to
save chat messages per trade
- Add Type enum and field to DisputeCommunicationMessage protobuf to
be able to dispatch Dispute and Trade chat messages properly
- Rename some function as isClient instead of isTrader to make it easier
to understand who is who when two traders are communicating with each
other
2019-06-02 15:40:50 +02:00
sqrrm
1b1dce1012
Add ChatManager
...
Move session classes to core. Break out DisputeCommunicationMessage
handling from DisputeManager and put in ChatMananger prepare for other
uses of ChatManager.
Renaming of DisputeCommunicationMessage would be nice but it's
representing the protobuf messages so the name has to stay.
2019-05-30 18:49:54 +02:00
sqrrm
dcfb5faf1e
Show peer address properly
2019-05-28 17:01:40 +02:00
sqrrm
2d77f32598
Handle Chat message subscription inside Chat
2019-05-25 18:15:46 +02:00
sqrrm
1a25678080
Move close ticket button creation to arbitration
...
Add extra button for generically added button in chat
2019-05-25 16:39:18 +02:00
sqrrm
b1362a9a36
Separate most of Chat and arbitration
...
The naming of DisputeCommunicationMessage has to stay but they otherwise
fit what would be more aptly named ChatCommunicationMessage or something
in that spririt.
2019-05-25 16:22:15 +02:00
sqrrm
b5b126ceb4
Refactor Chat out of TraderDisputeView
...
On the way to adding chat for traders this is a first step. Mainly just
moving functionality out of TraderDisputeView to Chat class. There are
still remaining dispute functionality that needs to be factored away.
2019-05-24 00:33:50 +02:00
Devin Bileck
13cec4a877
Add more tests for formatDurationAsWords
2019-05-17 14:37:37 -07:00
Manfred Karrer
a730cc5300
Merge pull request #2705 from devinbileck/proposal-url-validation
...
Add specific URL validation for proposal links
2019-05-16 14:01:45 +02:00
Devin Bileck
f0fc83619c
Fix DAO synchronization text after restore from seed
...
After restoring from seed, the text shown under DAO /
BSQ Wallet / Transactions displays an incorrect progress - the numbers
are swapped. For example:
"Awaiting blocks... Verified 575,868 blocks out of 554,857"
Normally we get the latest block height from BitcoinJ as the
target height, and we request BSQ blocks from seed nodes up to latest
block.
But when restoring from seed, we receive the latest block height
from the seed nodes while BitcoinJ has not received all blocks yet and
is still syncing.
Fixes https://github.com/bisq-network/bisq/issues/2825
2019-05-15 23:14:55 -07:00
Manfred Karrer
cf9dc0df50
Merge pull request #2830 from ManfredKarrer/improve-dispute-ui
...
Fix issue with label width, add deposits
2019-05-15 01:23:40 +02:00
Manfred Karrer
4f7558b899
Fix issue with label width, add deposits
2019-05-14 15:18:13 +02:00
Manfred Karrer
25ee98dbce
Fixes https://github.com/bisq-network/bisq/issues/2804 and https://github.com/bisq-network/bisq/issues/2826
2019-05-14 15:05:12 +02:00
Manfred Karrer
96138e759b
Cleanups
2019-05-11 12:55:29 +02:00
Christoph Atteneder
98a7748a01
Revert to SNAPSHOT version
2019-05-06 10:55:09 +02:00
Christoph Atteneder
ac68da1dd3
Bump version number
2019-05-06 10:47:01 +02:00
Christoph Atteneder
d1d219b36b
Improve layout of Zelle form for buyer
2019-05-06 10:04:43 +02:00
Manfred Karrer
28727ad56d
Fix bug that sellers are restricted as well
...
Only buyers should be restricted if their account age is too young.
2019-05-05 21:14:30 -05:00
Christoph Atteneder
36c0e49504
Revert to SNAPSHOT version
2019-05-03 12:47:59 +02:00
Christoph Atteneder
8ceb2e3be2
Bump version number
2019-05-03 12:13:41 +02:00
Christoph Atteneder
7523fc5628
Merge pull request #2801 from ManfredKarrer/restrict-new-accounts
...
Add check for account age to apply restrictions
2019-05-03 12:09:50 +02:00
Christoph Atteneder
364f666a27
Only show information popup when actual amount was set
2019-05-03 11:57:38 +02:00
Manfred Karrer
830e693ace
Refactoring: Rename CheckIfPeerIsBanned to ApplyFilter
2019-05-02 21:48:51 -05:00
Manfred Karrer
3b613bebce
Improve handling of filter
2019-05-02 21:48:13 -05:00
Manfred Karrer
c4e30e5aa9
Fix limitations
2019-05-02 20:54:31 -05:00
Manfred Karrer
e51844a7f1
Improve dispute handling of failed trades
2019-05-02 17:39:58 -05:00
Manfred Karrer
08cf993d0f
Add amount limit to take offer view
2019-05-02 16:22:20 -05:00
Manfred Karrer
8e0ec54fb1
Refactor restriction handling
2019-05-02 15:15:13 -05:00
Manfred Karrer
c74025b409
Remove check for makerHasNoMatureAccountForBuyOffer
2019-05-02 13:44:14 -05:00
Manfred Karrer
6d6e869eef
Revert changes with filtering not mature accounts
...
- We will allow small amounts so we keep all accounts and add the check
later when the user click next
2019-05-02 13:41:26 -05:00
Manfred Karrer
8ab348c495
Add check for account age to apply restrictions
2019-05-02 13:06:46 -05:00
Christoph Atteneder
1d18029b1c
Update dbs
2019-05-02 18:00:35 +02:00
Manfred Karrer
df7b81138f
Add missing import
2019-04-27 16:03:16 -05:00
Manfred Karrer
b1a8429066
Merge pull request #2752 from ManfredKarrer/add-filter-to-trade-history
...
Add filter to trade history
2019-04-27 15:53:33 -05:00
Christoph Atteneder
ca0387ad5b
Add prompt text for filter textfield
2019-04-25 12:23:54 +02:00
Christoph Atteneder
d2d6636544
Merge pull request #2753 from ManfredKarrer/fix-trade-peers-account-age
...
Fix account age display of peer
2019-04-24 11:33:27 +02:00
Christoph Atteneder
3a1f69472c
Merge pull request #2763 from sqrrm/market-view-precision
...
Use same precision for all x-axis labels
2019-04-24 11:20:11 +02:00
sqrrm
4ed510d372
Refactor variable names
2019-04-22 12:20:51 +02:00
Manfred Karrer
fb4b66d691
Remove check if trade is disputed
...
It can be that one user opened a dispute but in the meantime the other
peer sent or received the funds. Atm after a dispute has been opened the
user cannot confirm anymore. This restriction forces all cases to be
resolved in arbitration. If we relax that restriction to allow users
to still confirm after they opened a dispute we might reduce work load
for arbitrators as the payout can be done by the users if both have
confirmed. The arbitrator still need to close the case to that the
open support cases get closed, but the payout tx was already created
by the users.
2019-04-21 18:01:35 -05:00
Manfred Karrer
9b13740feb
Dont disable the confirm buttons
...
Arbitrators reported that there are some cases where the confirm
payment or receipt buttons are disabled and they cannot confirm it.
Another issue is that sometimes the confirm msg does not arrive and
after button click its disabled so the message cannot be resent but
clicking the button again.
The software should handle such case and there is some automatic resend
but it seems it does not cover all cases. By keeping the button active
the user can click again and there is higher chance that such cases
get resolved by itself.
I am aware that this is not a good solution but to find out what
exactly caused the issue and to build a more resilient resend
functionality requires much more work and this seems to be a easy fix
which might avoid many disputes.
2019-04-21 17:58:42 -05:00
Manfred Karrer
dc773460a9
Merge branch 'master' into fix-trade-peers-account-age
2019-04-21 17:17:46 -05:00
Manfred Karrer
eb1c4fd25c
Merge pull request #2737 from ManfredKarrer/use-utf8-for-getBytes
...
Add UTF8 for getBytes calls
2019-04-21 17:16:34 -05:00
sqrrm
7f00fe227f
Use same precision for all x-axis labels
2019-04-21 23:53:17 +02:00
Manfred Karrer
145ec99725
Hide age at altcoins
2019-04-20 00:05:16 -05:00
Manfred Karrer
7af2d889ce
Add account age to dispute table
2019-04-19 23:50:29 -05:00
Manfred Karrer
3246bf4720
Add account age to contract json
2019-04-19 22:21:57 -05:00
Manfred Karrer
f23773b81c
Add account age to contract window
2019-04-19 22:14:34 -05:00
Manfred Karrer
c145cab7b8
Add account age to trade details window
2019-04-19 22:00:41 -05:00
Manfred Karrer
1f00e8c3aa
Move method
2019-04-19 21:52:28 -05:00
Manfred Karrer
f88af6b450
Fix account age display of peer
...
We only showed makers account age before also at trade screens.
This PR fixes that so that the trade peers account age is displayed at
the peer info icon.
2019-04-19 21:31:26 -05:00
Manfred Karrer
25e2621ce5
Fix missing arguments
2019-04-19 20:37:19 -05:00
Manfred Karrer
59f31c7c6e
Merge branch 'master' into fix-dao-full-mode-settings-issue
...
# Conflicts:
# common/src/main/proto/pb.proto
# core/src/main/java/bisq/core/user/Preferences.java
# core/src/main/java/bisq/core/user/PreferencesPayload.java
# desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
2019-04-19 20:32:11 -05:00
Manfred Karrer
7adb3226a4
Merge pull request #2746 from ripcurlx/fix-styling-of-alert-message
...
Use existing styling for developer alert message
2019-04-19 20:25:17 -05:00
Manfred Karrer
262fa851b6
Merge pull request #2742 from ripcurlx/set-lower-security-deposit-for-altcoins
...
Use different security deposit for fiat-crypto and crypto-crypto trades
2019-04-19 20:24:26 -05:00
Manfred Karrer
c25c1ca82b
Add filter box to trade history
...
Can filter by onion address, date string, trade id and
payment details data.
2019-04-19 20:12:54 -05:00
Christoph Atteneder
dadd22cc31
Remove unnecessary static import
2019-04-19 10:53:44 +02:00
Christoph Atteneder
211f65f12b
Use existing styling for developer alert message
2019-04-18 22:19:23 +02:00
Christoph Atteneder
55d09a308b
Use different security deposit for fiat-crypto and crypto-crypto trades
2019-04-18 19:37:46 +02:00
Christoph Atteneder
8481593370
Improve handling of editing of offers with invalid security deposit
2019-04-18 14:45:23 +02:00
Manfred Karrer
1008e9bc51
Add UTF8 for getBytes calls
...
Fixes https://github.com/bisq-network/bisq/issues/2729
2019-04-17 19:56:21 -05:00
Manfred Karrer
6cd04a0d91
Merge pull request #2621 from ManfredKarrer/ignore-dust-utxo
...
Ignore dust utxo
2019-04-17 18:30:50 -05:00
Manfred Karrer
6f44dc5c1c
Fix issues with DAO full mode in preferences
...
There was missing the block notify port as well as the options have
not been applied correctly which led to the situation that when you
run the same application in full mode and later in lite mode that
data got persisted.
Added also to the footer a note if full mode is running.
2019-04-17 18:26:33 -05:00
Manfred Karrer
5f86da9e73
Merge pull request #2734 from ripcurlx/include-bsq-in-markets-print-tool
...
Remove BSQ filter for crypto currencies
2019-04-17 09:21:44 -05:00
Christoph Atteneder
e37a704016
Remove BSQ filter for crypto currencies
2019-04-17 11:16:55 +02:00
Manfred Karrer
70a950ce94
Use fullAddress for ignored peers and in peer info
2019-04-16 23:18:36 -05:00
Manfred Karrer
fcbc3b659b
Ignore utxo below a user defined threshold to avoid dust attacks
...
Implements https://github.com/bisq-network/bisq/issues/2604
2019-04-16 20:42:13 -05:00
Manfred Karrer
21c5eec5f6
Remove referralIdInputTextField
...
The referralId support did not get any interest so we removed it from
the UI. It is still supported via prog argument and can be re-enabled
again once there are use cases (API?).
I left it commented out to make re-enabling easier.
2019-04-16 20:41:59 -05:00
Christoph Atteneder
36f8b0275a
Revert to SNAPSHOT version
2019-04-16 16:26:41 +02:00
Christoph Atteneder
bdf163ca2d
Bump version number
2019-04-16 16:03:12 +02:00
Christoph Atteneder
6cceed2bc4
Merge pull request #2724 from ripcurlx/show-news-badge-for-dao-launch
...
Show DAO news badge to increase visibility of DAO launch
2019-04-16 15:51:49 +02:00
Manfred Karrer
536ef67be0
Merge pull request #2725 from ripcurlx/remove-rounding-popup-showing-redundancy
...
Only show rounding popup once during activation
2019-04-16 08:49:43 -05:00
Christoph Atteneder
c972dfe668
Only show rounding popup once during activation and not show it in edit offer screen.
...
Fixes #2708 .
2019-04-16 15:01:14 +02:00
Christoph Atteneder
b119c71a1c
Show DAO news badge to increase visibility of DAO launch
2019-04-16 13:34:50 +02:00
Christoph Atteneder
02f6475470
Fix wrong calculation of percentage based security deposit
2019-04-16 11:27:59 +02:00
Christoph Atteneder
60826a11e1
Revert to SNAPSHOT
2019-04-15 17:42:16 +02:00
Manfred Karrer
6c98d98ce1
Merge branch 'master' into rc_v1.0.0
2019-04-15 09:00:31 -05:00
Manfred Karrer
b8b2e8b2bd
Merge pull request #6 from ripcurlx/fix-scrolling-in-trade-view
...
Reduce table height and update height calculation to prevent scrolling
2019-04-15 08:31:39 -05:00
Christoph Atteneder
edfe035cb9
Align Altcoin list with Altcoin selection combobox
2019-04-15 15:26:10 +02:00
Christoph Atteneder
8f7dae49c6
Reduce table height and update height calculation to prevent scrolling
2019-04-15 15:15:15 +02:00
Christoph Atteneder
1664a72788
Update Mainnet dbs and remove old test dbs
2019-04-15 14:13:53 +02:00
Manfred Karrer
1f9e2ce6a1
Fix nullpointer
2019-04-14 19:14:25 -05:00
Manfred Karrer
1f05e8ff75
Merge pull request #5 from ripcurlx/improve-sepa-form
...
Small improvements
2019-04-14 15:22:46 -05:00
Christoph Atteneder
ac4cd820d6
Move country into second column to save space
2019-04-14 21:50:35 +02:00
Manfred Karrer
57ae8af3d7
Add requireUpdateToNewVersion check
2019-04-14 13:52:53 -05:00
Manfred Karrer
5b8ff6ef73
Merge branch 'master' into rc_v1.0.0
2019-04-13 12:49:29 -05:00
Manfred Karrer
bb71fb122b
Use full address instead of hostname
2019-04-13 10:58:17 -05:00
Christoph Atteneder
5d70e3d755
Fix wrong padding of links in trade feedback popup
2019-04-13 17:19:25 +02:00
Christoph Atteneder
60e23f8f24
Reduce min width of close button to prevent truncations
2019-04-13 17:07:43 +02:00
Devin Bileck
69df47d876
Update links based on https://github.com/bisq-network/bisq-website/pull/164
2019-04-12 17:11:03 -07:00
Manfred Karrer
8a3f42c572
Improve filter
2019-04-12 18:52:00 -05:00
Manfred Karrer
4269607065
Merge pull request #4 from ripcurlx/bump-version-number
...
Bump version number
2019-04-12 17:26:40 -05:00
Manfred Karrer
cc255c2733
Merge branch 'master' into rc_v1.0.0
2019-04-12 17:24:48 -05:00
Devin Bileck
3bc76cacaf
Add specific URL validation for proposal links
...
Since all proposals should be created in GitHub, and we have URL
redirects in place in case we switch platforms in the future, enforce
proposal links to utilize the specific URL redirect.
Resolves #2473
2019-04-12 12:05:47 -07:00
Manfred Karrer
813365df1e
Reduce initial delay for animation
2019-04-12 11:20:19 -05:00
Christoph Atteneder
2c106c74c6
Bump version number
2019-04-12 12:09:49 +02:00
Christoph Atteneder
2691ebab3f
Add slide out animation and delay initial slide in animation to increase the chance that it is seen (dependent on available processing power on startup)
2019-04-12 11:23:20 +02:00
Manfred Karrer
b5a0cc1ce2
Remove random string for dev testing
2019-04-11 16:25:13 -05:00
Manfred Karrer
57115e4f5a
Use priority queue for handling multiple popups
2019-04-11 16:22:58 -05:00
Manfred Karrer
55b8be2cbc
Add isHiddenProperty and displayOrderPriority
...
Needed to support a priority queue for adding multiple popups and then
execute the display ordered by priority.
2019-04-11 16:20:53 -05:00
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
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
dc239ddfe5
Save horizontal space and clean-up MainView
2019-04-11 15:47:12 +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