From 99314804b53430cc3303f37ed87f49ca3d2f01ce Mon Sep 17 00:00:00 2001 From: Lav Radis Date: Tue, 6 Mar 2018 12:01:41 +0100 Subject: [PATCH 1/7] Update press-kit.md One of the users reported that the old video link was pointing to a non-working video. --- content/press-kit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/press-kit.md b/content/press-kit.md index 0bf38bc9..df7a7955 100644 --- a/content/press-kit.md +++ b/content/press-kit.md @@ -16,7 +16,7 @@ On July 29th, 2017 the Pop-up Open Beta Was Announced. ### FAQ -- [LBRY in 100 Seconds (Video)](https://www.youtube.com/watch?v=qkUA0vTWM7g) +- [LBRY in 100 Seconds (Video)](https://www.youtube.com/watch?v=DjouYBEkQPY) - [How Does LBRY Work, Exactly?](https://lbry.io/news/introducing-lbry-the-bitcoin-of-content) - [Why Doesn't LBRY Just Use Bitcoin?](https://lbry.io/news/why-doesnt-lbry-just-use-bitcoin) - [More F.A.Q's](https://lbry.io/faq) From 35d8afc62ce0130089617ed6ef33ef7ce7fc61cf Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Mon, 12 Mar 2018 00:02:30 -0400 Subject: [PATCH 2/7] add waiting period info --- content/faq/naming.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/faq/naming.md b/content/faq/naming.md index 49827efd..1623e866 100644 --- a/content/faq/naming.md +++ b/content/faq/naming.md @@ -48,7 +48,7 @@ LBRY supports several types of URL resolution: 1. **Names aren’t bought, only reserved – no credits are lost, only put on deposit.** If you win the auction for a name, your credits are held with that name until you decide to withdraw them (at any time you wish). You aren’t buying the name from anyone and no one profits off of the transfer of names. It’s just a test of who is willing to deposit the most credits toward a name. The only cost is that you can’t spend the credits on content or cash them out while they are reserving a name. -2. **The longer a community name is held, the longer it sticks.** Community-controlled URLs don't change instantly if more credits are designated – especially if you’ve held it for awhile. The time for resolution to change scales up to over 1 week. +2. **The longer a community name is held, the longer it sticks.** Community-controlled URLs don't change instantly if more credits are designated – especially if you’ve held it for awhile. For every month a name is controlled, 1 day is added to the waiting period, for a maximum of 7 days (after 7 months). 3. **Everyone has a say.** If you claim lbry://bestmovieever and your film lives up to the hype, user tips and purchases are a strong force keeping your content there. If the community feels a URL resolution is incorrect, they can band together to change it any time. This is a powerful force keeping bad actors at bay that has already proved useful. From dd1f2ad4f142cedb8e0f131e40d46b6e9ff8e0ee Mon Sep 17 00:00:00 2001 From: GuzmanPintos <37162183+GuzmanPintos@users.noreply.github.com> Date: Mon, 12 Mar 2018 16:51:10 -0400 Subject: [PATCH 3/7] Update mining-pools.md (#419) Add Luxor pool to mining pools page --- content/faq/mining-pools.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/faq/mining-pools.md b/content/faq/mining-pools.md index 1a176452..c40880f6 100644 --- a/content/faq/mining-pools.md +++ b/content/faq/mining-pools.md @@ -11,3 +11,4 @@ While we try to work with reliable pool operators, LBRY does not officially run - [SuprNova](https://lbry.suprnova.cc/index.php?page=gettingstarted) - [CoinMine](https://www2.coinmine.pl/lbc/index.php?page=gettingstarted) - [NiceHash](https://www.nicehash.com/marketplace/lbry) +- [Luxor](https://mining.luxor.tech/) From 5c77bdc9367b14c9c2871771e946516ed90cc73c Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Mon, 12 Mar 2018 22:41:03 +0100 Subject: [PATCH 4/7] Update exchanges.md (#420) add Coinspot Australian crypto exchange --- content/faq/exchanges.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/faq/exchanges.md b/content/faq/exchanges.md index e1e7b387..f3b064eb 100644 --- a/content/faq/exchanges.md +++ b/content/faq/exchanges.md @@ -12,3 +12,4 @@ We are listed on several exchanges. You can buy or sell credits at one of these: - [BitSquare](https://bitsquare.io/) - [Cryptopia](https://www.cryptopia.co.nz/Exchange/?market=LBC_BTC) - [Upbit](https://upbit.com/exchange?code=CRIX.UPBIT.BTC-LBC) +- [Coinspot](https://www.coinspot.com.au/buy/lbc) From c7531eda8c4eb077f4ffd595a6447b3e8869258b Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Mon, 12 Mar 2018 23:20:42 +0100 Subject: [PATCH 5/7] add bio html to show social links author (#408) * add email and social links to author on content pages --- controller/action/ContentActions.class.php | 5 ++++- model/Post.class.php | 26 +++++++++++++++++++++- view/template/content/_postAuthor.php | 12 ++++++++-- web/scss/_blog.scss | 2 +- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/controller/action/ContentActions.class.php b/controller/action/ContentActions.class.php index 4dd6463c..327fbc9c 100644 --- a/controller/action/ContentActions.class.php +++ b/controller/action/ContentActions.class.php @@ -353,7 +353,10 @@ class ContentActions extends Actions return [ 'authorName' => $post->getAuthorName(), 'photoImgSrc' => $post->getAuthorPhoto(), - 'authorBioHtml' => $post->getAuthorBioHtml() + 'authorBioHtml' => $post->getAuthorBioHtml(), + 'authorGithub' => $post->getAuthorGithubID(), + 'authorTwitter' => $post->getAuthorTwitterID(), + 'authorEmail' => $post->getAuthorPostEmail() ]; } diff --git a/model/Post.class.php b/model/Post.class.php index a090683f..f54a6a88 100644 --- a/model/Post.class.php +++ b/model/Post.class.php @@ -156,6 +156,30 @@ class Post return $this->author; } + public function getAuthorGithubID() + { + $post = ContentActions::prepareBioPartial(['person' =>$this->author]); + if(array_key_exists("github", $post)){ + return $post["github"]; + } + } + +public function getAuthorTwitterID() +{ + $post = ContentActions::prepareBioPartial(['person' =>$this->author]); + if(array_key_exists("twitter", $post)){ + return $post["twitter"]; + } +} + +public function getAuthorEmail() +{ + $post = ContentActions::prepareBioPartial(['person' =>$this->author]); + if(array_key_exists("email", $post)){ + return $post["email"]; + } +} + public function getDate() { return $this->date; @@ -232,7 +256,7 @@ class Post return $post["name"]; } - public function getAuthorEmail() + public function getAuthorPostEmail() { $post = ContentActions::prepareBioPartial(['person' =>$this->author]); diff --git a/view/template/content/_postAuthor.php b/view/template/content/_postAuthor.php index ea9ea4a7..bc742e71 100644 --- a/view/template/content/_postAuthor.php +++ b/view/template/content/_postAuthor.php @@ -6,9 +6,17 @@
{{news.author}}
-

