Commit graph

709 commits

Author SHA1 Message Date
Thomas Zarebczan
34e971cd7f
remove check for balance during publish
This is being correctly done on the daemon now and the app shows appropriate error
2018-03-15 02:46:50 -04:00
Thomas Zarebczan
9bcb75e234
Add checks for 0 and exact balance
Otherwise, you get an ugly "internal error"
2018-03-15 02:44:44 -04:00
Igor Gassmann
40ab6e1b38
chore: change building target to .deb for Linux (#1103)
It was decided to rollback to Debian builds for Linux due to how inconvenient it is to launch an AppImage build.
2018-03-14 20:22:54 -04:00
liamcardenas
e634bd8679 Fix sort 2018-03-13 22:33:43 -07:00
Jeremy Kauffman
de922445a6
remove youtube sync 2018-03-12 16:24:50 -04:00
Liam Cardenas
15b792211c
Update subscriptions.js 2018-03-11 22:34:16 -07:00
liamcardenas
a4faab5e86 Refactor and reformat 2018-03-08 23:46:16 -08:00
liamcardenas
c8cad17f97 Fixed sort after abandoning claim 2018-03-08 23:32:55 -08:00
liamcardenas
fa91f3cea5 Fix abandon claim issue 2018-03-08 23:10:37 -08:00
liamcardenas
0c833a727e Formatted whole app 2018-03-08 23:06:15 -08:00
liamcardenas
9584848077 Remove channels from published page 2018-03-08 23:03:30 -08:00
liamcardenas
abdc15989c Fix search 2018-03-08 22:46:03 -08:00
liamcardenas
bd785502f4 Fix sorting on downloads/published pages 2018-03-08 22:25:55 -08:00
liamcardenas
c199a24986 Catch undefined reference to anonymous upload names 2018-03-08 21:27:06 -08:00
liamcardenas
1cb122c839 Fix claim name undefined in buildURI bug 2018-03-08 17:56:48 -08:00
liamcardenas
cbe05c3bcc Merge branch 'master' into daemon19 2018-03-08 10:20:28 -08:00
liamcardenas
42b45cea7d Added production analytics key 2018-03-07 21:44:03 -08:00
Liam Cardenas
183c4be58b
Merge pull request #1074 from lbryio/improve-privacy
Improve privacy
2018-03-07 21:24:29 -08:00
liamcardenas
06c7572c8e Fixed formatting issues 2018-03-07 21:07:42 -08:00
liamcardenas
ac0980f75d Merge branch 'master' into subscribe-notify 2018-03-07 20:39:57 -08:00
liamcardenas
5d896124f4 Improved messaging around analytics 2018-03-07 20:21:33 -08:00
liamcardenas
a8ce782894 Do not log to api when dianostic sharing is off 2018-03-07 19:56:58 -08:00
Igor Gassmann
b9f4d7b307
chore: migrate to AppImage and update publish workflow (#1010)
The app now uses AppImage instead of .deb files for Linux. Thanks to this change, the app supports now auto-updates on Linux too.

The publishing workflow has been updated. It uses now the publishing mechanisms offered by electron-builder.
2018-03-07 18:03:45 -05:00
liamcardenas
174285aea8 Reduce unnecessary api calls 2018-03-07 12:02:53 -08:00
liamcardenas
3f8f25dc43 let --> const 2018-03-07 11:41:14 -08:00
liamcardenas
1e1c494367 Re-ran prettier 2018-03-07 11:19:45 -08:00
liamcardenas
6e293fd04b Fixed weird issue with flow throwing fallacious error 2018-03-06 01:37:53 -08:00
liamcardenas
98c9dfb68e Formatted code with prettier 2018-03-06 00:36:04 -08:00
liamcardenas
2c6f2d52bf Fix issues with viewing most recent and uninitiated latest videos 2018-03-06 00:32:58 -08:00
liamcardenas
c3dd7f3449 Added notifications and downloading upon detecting to subscription items 2018-03-05 23:44:36 -08:00
liamcardenas
7296800ce0 Add most recent latest video to subscription state 2018-03-05 16:28:11 -08:00
Baltazar Gomez
df1f67ca24
Merge branch 'master' into export-csv 2018-02-28 16:16:53 -07:00
Sean Yesmunt
e0bdc56346
Merge pull request #1054 from ykris45/patch-5
[#1029] Added Rewards FAQ to LBRY App
2018-02-28 14:48:40 -08:00
YULIUS KURNIAWAN KRISTIANTO
9011996d69
[FIX #988] Disable drag and drop 2018-03-01 05:03:36 +07:00
YULIUS KURNIAWAN KRISTIANTO
3e9dfddf78
Added FAQ to reward summary 2018-02-28 11:36:49 +07:00
Baltazar Gomez
3505e439b8
Merge branch 'master' into export-csv 2018-02-27 19:18:39 -07:00
Sean Yesmunt
96d77f9bc8
Merge branch 'master' into fix/986-published-claims-out-of-order 2018-02-26 20:50:16 -08:00
Thomas Zarebczan
5183587445
Fix night mode start time
21:00 = 9PM
2018-02-26 20:22:25 -05:00
btzr-io
aa8a7f4fe3 apply filters to exported transactions 2018-02-25 21:24:28 -07:00
Baltazar Gomez
5ca2e74808
remove type from component props 2018-02-25 21:06:00 -07:00
Igor Gassmann
07655ebd1b Fix #1012 2018-02-25 22:00:12 -05:00
Baltazar Gomez
43a60fd19a
remove unused code 2018-02-25 14:53:17 -07:00
Igor Gassmann
019926059e Fix #754 2018-02-25 15:18:03 -05:00
Igor Gassmann
9ad6676a4f Fix ESLint problems other than type validation 2018-02-25 15:16:32 -05:00
Igor Gassmann
a7d5fc6503 Fix macOS badge 2018-02-24 19:26:49 -05:00
btzr-io
006c2f01fa update component 2018-02-23 19:12:51 -07:00
btzr-io
45209c5a91 remove debug 2018-02-23 18:20:44 -07:00
btzr-io
921f89b076 beautify JSON output 2018-02-23 18:07:31 -07:00
btzr-io
2cf94ca8af fix typo 2018-02-23 17:58:59 -07:00
btzr-io
53920b3472 implement FileExporter in transactionList
Ability to export wallet transactions to CSV format #976
2018-02-23 17:57:37 -07:00
btzr-io
f29a947c09 create component FileExporter 2018-02-23 17:24:00 -07:00
btzr-io
80f0b170d8 rewrite parseData.js for general purpose 2018-02-23 14:25:25 -07:00
Baltazar Gomez
05423fb8ff
add constant -> export transactions 2018-02-22 22:45:53 -07:00
Baltazar Gomez
89e7a8fcf9
create util/parseTransactions.js
add parse functions for json and csv
2018-02-22 22:39:56 -07:00
Liam Cardenas
a8eb8e7372
Merge pull request #1006 from lbryio/dark-mode-fix
disabled auto dark mode if dark mode is selected
2018-02-22 13:48:08 -08:00
Liam Cardenas
26c62fc326 Update claim_name to cammel case in lbryuri 2018-02-21 11:10:36 -08:00
Liam Cardenas
4aee6d5f56 Fix downloads page 2018-02-21 11:01:43 -08:00
Liam Cardenas
3863c517fd Upgrade daemon to 0.19.0rc35 2018-02-20 21:41:30 -08:00
Liam Cardenas
c765ebd28f Diagnostic checkbox analytics integration 2018-02-16 01:16:50 -08:00
Liam Cardenas
a81924626d Revamped analytics 2018-02-16 00:47:52 -08:00
Jeremy Curcio
4b2a4d2a10 Change title of date sort options 2018-02-15 12:55:25 -05:00
Jeremy Curcio
34b6ef674b Remove a couple more debugs 2018-02-15 10:49:31 -05:00
Jeremy Curcio
3e6757a35d Remove debug 2018-02-15 10:23:03 -05:00
Jeremy Curcio
96e4163c61 Fix sort by date 2018-02-15 10:21:35 -05:00
Sean Yesmunt
e42c7aba83 disabled auto dark mode if dark mode is selected 2018-02-08 11:28:46 -08:00
miikkatu
d8b8133ecc Enable play button after clicking download 2018-02-05 08:02:14 +02:00
Alex Grintsvayg
d537334eeb designate yt sync type 2018-01-31 16:11:23 -05:00
Liam Cardenas
bc818f5383 Fix dark mode bug -- no longer always night 2018-01-29 15:19:46 -08:00
Liam Cardenas
47e4f0029a Change learn more to read more 2018-01-29 15:02:13 -08:00
Liam Cardenas
f517455bcb Added link to phone FAQ 2018-01-29 11:22:40 -08:00
Liam Cardenas
fa68ffee59 Patch phone verification for more informative error messages 2018-01-27 16:25:22 -08:00
Alex Liebowitz
e98231fed3 Don't show auto-update dialog after decline on Win/Mac 2018-01-24 17:37:50 -05:00
alexliebowitz
f302a0f92a
Merge branch 'master' into auto-update 2018-01-23 19:59:57 -05:00
Alex Liebowitz
8c0bf32fe5 Small changes to prepare auto update for release 2018-01-23 19:46:49 -05:00
Alex Liebowitz
daca49dc15 Add release notes to auto update dialogs 2018-01-23 19:39:17 -05:00
Alex Liebowitz
fbc143aaaf Reword "Upgrade on Restart" to "Upgrade on Close" 2018-01-23 19:22:02 -05:00
Alex Liebowitz
483809be1b Merge remote-tracking branch 'origin/master' into auto-update 2018-01-23 10:35:15 -05:00
Liam Cardenas
f47108c4c0
Merge pull request #946 from lbryio/twilio
Phone verification
2018-01-22 15:49:35 -08:00
Liam Cardenas
ca9f67b240 Added reset button on phone verification 2018-01-22 15:26:34 -08:00
Liam Cardenas
23261d0759 Removed emojis on Windows and Linux 2018-01-22 14:46:14 -08:00
Liam Cardenas
bdc49691f0 Remove unused reducers and action types 2018-01-22 14:06:07 -08:00
Liam Cardenas
c975454501
Merge pull request #957 from lbryio/issue/952
Refactor lbryuri.js into separate named exports
2018-01-22 10:25:03 -08:00
Liam Cardenas
f67e12003f
Merge pull request #950 from Arrowana/automatic_dark_mode
Automatic dark mode
2018-01-22 10:16:36 -08:00
Liam Cardenas
e0de34d433 Readded email collection modal and trigger at startup 2018-01-21 23:27:29 -08:00
Liam Cardenas
9e2d82eac8 Split userField... into userEmail... and userPhone... 2018-01-21 23:09:11 -08:00
Liam Cardenas
99bdaa608e Small fixes to country code select 2018-01-21 22:30:20 -08:00
Liam Cardenas
705a74e2ae Functioning select phone input side by side with supposed emoji flag support 2018-01-21 22:17:06 -08:00
Liam Cardenas
3ac913a28e Add new phone select style 2018-01-21 11:29:48 -08:00
Arrowana
a5dce3e77a isNight() to arrow function and update isNight every 10 minutes, default to false 2018-01-20 08:37:22 +11:00
Igor Gassmann
1da4d05986 Refactor lbryuri.js into separate named exports 2018-01-19 12:12:28 -03:00
Liam Cardenas
a34a61bce8 Add custom country code 2018-01-17 21:09:08 -08:00
Liam Cardenas
faa2753e35 Change to updated urls for phone verification 2018-01-17 18:22:52 -08:00
Igor Gassmann
fd64ae58fe Refactor main process 2018-01-17 23:13:08 -03:00
Alex Liebowitz
853bf2cfe7 Make video pause when you hit the "Upgrade Now" button on Mac/Win 2018-01-17 07:10:45 -05:00
Alex Liebowitz
863f7dc23b Make new dialogs behave correctly when video is playing 2018-01-17 06:10:11 -05:00
Alex Liebowitz
f244f9035b Add back "Upgrade App" button on Mac/Win with different dialog on click 2018-01-17 06:09:02 -05:00
Arrowana
6f77106ffa is night interval to 60 seconds and shorten label message 2018-01-17 20:55:25 +11:00
Alex Liebowitz
0c8ba50207 Update Auto Update-related copy 2018-01-15 18:38:35 -05:00
Liam Cardenas
fa7d265cc0 Add error messages in phone verification modal 2018-01-15 06:30:10 -08:00
Liam Cardenas
247859a1dd Remove console.logs 2018-01-15 05:35:15 -08:00
Liam Cardenas
4409315353 Added phone verification functionality 2018-01-15 05:32:01 -08:00
Arrowana
4795901e12 improve and clean 2018-01-15 20:09:40 +11:00
Arrowana
8eb7f58988 add basic feature 2018-01-14 20:14:15 +11:00
Alex Liebowitz
3959d4aeee Make app restart after user approves update
Forgot to call quitAndInstall(). If you don't, it will still install
the update, but won't restart.
2018-01-12 00:30:23 -05:00
Alex Liebowitz
b03623eb68 Convert Windows update alert dialog to native dialog in main process
Maybe a bit less polished, but I couldn't find a way to prevent the
main window from closing that works on the current version of Electron,
and in general it was starting to get too complicated.
2018-01-12 00:30:23 -05:00
Alex Liebowitz
b08d96da1e Add alert before close after update is declined on Windows 2018-01-12 00:30:23 -05:00
Alex Liebowitz
bc15d24d66 Add ability to decline updates 2018-01-12 00:30:23 -05:00
Alex Liebowitz
3957bf2afc Finish core UI for auto update 2018-01-12 00:30:23 -05:00
Alex Liebowitz
24ced8ede7 More core UI for auto-update
We keep the old dialog flow on Linux, and on Windows and Mac we show a
single dialog when the file is downloaded.
2018-01-12 00:30:23 -05:00
Alex Liebowitz
5fff24b0fb Add "auto update downloaded" modal 2018-01-12 00:30:23 -05:00
Liam Cardenas
b9b7af2bbd Renamed userEmail... to userField... 2018-01-10 22:16:03 -08:00
Liam Cardenas
c52c75758b Rename modalEmailCollection to modalPhoneCollection 2018-01-10 22:00:51 -08:00
Liam Cardenas
c0e9b92a3a Added phone verification option 2018-01-10 21:41:51 -08:00
Sean Yesmunt
2b9561f0c0
Revert "Redesign groundwork, homepage, search" 2018-01-08 17:15:44 -08:00
Sean Yesmunt
0e22696e20 fix icon import 2018-01-08 13:24:38 -08:00
Sean Yesmunt
c93f459113 update search action names to proper naming conventions 2018-01-08 13:10:15 -08:00
Sean Yesmunt
92482ee916 cleanup 2018-01-08 13:10:14 -08:00
Sean Yesmunt
7d492ae1fc Redesign groundwork (home/search) 2018-01-08 13:10:14 -08:00
Igor Gassmann
094c3b8a9f Merge branch 'master' into issue/397 2018-01-08 00:51:34 -03:00
Travis Eden
d3047a741a remove ENV statement 2018-01-05 19:04:12 -05:00
Travis Eden
7bc2f888f1 resolve merge conflicts 2018-01-05 18:57:24 -05:00
Liam Cardenas
5294446987
Merge pull request #928 from lbryio/issue/927
Fix right click bug
2018-01-05 15:36:40 -08:00
Travis Eden
5765c6c1ee remove comment 2018-01-05 18:36:03 -05:00
Igor Gassmann
60772d0a74 Fix right click bug 2018-01-05 19:36:10 -03:00
Travis Eden
566fb2e0b5 rename id param to claimId 2018-01-05 15:14:12 -05:00
Travis Eden
0cfc9ab32c remove old positions variable 2018-01-05 14:31:58 -05:00
Travis Eden
504c5469e3 safely type params in position selector 2018-01-05 14:29:25 -05:00
Travis Eden
345badb049 store position by outpoint 2018-01-05 14:27:58 -05:00
Sean Yesmunt
e6bd648116 use one icon component and add padded prop 2018-01-04 17:05:29 -05:00
Thomas Zarebczan
535730eede
update wunderbar text
change "movies" to "videos" (more generic)
2018-01-02 19:47:48 -05:00
Igor Gassmann
8203594989
Merge pull request #918 from lbryio/issue/917
Fix cannot send tip, transaction failed (#917)
2018-01-02 18:40:40 -03:00
Igor Gassmann
0e77be0ab5 HOTFIX: Fix creation of channel 2018-01-02 16:54:57 -03:00
Igor Gassmann
4e97c105c4 Fix cannot send tip, transaction failed (#917) 2018-01-02 09:07:28 -03:00
Liam Cardenas
c894567eb9
Merge pull request #911 from lbryio/issue/763
Update documentation for DevTools and fix some ESLint warnings
2018-01-01 21:41:40 -08:00
Liam Cardenas
410996aa81 Disabled dependence on confirm email reward 2017-12-30 12:59:37 -08:00
Igor Gassmann
ee9575dc37 Merge branch 'master' into issue/763 2017-12-30 15:55:03 -03:00
Liam Cardenas
f1df3dd013
Merge pull request #914 from lbryio/remove-email-reward
Removed email verification reward messaging
2017-12-29 16:42:53 -08:00
Liam Cardenas
5a5dcb15c0 Fixed error caused by using deprecated selector 2017-12-29 16:23:46 -08:00
Liam Cardenas
a5dc55241c Removed email verification reward messaging 2017-12-29 15:43:51 -08:00
Travis Eden
ecd2207314 remove log in video view 2017-12-29 15:47:11 -05:00
Travis Eden
bfe5fe851a remove logging 2017-12-29 15:45:32 -05:00
Travis Eden
a8988d9e05 remove video files; save video claimId rather than URI 2017-12-29 11:07:03 -05:00
Igor Gassmann
c59293cf03 Fix default parameter for arrow functions 2017-12-28 14:56:55 -03:00
Igor Gassmann
0a94082983 Convert anonymous functions to arrow functions 2017-12-27 20:48:11 -03:00
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