Commit graph

273 commits

Author SHA1 Message Date
Liam Cardenas
4c93119f73
Merge pull request #880 from daovist/master
Pushing for help with Redux selectors
2017-12-19 12:09:59 -08:00
Travis Eden
7ccf6c0a92 feature complete 2017-12-19 14:41:00 -05:00
Travis Eden
92de445e1e fixed selector; pause working; still need to call action from child component 2017-12-19 13:20:53 -05:00
Travis Eden
2f409a6cbd getting closer... 2017-12-19 11:34:39 -05:00
Liam Cardenas
f407cd91a1 Move analytics out of redux folder 2017-12-18 21:53:01 -08:00
Travis Eden
bd3aa1b349 Pushing for help with Redux selectors 2017-12-18 12:02:55 -05:00
Igor Gassmann
a40aecfb68 Apply ESLint auto fixing 2017-12-13 18:36:30 -03:00
hackrush
2aa80ed796 Reworked abandon to not be depenedent on txn list 2017-12-13 14:55:14 +05:30
Igor Gassmann
93cb925169 Merge branch 'master' into issue/839 2017-12-12 17:49:50 -03:00
Igor Gassmann
0852ed033b Fix settings page throws error on development (https://github.com/lbryio/lbry-app/issues/839) 2017-12-12 15:48:23 -03:00
liam
c4cccac632 Changed navigation analytic location 2017-12-11 22:18:25 -08:00
hackrush
03678fb4f2 Typecasted nout to number 2017-12-11 12:51:18 +05:30
hackrush
c3582c2c09 Another fix for abandoning claims 2017-12-11 01:57:55 +05:30
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
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
Igor Gassmann
9a786f7d48 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	src/main/main.js
2017-12-08 14:37:06 -03:00
Igor Gassmann
87d294a151 Merge branch 'master' into restructuring 2017-12-07 14:10:43 -03:00
Igor Gassmann
eaa5c212d2 Merge branch 'master' into restructuring 2017-12-07 12:24:00 -03:00
Igor Gassmann
dbb28dd625 Fix electron-webpack related errors 2017-12-07 09:52:22 -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
Igor Gassmann
6e282ee88f Move .js files into root of renderer dir 2017-12-04 17:12:59 -03:00