Commit graph

123 commits

Author SHA1 Message Date
Jeremy Kauffman
03c1d502b2 Merge branch 'hackrush01-tipping_button' into v16 2017-09-07 08:21:04 -04:00
Jeremy Kauffman
0a543a3dcd Merge branch 'tipping_button' of https://github.com/hackrush01/lbry-app into hackrush01-tipping_button 2017-09-07 08:20:23 -04:00
Jeremy Kauffman
4cc9f46934 more settings progress 2017-09-06 21:53:42 -04:00
Jeremy Kauffman
67c1ec531e first attempt at merge 2017-09-06 18:03:09 -04:00
Jeremy Kauffman
b32f3cbafe default balance to undefined, fixes #534 2017-09-06 15:05:35 -04:00
Jeremy Kauffman
38ed9985b7 Merge branch 'btzr/relative-time' 2017-09-03 12:35:49 -04:00
Jeremy Kauffman
2b77c16cdd add datetime component, show date of publishes, store block history in redux 2017-09-03 12:35:01 -04:00
btzr-io
8c033d6fef display published date
Fix #59
2017-09-01 21:59:25 -06:00
hackrush
5b49915ff6 Merge branch 'master' into tipping_button 2017-09-01 14:02:35 +05:30
Jeremy Kauffman
a9113369ef fix off by 1 error in navigation history 2017-08-31 08:59:29 -04:00
Jeremy Kauffman
339945018d Fix bugs in history navigation in stack ordering and loss of scrolling
and refactor history
2017-08-30 13:40:51 -04:00
Jeremy Kauffman
b07682ef9d wallet changes
finish rebase
2017-08-29 17:42:09 -04:00
Jeremy Kauffman
7b5e752e90 properly split welcome modal logic 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
2b8296fcc3 rewards refactor to support types, add list 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
31fb723d87 invites basics 2017-08-29 14:40:30 -04:00
hackrush
21175ba608 Merge remote-tracking branch 'upstream/master' into tb2 2017-08-29 13:21:23 +05:30
Jeremy Kauffman
010534cc16 kill utils.js, reduce (set|get)(Local|Session) to just lbry.js 2017-08-25 16:26:09 -04:00
Jeremy Kauffman
b49318aead Merge pull request #496 from lbryio/redux_volume
Issue #323 switch volume preference to use redux
2017-08-25 16:17:26 -04:00
Jeremy Kauffman
cb70fdb4b3 remove unused code 2017-08-25 16:04:05 -04:00
Akinwale Ariwodola
faa1c4634b Issue #323 switch volume preference to use redux 2017-08-25 20:05:00 +01:00
Jeremy Kauffman
a31e064c3e fix pagination of channels 2017-08-24 17:12:32 -04:00
Baltazar Gomez
03b04ad9b0 Merge branch 'master' into master 2017-08-24 12:28:05 -06:00
Akinwale Ariwodola
48b02567a0 fixed locale change bug 2017-08-23 00:50:59 +01:00
btzr-io
2db24b059f rewrite action -> doSetTheme 2017-08-19 17:59:48 -06:00
btzr-io
c87bcb8383 rewrite themes-system -> action / reducer 2017-08-19 15:34:45 -06:00
Jeremy Kauffman
cefc882474 more i18n progress 2017-08-19 14:03:51 -04:00
Akinwale Ariwodola
970539ffae fixed merge conflicts with latest master 2017-08-19 09:01:31 +01:00
Baltazar Gomez
9d02df5446 prevent duplicated history / get history length
implement custom history

fix history back / forward actions

fix react error

fix back / forward actions -> use doChangePath

revert history state

return page index / location from history stack

implement custom history -> react/redux style

remove util/createHistory.js

 tidy up / simplify

fix comments
2017-08-18 13:18:15 -04:00
6ea86b96
5df497182e Working on history fix 2017-08-18 13:18:15 -04:00
Jeremy Kauffman
22fbf13715 attempt to disable back/forward buttons 2017-08-18 13:18:15 -04:00
hackrush
a6c53e6505 Fix for broken published links in published tab 2017-08-15 00:19:33 +05:30
hackrush
de40578608 Passing params directly w/o using redux store 2017-08-14 15:13:40 +05:30
Akinwale Ariwodola
d591886df5 reduxify pull request 325 2017-08-08 10:36:14 +01:00
hackrush
03ee864af0 (WIP) Tip as support Functionality Only. 2017-08-08 03:56:43 +05:30
Jeremy Kauffman
b6d3a52f5d featured icon for reward content 2017-07-29 18:56:08 -04:00
Alex Liebowitz
230d2a451c Indicate content eligible for Hot Right Now reward 2017-07-29 17:54:05 -04:00
6ea86b96
d7ceeb15cf Add pagination
Some bad pagination CSS
2017-07-29 15:35:14 -04:00
6ea86b96
603217f554
Fix a bug where refreshing strips the claim_id from the uri 2017-07-27 11:45:34 +07:00
Jeremy Kauffman
1ccd03ea59 fix typo in file_info reducer 2017-07-25 16:41:21 -04:00
Jeremy Kauffman
ac34faea80 Merge remote-tracking branch 'origin/master' into rewards3 2017-07-24 18:09:37 -04:00
6ea86b96
af96d40ead Remove files from downloading list when they are deleted mid download 2017-07-22 10:54:15 +07: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