Commit graph

87 commits

Author SHA1 Message Date
Jeremy Kauffman 67c1ec531e first attempt at merge 2017-09-06 18:03:09 -04:00
Jeremy Kauffman 38ed9985b7 Merge branch 'btzr/relative-time' 2017-09-03 12:35:49 -04:00
btzr-io 8c033d6fef display published date
Fix #59
2017-09-01 21:59:25 -06:00
Jeremy Kauffman 010534cc16 kill utils.js, reduce (set|get)(Local|Session) to just lbry.js 2017-08-25 16:26:09 -04: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
Baltazar Gomez ba35ac81aa Merge branch 'master' into master 2017-08-17 22:45:08 -06:00
Jeremy Kauffman d5f6ecee70 update daemon to 0.15 2017-08-15 17:04:09 -04:00
btzr-io 5bf9ac9fe6 implement theme-system 2017-08-04 19:36:36 -06:00
Jeremy Kauffman d58990f240 fix incorrect file_list responses 2017-07-30 15:20:36 -04:00
Jeremy Kauffman ac34faea80 Merge remote-tracking branch 'origin/master' into rewards3 2017-07-24 18:09:37 -04:00
hackrush 0f4bc36bcd The URL name is automatically suggested.
Fixes #347

minor clean up
2017-07-24 17:56:18 -04:00
Jeremy Kauffman 16abedbf3a moderate progress 2017-07-16 12:29:46 -04:00
6ea86b96 76fe44e519 Refactor back to lbry.js localStorage for pending publishes 2017-07-13 13:52:47 +07:00
Akinwale Ariwodola ee002597fc Merged with master to resolve conflicts 2017-07-06 18:39:35 +01:00
6ea86b96 91359c2966 Add option to abandon claim when deleting published file 2017-07-02 13:48:53 -04:00
Jeremy Kauffman f6ad6e7ba7 remove mov from list of playable files 2017-06-30 16:33:49 -04:00
Jeremy Kauffman b815f78a50 more pending and publishing fixes 2017-06-28 18:08:16 -04:00
Jeremy Kauffman df286da300 stupid pending publish hacks 2017-06-28 15:54:33 -04:00
hackrush e3bbb6fcef "Fixed NSFW content showing on filePage"
NSFW content is obscured on show page and gives an overlay to inform
the user. Fixes #286

Added one additional format(epub) in lbry.js.
2017-06-27 14:18:30 -04:00
Zed c27d492d48 Support more file extensions 2017-06-20 20:34:00 +02:00
Alex Grintsvayg aaec1f3a48 prettify all the files 2017-06-20 08:08:52 -04:00
Jeremy Kauffman b0959502ef Merge branch 'master' into refresh-claim-list-mine 2017-06-15 09:36:25 -04:00
6ea86b96 1063d2fc9d Always refresh claims/file info on downloaded/published pages 2017-06-15 19:46:27 +07:00
Jeremy Kauffman 4b095c3ea6 kill lbry.call 2017-06-14 20:21:31 -04:00
Jeremy Kauffman 4c8d649830 updates required for lbry daemon 0.12 2017-06-14 17:49:23 -04:00
Jeremy Kauffman efd289b1ed increase wait time for daemon to launch 2017-06-14 11:21:16 -04:00
Sean Yesmunt c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Jeremy Kauffman 8d359629fb Merge pull request #160 from intnick/i18n
i18n Support
2017-06-05 11:34:22 -04:00
Jack Robison eb0641d82a update deprecated commands 2017-06-05 10:44:53 -04:00
Mayesters 81afbf8d70 Merge branch 'master' into i18n 2017-06-02 18:11:54 +02:00
6ea86b96 8505959c22 Use render-media to render audio and images 2017-06-02 14:11:59 +07:00
Alex Grintsvayg 5d09bcc550 rename deprecated call 2017-06-01 14:39:28 -04:00
Mayesters 0153a6dab5 Merge branch 'master' into i18n 2017-06-01 17:41:49 +02:00
Jeremy Kauffman 149d1ef61f fix version check on help 2017-05-31 12:22:50 -04:00
Mayesters 31190ea5b0 Merge branch 'master' into i18n 2017-05-31 12:48:49 +02:00
Jeremy Kauffman 7a8a2c4913 connection changes and changelog 2017-05-30 19:56:48 -04:00
Intnick 13989632a7 language switch implementation. Needs more testing 2017-05-28 17:52:23 +02:00
Mayesters 469e769e01 lots of stuff translated 2017-05-28 17:52:23 +02:00
Jeremy Kauffman aee0603dc9 fix version info on help 2017-05-25 14:29:28 -04:00
Jeremy Kauffman 0936d28e5d minor bug fixes 2017-05-21 12:15:41 -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 d517316554 some progress but also broken show 2017-05-09 23:06:48 -04:00
Jeremy Kauffman b70f169256 much progress towards a working merge 2017-05-04 11:59:46 -04:00
Jeremy Kauffman cfedb4a860 more bug fixes 2017-05-04 11:59:46 -04:00