LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge branch 'master' into issue/298

Browse source
This commit is contained in:
Igor Gassmann 2018-01-29 11:26:28 -03:00
commit 18d7169516
5 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.bumpversion.cfg
View file

@ -1,10 +1,10 @@
[bumpversion]
current_version = 0.19.4
current_version = 0.20.0-rc5
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)-((?P<release>[a-z]+)(?P<candidate>\d+))?
serialize =
{major}.{minor}.{patch}{release}{candidate}
{major}.{minor}.{patch}-{release}{candidate}
{major}.{minor}.{patch}
[bumpversion:part:candidate]

40
CHANGELOG.md
View file

@ -30,17 +30,17 @@ Web UI version numbers should always match the corresponding version of LBRY App
## [0.19.4] - 2018-01-08
### Added
* Video state tracking in redux - developer only (#890)
* Video state tracking in redux - developer only ([#890](https://github.com/lbryio/lbry-app/pull/890))
### Changed
* Improved text content in app (#921)
* Improved text content in app ([#921](https://github.com/lbryio/lbry-app/pull/921))
### Fixed
* Right click works in the app again (#928)
* Icons are now the rights size (#925)
* Fixed tip sending error (#918)
* Right click works in the app again ([#928](https://github.com/lbryio/lbry-app/pull/928))
* Icons are now the rights size ([#925](https://github.com/lbryio/lbry-app/pull/925))
* Fixed tip sending error ([#918](https://github.com/lbryio/lbry-app/pull/918))
* Newly created channel immediately available for publishing
@ -48,51 +48,51 @@ Web UI version numbers should always match the corresponding version of LBRY App
## [0.19.3] - 2017-12-30
### Changed
* Improved internal code structuring by adding linting integration -- developers only (#891)
* Improved developer documentation (#910)
* Improved internal code structuring by adding linting integration -- developers only ([#891](https://github.com/lbryio/lbry-app/pull/891))
* Improved developer documentation ([#910](https://github.com/lbryio/lbry-app/pull/910))
### Removed
* Removed email verification reward (#914)
* Removed email verification reward ([#914](https://github.com/lbryio/lbry-app/pull/921))
### Fixed
* Added snackbar text in place where it was coming up blank (#902)
* Added snackbar text in place where it was coming up blank ([#902](https://github.com/lbryio/lbry-app/pull/902))
## [0.19.2] - 2017-12-22
### Added
* Added copy address button to the Wallet Address component on Send / Receive (#875)
* Link to creators’ channels on homepage (#869)
* Pause playing video when file is opened (#880)
* Add captcha to verification process (#897)
* Added copy address button to the Wallet Address component on Send / Receive ([#875](https://github.com/lbryio/lbry-app/pull/875))
* Link to creators’ channels on homepage ([#869](https://github.com/lbryio/lbry-app/pull/869))
* Pause playing video when file is opened ([#880](https://github.com/lbryio/lbry-app/pull/880))
* Add captcha to verification process ([#897](https://github.com/lbryio/lbry-app/pull/897))
### Changed
* Contributor documentation (#879)
* Contributor documentation ([#879](https://github.com/lbryio/lbry-app/pull/879))
### Fixed
* Linux app categorization (#877)
* Linux app categorization ([#877](https://github.com/lbryio/lbry-app/pull/877))
## [0.19.1] - 2017-12-13
### Added
* Added empty rewards message on overview page (https://github.com/lbryio/lbry-app/pull/847).
* Added empty rewards message on overview page ([#847](https://github.com/lbryio/lbry-app/pull/847))
### Changed
* Updated developer tools and restructured code (https://github.com/lbryio/lbry-app/pull/861)(https://github.com/lbryio/lbry-app/pull/862).
* Updated developer tools and restructured code ([#861](https://github.com/lbryio/lbry-app/pull/861) / [#862](https://github.com/lbryio/lbry-app/pull/862))
### Fixed
* Fixed typos (https://github.com/lbryio/lbry-app/pull/845)(https://github.com/lbryio/lbry-app/pull/846).
* Fixed theme-related error while running in development (https://github.com/lbryio/lbry-app/pull/865).
* Fixed build/signing error on Windows (https://github.com/lbryio/lbry-app/pull/864).
* Fixed typos ([#845](https://github.com/lbryio/lbry-app/pull/845) / [#846](https://github.com/lbryio/lbry-app/pull/846))
* Fixed theme-related error while running in development ([#865](https://github.com/lbryio/lbry-app/pull/865))
* Fixed build/signing error on Windows ([#864](https://github.com/lbryio/lbry-app/pull/864))

2
build/release.py
View file

@ -53,7 +53,7 @@ def main():
run_sanity_checks(repo, branch)
repo.assert_new_tag_is_absent()
is_rc = re.search('\drc\d+$', repo.new_version) is not None
is_rc = re.search('-rc\d+$', repo.new_version) is not None
# only have a release message for real releases, not for RCs
release_msg = '' if is_rc else repo.get_unreleased_changelog()

9
package.json
View file

@ -1,6 +1,6 @@
{
"name": "LBRY",
"version": "0.19.4-dev",
"version": "0.20.0-rc5",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"homepage": "https://lbry.io/",
"bugs": {
@ -22,10 +22,6 @@
"build": "yarn compile && electron-builder build",
"build:dir": "yarn build -- --dir -c.compression=store -c.mac.identity=null",
"postinstall": "electron-builder install-app-deps",
"postmerge": "yarnhook",
"postcheckout": "yarnhook",
"postrewrite": "yarnhook",
"precommit": "lint-staged",
"lint": "eslint 'src/**/*.{js,jsx}' --fix",
"format": "prettier 'src/**/*.{js,jsx,scss,json}' --write"
},
@ -109,8 +105,7 @@
"prettier": "^1.4.2",
"sass-loader": "^6.0.6",
"webpack": "^3.10.0",
"webpack-build-notifier": "^0.1.18",
"yarnhook": "^0.1.1"
"webpack-build-notifier": "^0.1.18"
},
"resolutions": {
"webpack/webpack-sources": "1.0.1"

4
src/renderer/redux/actions/user.js
View file

@ -102,10 +102,10 @@ export function doUserPhoneNew(phone, country_code) {
});
};
const failure = () => {
const failure = error => {
dispatch({
type: ACTIONS.USER_PHONE_NEW_FAILURE,
data: { error: 'An error occurred while processing this phone number.' },
data: { error },
});
};