Commit graph

153 commits

Author SHA1 Message Date
Jeremy Kauffman ac34faea80 Merge remote-tracking branch 'origin/master' into rewards3 2017-07-24 18:09:37 -04:00
6ea86b96 b99d58c3f9 Track downloading files by outpoint 2017-07-22 10:54:15 +07:00
Jeremy Kauffman c67fe5aae6 update to master 2017-07-21 17:45:37 -04:00
6ea86b96 cad678417e Add access token to help page 2017-07-21 17:29:01 -04:00
Jeremy Kauffman ed2cbc0555 minor cleanup, update api field name 2017-07-20 15:03:01 -04:00
Jeremy Kauffman c2a611f11c more user flow improvements, possibly ready 2017-07-19 21:07:17 -04:00
Jeremy Kauffman 38fd451e72 add startup daemon version check, refactor daemon versioning to package.json 2017-07-19 17:05:08 -04:00
Jeremy Kauffman d7fdaa08e2 more progress 2017-07-19 11:09:40 -04:00
6ea86b96 a7c4df9393 Revert "Merge pull request #331 from akinwale/issue312"
This reverts commit a83b695602, reversing
changes made to 1d01dc8303.
2017-07-19 15:36:22 +07:00
Jeremy Kauffman ab9150fb27 end-to-end barebones 2017-07-18 19:00:13 -04:00
Jeremy Kauffman a83b695602 Merge pull request #331 from akinwale/issue312
Issue #312 home page scroll position on back navigation
2017-07-18 14:32:53 -04:00
Jeremy Kauffman 16abedbf3a moderate progress 2017-07-16 12:29:46 -04:00
Jeremy Kauffman b3de4ceee9 beginnings of new flow 2017-07-15 15:25:39 -04:00
Akinwale Ariwodola 187ac405fe Modified to use redux store and return to previous scroll position only upon back navigation 2017-07-13 16:32:32 +01:00
6ea86b96 d1eb8f5de3 Stop old file infos from updated claims appearing in downloaded file list 2017-07-13 13:52:48 +07:00
6ea86b96 470f61da9d commit little and often fail 2017-07-13 13:52:47 +07:00
6ea86b96 f3fdf5e841 Rename pending to fetching in selectors to avoid confusion 2017-07-13 13:52:47 +07:00
6ea86b96 35a5cb0918 Fix file info selector 2017-07-13 13:52:47 +07:00
6ea86b96 7c3953ac51 Fix selectClaimForUriIsMine 2017-07-13 13:52:47 +07:00
6ea86b96 8325828f6e Progress towards working publish 2017-07-13 13:52:47 +07:00
6ea86b96 e01868d29b Move claim lookup on publish page into redux 2017-07-13 13:52:47 +07:00
6ea86b96 284ab8a01a Move fetching my channels into redux 2017-07-13 13:52:47 +07:00
Fillerino 2ca08f92b5 Fixing some stuff... 2017-07-07 15:26:03 +02:00
Fillerino d733a7b1b4 Trying to get redux stuff to work... 2017-07-07 15:15:45 +02:00
6ea86b96 91359c2966 Add option to abandon claim when deleting published file 2017-07-02 13:48:53 -04:00
6ea86b96 500fdd282c
Move client settings into redux 2017-06-28 14:12:01 +07:00
Jeremy Kauffman 1ce926dd98 fix nsfw not refreshing 2017-06-27 14:19:33 -04:00
6ea86b96 78be53806b
Two file info fixes since last merge 2017-06-27 15:23:03 +07:00
Jeremy Kauffman de5af5d2bc Merge branch 'master' of github.com:lbryio/lbry-app 2017-06-26 13:17:46 -04:00
6ea86b96 7ec5f4950a
Rename fileInfo.fileInfos to fileInfo.byOutpoint 2017-06-25 14:24:45 +07:00
6ea86b96 0214422e6b Add a badge to the dock for downloaded files 2017-06-24 22:21:04 +07:00
Jeremy Kauffman 2285f2f01e Merge pull request #270 from intnick/transiflex
separated page name translations
2017-06-22 08:50:17 -04:00
Alex Grintsvayg 89b5e20b15 iron out auth issues 2017-06-21 20:09:30 -04:00
Intnick b14293cd14 separated page name translations 2017-06-22 01:15:24 +02:00
Alex Grintsvayg cb68c538ee prettier 2017-06-21 08:42:22 -04:00
Alex Grintsvayg 4376c34678 store auth token in OS keyring, not in local storage 2017-06-21 08:41:07 -04:00
6ea86b96 03f0c3ae8f Prettier fixes 2017-06-11 00:17:55 +07:00
Jeremy Kauffman 09ecae7e0d reviewable 2017-06-08 17:15:34 -04:00
Jeremy Kauffman 18a40defba mostly done? 2017-06-07 20:56:52 -04:00
Jeremy Kauffman 4f65957287 not enough progress 2017-06-07 12:11:47 -04:00
Jeremy Kauffman b6881c829c uncommitted work from last night 2017-06-07 12:08:05 -04:00
Jeremy Kauffman a17d19038e good chunk of progress towards auth and rewards refactor / degating 2017-06-07 12:08:04 -04:00
6ea86b96 eb170b9720 Working on rewards refactor 2017-06-07 12:04:39 -04:00
Jeremy Kauffman e0b8afe028 midway through auth rewrite 2017-06-07 11:56:01 -04:00
6ea86b96 72137f51d2 Fix resolving uris in file tile 2017-06-07 08:34:13 +07:00
6ea86b96 f97ec7b390 Store claims by id in the state 2017-06-07 08:30:17 +07:00
Jeremy Kauffman 2172555096 change prettier options 2017-06-06 17:19:12 -04:00
Sean Yesmunt c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Mayesters 0153a6dab5 Merge branch 'master' into i18n 2017-06-01 17:41:49 +02:00
Intnick 02ed8145ca Merge branch 'i18n' of github.com:intnick/lbry-app into i18n 2017-06-01 17:02:16 +02:00
Intnick addf29f3bc global i18n object defined in app.js; smaller translation improvements 2017-06-01 17:02:02 +02:00
Alex Liebowitz e9dc3324cb Fix upgrade filenames on Mac and Windows 2017-06-01 05:03:37 -04:00
Alex Liebowitz c7bab43b7b Open full path instead of directory during upgrade
This was how it was before the Redux refactor
2017-06-01 05:03:37 -04:00
Mayesters 31190ea5b0 Merge branch 'master' into i18n 2017-05-31 12:48:49 +02:00
Jeremy Kauffman 4acd8a8f25 fix upgrade on windows 2017-05-29 16:43:50 -04:00
6ea86b96 a6709ffc26 Try to only keep one copy of each claim in the store 2017-05-28 22:46:00 +04:00
Mayesters 804c9a646b Merge branch 'master' into i18n 2017-05-28 18:46:31 +02:00
Intnick 13989632a7 language switch implementation. Needs more testing 2017-05-28 17:52:23 +02:00
Intnick d30d4353e8 moved the import of y18n component before some other imports; translations for auth developer 2017-05-28 17:33:25 +02:00
6ea86b96 b2b99b31b9
Don't try to fetch cost info if it's already fetching 2017-05-28 19:16:07 +04:00
Jeremy Kauffman 0c41cbb823 error and auth fixes 2017-05-24 20:07:38 -04:00
6ea86b96 27b9d844b7
Fix navigating back through search results 2017-05-23 12:46:52 +04:00
6ea86b96 53efd55890
Fix snackbar 2017-05-23 11:21:21 +04:00
Jeremy Kauffman 9d8fa102ee bug fixes, file info and my claims refactor, list claims in channel 2017-05-18 19:14:26 -04:00
Jeremy Kauffman 900c5cbc2b some progress towards cost and file info refactor, plus other fixes 2017-05-18 13:58:28 -04:00
Jeremy Kauffman 3fa4d0dfe7 progress towards fixing settings and costs 2017-05-17 17:52:45 -04:00
Jeremy Kauffman aa935c1c07 more refactors, fixes 2017-05-15 12:34:33 -04:00
Jeremy Kauffman 6783bcdfeb i'm making things better... right? 2017-05-14 23:50:59 -04:00
Jeremy Kauffman 0fad6864ec let improvements and breaking continue 2017-05-12 18:50:51 -04:00
Jeremy Kauffman 5605b10f54 more bug fixes and bugs 2017-05-12 13:14:06 -04:00
Jeremy Kauffman c1161fc10b mainly more bug fixes 2017-05-11 19:28:43 -04:00
Jeremy Kauffman 3c325b2f0a where's the triggers?! also very broken 2017-05-10 20:59:47 -04:00
Jeremy Kauffman d517316554 some progress but also broken show 2017-05-09 23:06:48 -04:00
6ea86b96 4b5187bc7f
Better search 2017-05-07 19:50:32 +07:00
6ea86b96 3085b2d362
A couple of minor history fixes 2017-05-07 00:57:34 +07:00
6ea86b96 d2c97d3460
Back button working properly 2017-05-06 23:31:47 +07:00
6ea86b96 fcea4cb305
Progress on navigation 2017-05-06 14:25:14 +07:00
6ea86b96 29c53a9bf8
Search kind of working, but nasty 2017-05-05 15:01:16 +07:00
6ea86b96 494d885f31
Use SubHeader for all sub navigation 2017-05-05 12:28:28 +07:00
Jeremy Kauffman 36a992343f much progress towards a working merge 2017-05-03 23:44:08 -04:00
6ea86b96 001d5e21f1 Get rewards page working 2017-05-02 19:40:42 -04:00
6ea86b96 2547d85751 Fix file card stream loading text 2017-05-02 19:37:15 -04:00
6ea86b96 3c31a9fca1 Published files working 2017-05-02 19:36:31 -04:00
6ea86b96 bef2f87efd reverse wallet transactions 2017-05-02 19:35:59 -04:00
6ea86b96 7a6dd93886 Downloaded file list kind of working. Not sure about sort. 2017-05-02 19:35:59 -04:00
6ea86b96 e1d23667bc Fix NSFW blurring on search and make search show/hide smarter 2017-05-02 19:35:22 -04:00
6ea86b96 1d16c73cf4 More refactoring/fixing of file actions, tiles, etc 2017-05-02 19:34:01 -04:00
6ea86b96 f08ce3d300 A bunch of improvements and broken the back of the file rendering code now 2017-05-02 19:31:34 -04:00
6ea86b96 b0f32aebc7 Refactoring 2017-05-02 19:30:28 -04:00
6ea86b96 13008f5f31 Videos playing properly immediately after purchase 2017-05-02 19:29:10 -04:00
6ea86b96 e0b78368ab Playing videos working better 2017-05-02 19:25:06 -04:00
6ea86b96 674fafd31a Able to watch already downloaded videos 2017-05-02 19:23:52 -04:00
6ea86b96 67b79fc3a0 Search working 2017-05-02 19:22:44 -04:00
6ea86b96 768326fb4a Working on search 2017-05-02 19:20:53 -04:00
6ea86b96 bb9a71805b Loading show page content fast, resolving cost and file info.
Rewards and uploaded/downloaded files currently broken
2017-05-02 19:16:42 -04:00
6ea86b96 6c4ad8cee9 Starting on downloaded/published content 2017-05-02 19:13:01 -04:00
6ea86b96 5c3772dc86 Featured content 2017-05-02 19:10:35 -04:00
6ea86b96 ecd2063fed Progress on featured content 2017-05-02 19:07:46 -04:00
6ea86b96 4fe3fe5dcb Progress on sending transactions 2017-05-02 18:47:03 -04:00
6ea86b96 4c07198b03 Some transactions cleanup and starting on sending 2017-05-02 18:47:03 -04:00