Commit graph

365 commits

Author SHA1 Message Date
Igor Gassmann
b8b892e3c2 Merge branch 'master' into issue/763 2017-12-27 17:20:11 -03:00
Thomas Zarebczan
1984d654e6
fix verified email snackbar, take 2
the API call uses verified_email, reverting and fixing the message type.
2017-12-27 13:52:41 -05:00
Igor Gassmann
cd63cfc527 Merge branch 'master' into issue/763 2017-12-27 14:40:19 -03:00
Igor Gassmann
f3c92acacf Fix fetching daemon settings bug 2017-12-26 17:13:05 -03:00
Igor Gassmann
47bdc6cbef Merge branch 'master' into issue/763 2017-12-26 10:26:15 -03:00
Thomas Zarebczan
6c22d73a0c
fix snackbar text 2017-12-22 23:37:59 -05:00
Liam Cardenas
5948124586 Added recaptcha compatibility 2017-12-22 18:09:06 -08:00
Travis Eden
61b8e8ee71 remove arguments from doPause call in Unmount 2017-12-22 18:18:00 -05:00
Travis Eden
11a5f9d1d5 use timeupdate instead of pause to update video state 2017-12-22 18:14:54 -05:00
Travis Eden
7d29c4b91d apply starting position directly (no setTimeout) 2017-12-21 20:22:40 -05:00
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
Travis Eden
6c4a4e593c track and manage video state 2017-12-20 18:38:11 -05: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
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
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
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
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
hackrush
e0d3cb431b Claim page abandon(regression) fixed 2017-12-05 20:15:35 +05:30
Liam Cardenas
080dd1c05d Fixed loading screen problem 2017-12-05 00:31:34 -08:00
Liam Cardenas
62889a9f8a Added navigation logging 2017-12-05 00:04:00 -08:00
Igor Gassmann
b83679fa4a Migrate to index.html to generated one by electron-webpack 2017-12-04 22:08:08 -03:00
Sean Yesmunt
6f4e35ac90 fix flow usage for continousFetch 2017-12-04 18:32:11 -05:00
Igor Gassmann
37375dfaba Remove old ESLint configuration file 2017-12-04 17:33:54 -03:00
Igor Gassmann
f639a46c93 Delete legacy README.md 2017-12-04 17:14:42 -03:00
Igor Gassmann
2b51a5e259 Delete old webpack configuration files 2017-12-04 17:14:17 -03:00
Igor Gassmann
6e282ee88f Move .js files into root of renderer dir 2017-12-04 17:12:59 -03:00
Igor Gassmann
d4466703c4 Resolve package.json path 2017-12-04 17:09:40 -03:00
Igor Gassmann
496acd0a3c Fix file paths for static resources 2017-12-04 17:06:56 -03:00
Igor Gassmann
9cbb413264 Move static resources into /static/ dir 2017-12-04 16:53:30 -03:00
Sean Yesmunt
d4b4b78e10 show shapeshift rate 2017-12-04 12:18:34 -05:00
Sean Yesmunt
d043233094 use common styles 2017-12-04 11:49:10 -05:00
Sean Yesmunt
a7e788fd16 remove unused style 2017-12-03 22:41:15 -05:00
Sean Yesmunt
6aefb0653d add faq link 2017-12-03 22:31:35 -05:00
Sean Yesmunt
c000ad1bc8 use flow 2017-12-03 22:27:55 -05:00
Sean Yesmunt
e7a7754a4f shapeshift initial commit 2017-11-30 22:52:58 -05:00
Sean Yesmunt
5eedaeb342
Merge pull request #805 from lbryio/flowtype
Added missing file
2017-11-30 22:52:14 -05:00
Liam Cardenas
f9018aec60 Added missing file 2017-11-30 19:29:22 -08:00
Liam Cardenas
2e506ef59d
Merge pull request #778 from lbryio/flowtype
Added Flow Typing
2017-11-30 16:03:47 -08:00
Liam Cardenas
dacb2458bf Added flow-typed to allow electron and other packages to have type definitions 2017-11-30 09:55:08 -08:00
Liam Cardenas
1fb55c4a93 Fixed absolute path issue in flow 2017-11-30 09:47:05 -08:00
Liam Cardenas
15539aa616 Incorporated code review changes 2017-11-29 22:53:23 -08:00
Thomas Zarebczan
4ce4da37b9
add referral message type
Also fixed many downloads text
2017-11-29 22:04:07 -05:00
Sean Yesmunt
2af758cee2
Merge pull request #802 from lbryio/typo
need to use static with propTypes
2017-11-29 20:25:44 -05:00
Sean Yesmunt
f86690c81a need to use static 2017-11-29 20:13:36 -05:00
Liam Cardenas
a563cba9da Added appState type to reducer 2017-11-29 14:45:49 -08:00
Liam Cardenas
a0e1b7b88e Removed incorrect item storage and unnecessary mixed types 2017-11-29 14:43:27 -08:00
Sean Yesmunt
776aadc369
Merge pull request #794 from lbryio/insufficient-funds-create-channel
Check the users balance before trying to publish/create a channel
2017-11-29 15:42:49 -05:00
Liam Cardenas
74de4aac3d Moved flow files out of deprecated ui directory 2017-11-29 12:06:18 -08:00
Sean Yesmunt
e70a56c0d2 fix typo 2017-11-29 14:53:24 -05:00
Sean Yesmunt
25fb5737b9 update deps so no react@16 peer dependencie warnings 2017-11-29 11:16:11 -05:00
Liam Cardenas
1a97eed79f Merge branch 'master' into flowtype 2017-11-29 01:25:34 -08:00
Sean Yesmunt
87ef004941 update to react@16 2017-11-29 00:03:53 -05:00
Igor Gassmann
683f3e9f07 Convert project into a one package.json file structure 2017-11-29 01:43:49 -03:00
Sean Yesmunt
c3eaa8c34d check users balance before creating channel/publishing 2017-11-28 23:26:07 -05:00
Igor Gassmann
1d9a5d90cf Fix merge conflicts 2017-11-27 21:01:33 -03:00
Igor Gassmann
3032736026 attempt to fix restructuring branch 2017-11-27 18:48:45 -05:00
Jeremy Kauffman
3a0ffb312a
Revert "Update file structure to follow electron-webpack guidelines" 2017-11-24 16:36:10 -05:00
Igor Gassmann
dbf0fae552 Update file structure to follow electron-webpack guidelines 2017-11-24 11:31:05 -03:00