Commit graph

104 commits

Author SHA1 Message Date
Igor Gassmann
4cab8055ca Merge origin/master into issue/763 2017-12-21 22:21:22 -03:00
Igor Gassmann
3982a56eaa Fix importing errors 2017-12-21 19:09:30 -03:00
Igor Gassmann
e103778b8a Prettyprint and autolint component files 2017-12-21 18:08:54 -03:00
Igor Gassmann
7cd25e777a Pretty print and lint non-component sources 2017-12-21 18:00:33 -03:00
Igor Gassmann
3b26f06210 Update extractLocals.js location 2017-12-20 12:37:19 -03:00
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
e839acda05
Merge pull request #881 from lbryio/update-analytics
Move analytics out of redux folder
2017-12-18 22:36:18 -08:00
Liam Cardenas
a9863b9082 Improve click analytics 2017-12-18 22:34:03 -08:00
Liam Cardenas
f407cd91a1 Move analytics out of redux folder 2017-12-18 21:53:01 -08:00
Travis Eden
a015a44c9d back to connecting selectors through index.js 2017-12-18 18:12:52 -05:00
Travis Eden
11ee87829d getting closer 2017-12-18 17:44:04 -05:00
Travis Eden
bd3aa1b349 Pushing for help with Redux selectors 2017-12-18 12:02:55 -05:00
Jeremy Kauffman
1d67f8df9c add copy button to wallet address, fixes #875 2017-12-15 15:46:50 -05:00
Sean Yesmunt
d1e0f9dd99
Merge pull request #869 from daovist/master
make channel names on discover page links
2017-12-14 16:15:13 -05:00
Travis Eden
ca527cc4c0 Make Discover page channel names into links 2017-12-14 16:12:04 -05:00
Igor Gassmann
93d63865be Fix locales path 2017-12-14 09:58:07 -03: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
Igor Gassmann
c220ae87e6 Rename electron processes' entry points to avoid confusion with main process. 2017-12-12 10:22:16 -03:00
liam
c4cccac632 Changed navigation analytic location 2017-12-11 22:18:25 -08:00
Liam Cardenas
348aed4b2f
Merge pull request #847 from lbryio/empty-rewards
show empty rewards message on overview page
2017-12-11 20:58:09 -08:00
Sean Yesmunt
38a5509ed0 use flow check and move flowtype-plugin to top level 2017-12-11 23:16:44 -05:00
Sean Yesmunt
ec2172fbae add flow 2017-12-11 18:50:22 -05:00
Sean Yesmunt
33e49d86cc show empty rewards message on overview page 2017-12-11 17:06:33 -05:00
LavRadis
47e3e848f9
Update view.jsx
Fixed capital C in "credits"
2017-12-11 21:33:11 +01:00
LavRadis
6ffa16a680
Update view.jsx
Fixed uniformity issues as described in: https://github.com/lbryio/lbry-app/issues/843
2017-12-11 21:12:07 +01:00
Jeremy Kauffman
fce25f8efc
Merge pull request #837 from lbryio/abandon-fix
Another fix for abandoning claims
2017-12-11 10:22:28 -05: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
206b2794e8 fix height for shapeshift tx info 2017-12-10 13:56:34 -05:00
Sean Yesmunt
4f82fd77af don't touch you 2017-12-10 13:33:14 -05:00
Sean Yesmunt
343961679d add link style to channel on subscriptions page 2017-12-10 13:32:05 -05:00
Sean Yesmunt
800cc4318a add @icon to subscribe button 2017-12-10 13:26:21 -05:00
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
cfb1f25c55 return null instead of empty string 2017-12-09 12:19:28 -05: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
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
Liam Cardenas
321051b6eb
Merge pull request #822 from lbryio/smartertimeoutmodal
Added more understandable error message
2017-12-08 08:37:45 -08:00
Igor Gassmann
916be2bfb6 Convert console log message into console error message 2017-12-07 17:05:46 -03:00
Igor Gassmann
153db7c3a5 Fix Flow config 2017-12-07 17:04:19 -03:00