Merge branch 'master' into daemon_err

This commit is contained in:
Baltazar Gomez 2018-02-28 16:15:17 -07:00 committed by GitHub
commit 34b5765a23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions

View file

@ -10,6 +10,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
### Added ### Added
* Save app state when closing to tray ([#968](https://github.com/lbryio/lbry-app/issues/968)) * Save app state when closing to tray ([#968](https://github.com/lbryio/lbry-app/issues/968))
* Added startup-troubleshooting FAQ URL to daemon error ([#1039](https://github.com/lbryio/lbry-app/pull/1039)) * Added startup-troubleshooting FAQ URL to daemon error ([#1039](https://github.com/lbryio/lbry-app/pull/1039))
* Add Rewards FAQ to LBRY app ([#1041](https://github.com/lbryio/lbry-app/pull/1041))
* *
### Changed ### Changed
@ -20,7 +21,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
* Fixed sort by date of published content ([#986](https://github.com/lbryio/lbry-app/issues/986)) * Fixed sort by date of published content ([#986](https://github.com/lbryio/lbry-app/issues/986))
* Fix night mode start time, set to 9PM (#1050) * Fix night mode start time, set to 9PM (#1050)
* Fix night mode start time, set to 9PM ([#1050](https://github.com/lbryio/lbry-app/issues/1050)) * Fix night mode start time, set to 9PM ([#1050](https://github.com/lbryio/lbry-app/issues/1050))
* * Disable drag and drop of files into the app ([#1045](https://github.com/lbryio/lbry-app/pull/1045))
### Deprecated ### Deprecated
* *

View file

@ -14,6 +14,10 @@ const RewardSummary = (props: Props) => {
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h3>{__('Rewards')}</h3> <h3>{__('Rewards')}</h3>
<p className="help">
{__('Read our')}{' '}
<Link href="https://lbry.io/faq/rewards">{__('FAQ')}</Link>{' '}{__('to learn more about LBRY Rewards')}.
</p>
</div> </div>
<div className="card__content"> <div className="card__content">
{unclaimedRewardAmount > 0 ? ( {unclaimedRewardAmount > 0 ? (

View file

@ -62,6 +62,12 @@ ipcRenderer.on('window-is-focused', () => {
dock.setBadge(''); dock.setBadge('');
}); });
document.addEventListener('dragover', event => {
event.preventDefault();
})
document.addEventListener('drop', event => {
event.preventDefault();
});
document.addEventListener('click', event => { document.addEventListener('click', event => {
let { target } = event; let { target } = event;
while (target && target !== document) { while (target && target !== document) {