Commit graph

2905 commits

Author SHA1 Message Date
Sean Yesmunt 2dcabc0e7d don't use href for lbry link 2017-12-09 14:07:17 -05:00
Jeremy Kauffman 9ca138e0f5 fix reward in first reward message 2017-12-09 13:00:19 -05:00
Sean Yesmunt d3ec4b7128
Merge pull request #831 from lbryio/subscription-button
return null instead of empty string
2017-12-09 12:26:34 -05:00
Sean Yesmunt cfb1f25c55 return null instead of empty string 2017-12-09 12:19:28 -05:00
Jeremy Kauffman e6a6e7b250
Merge pull request #830 from lbryio/fix-windows-build
Fix windows build
2017-12-09 10:09:46 -05:00
Igor Gassmann c478030481 Remove superfluous renaming 2017-12-09 10:37:42 -03:00
Igor Gassmann 8f37e12819 Move flow webpack plugin to only development 2017-12-09 10:23:40 -03:00
Sean Yesmunt 1022a47741 update link 2017-12-08 18:20:30 -05:00
Sean Yesmunt 363decaced fix markdown links 2017-12-08 18:19:43 -05:00
Sean Yesmunt 97527cf170 add links to issues for changelog 2017-12-08 18:15:00 -05:00
Sean Yesmunt abc20e6fd2 update issue links to changelog 2017-12-08 17:41:31 -05:00
Jeremy Kauffman 3ca45a531f update changelog 2017-12-08 17:31:33 -05:00
Sean Yesmunt 656eabdf5c Bump version: 0.18.2 → 0.19.0rc1 2017-12-08 17:09:11 -05:00
Liam Cardenas f5daf70d41
Update CHANGELOG.md 2017-12-08 13:56:45 -08:00
Liam Cardenas 10e4e24bd8
Merge pull request #811 from lbryio/subscriptions
Subscriptions
2017-12-08 13:51:05 -08:00
Sean Yesmunt ffd6bed4d4 update .gitignore 2017-12-08 16:19:33 -05:00
Sean Yesmunt 9b9ac580ee simplify logic inside of subscription react component 2017-12-08 16:09:22 -05:00
Sean Yesmunt 38de5edc90 use common subscribeButton component 2017-12-08 16:09:22 -05:00
Sean Yesmunt a7fe02ea98 persisting subscriptions 2017-12-08 16:09:22 -05:00
Jeremy Kauffman f1f3d311e9 Merge branch 'first_run_email' 2017-12-08 15:13:41 -05:00
Jeremy Kauffman 8c403f640c new first run flow and re-org of wallet area
add changelog

add external service option to get credits page

remove testing code

fix user has existing email and grammar/typos
2017-12-08 15:13:20 -05:00
Sean Yesmunt 204fd60f95
Merge pull request #824 from lbryio/restructuring
Support Hot Module Replacement
2017-12-08 14:05:59 -05:00
Igor Gassmann 9a786f7d48 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	src/main/main.js
2017-12-08 14:37:06 -03:00
Liam Cardenas 321051b6eb
Merge pull request #822 from lbryio/smartertimeoutmodal
Added more understandable error message
2017-12-08 08:37:45 -08:00
Jeremy Kauffman dd312794d8
Merge pull request #827 from lbryio/useragent
Set app-wide user agent
2017-12-08 10:36:17 -05:00
Igor Gassmann 2f498fcbab Fix .dmg background 2017-12-07 22:42:35 -03:00
Igor Gassmann 916be2bfb6 Convert console log message into console error message 2017-12-07 17:05:46 -03:00
Igor Gassmann 70722d200a Correct typo 2017-12-07 17:04:34 -03:00
Igor Gassmann 153db7c3a5 Fix Flow config 2017-12-07 17:04:19 -03:00
Liam Cardenas 6adece2496 Set app-wide user agent 2017-12-07 12:04:08 -08:00
Igor Gassmann 87d294a151 Merge branch 'master' into restructuring 2017-12-07 14:10:43 -03:00
Igor Gassmann 5ade6fba41 Update docs 2017-12-07 12:40:49 -03:00
Igor Gassmann eaa5c212d2 Merge branch 'master' into restructuring 2017-12-07 12:24:00 -03:00
Igor Gassmann 079f32728a Fix Windows build 2017-12-07 12:06:20 -03:00
Igor Gassmann 30970f8d13 Add extract-langs to compile 2017-12-07 10:38:23 -03:00
Igor Gassmann dbb28dd625 Fix electron-webpack related errors 2017-12-07 09:52:22 -03:00
Igor Gassmann 38daa3d172 Fix Mac .dmg file location 2017-12-06 18:43:11 -03:00
Igor Gassmann 0b81d6e96c Update electron-builder 2017-12-06 18:24:01 -03:00
Igor Gassmann df01c361df Fix __static paths for production. Paths aren't correctly resolved on development 2017-12-06 18:21:57 -03:00
Liam Cardenas 6b3685ba09 Added more understandable error message 2017-12-06 12:38:07 -08:00
hackrush 8f83337640
Merge pull request #815 from lbryio/channel-name-page
Highlight channel names in pages.
2017-12-07 00:39:32 +05:30
hackrush 0b3e9f1179 Channel names in pages appear highlighted
Used classnames library for determining classname

changes
2017-12-06 23:51:05 +05:30
Igor Gassmann b07e16c913 Fix electron-webpack related errors 2017-12-06 13:32:21 -03:00
Liam Cardenas 6593de46c1
Merge pull request #819 from lbryio/amplitude
Amplitude
2017-12-05 21:03:51 -08:00
Liam Cardenas 920a54c810 Added comment to indicate API key 2017-12-05 17:16:06 -08:00
Liam Cardenas 4a31ed229b Merge branch 'master' into amplitude 2017-12-05 17:12:47 -08:00
Sean Yesmunt 17b38d687b update changelog 2017-12-05 19:41:24 -05:00
Sean Yesmunt 6108141605
Merge pull request #652 from seanyesmunt/shapeshift
ShapeShift integration
2017-12-05 19:33:40 -05:00
Liam Cardenas f80a13e8ea Log all clicks 2017-12-05 16:16:54 -08:00
Liam Cardenas 1479b9e4af Added user ID logging 2017-12-05 13:05:59 -08:00