+

+ + + + + + + + +

-
diff --git a/web/scss/_blog.scss b/web/scss/_blog.scss index 61813d86..ae3b0623 100644 --- a/web/scss/_blog.scss +++ b/web/scss/_blog.scss @@ -203,5 +203,5 @@ .post-author-spotlight { - h3 { text-transform: uppercase; margin-top: $spacing-vertical / 4 !important; } + h3 { text-transform: uppercase; margin-top: $spacing-vertical / 4 !important; margin-bottom: 0;} } From 991303e90986c0f94442d73a72e8b922d7277a62 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Mon, 12 Mar 2018 23:42:15 +0100 Subject: [PATCH 6/7] added icon email and some social links (#421) * Add email icon (instead of text) + social icons to press-kit page --- view/template/page/press-kit.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/view/template/page/press-kit.php b/view/template/page/press-kit.php index 37711873..1d2dff03 100644 --- a/view/template/page/press-kit.php +++ b/view/template/page/press-kit.php @@ -42,8 +42,14 @@

- - + + + + + + + +

From 9000034121a62a17bd0d7eb20515b6bdbed4146c Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 12 Mar 2018 18:44:13 -0400 Subject: [PATCH 7/7] update URLs for api change --- controller/Controller.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controller/Controller.class.php b/controller/Controller.class.php index 40be762f..b0cfd7b9 100644 --- a/controller/Controller.class.php +++ b/controller/Controller.class.php @@ -120,6 +120,7 @@ class Controller $router->any('/dmca', 'ReportActions::executeDmca'); $router->any('/youtube/thanks', 'AcquisitionActions::executeThanks'); + $router->any('/youtube/status/{token}?', 'AcquisitionActions::executeThanks'); $router->any('/youtube/sub', 'AcquisitionActions::executeYouTubeSub'); $router->any('/youtube/{campaignId:c}?', 'AcquisitionActions::executeYouTube'); $router->any('/yt2', 'AcquisitionActions::executeYT2');