From 84888c37d088a074400f653d69545c9d3d47ecf7 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Fri, 5 Aug 2016 13:59:09 -0400 Subject: [PATCH] bounty launch? --- controller/action/BountyActions.class.php | 8 +++---- data/i18n/en.yaml | 5 +++-- lib/i18n.class.php | 4 ++-- posts/bounty/android-app.md | 9 -------- posts/bounty/ios-app.md | 9 -------- posts/bounty/refer-publisher.md | 8 ++++++- posts/bounty/wallet-ui.md | 8 ++++++- posts/bounty/windows-build.md | 11 --------- posts/drafts/bounty/bug-bounty.md | 22 ++++++++++++++++++ view/template/bounty/_meta.php | 3 ++- view/template/bounty/list.php | 4 ++-- view/template/bounty/show.php | 27 +++++++++++++++-------- web/scss/_bounty.scss | 2 +- 13 files changed, 68 insertions(+), 52 deletions(-) delete mode 100644 posts/bounty/android-app.md delete mode 100644 posts/bounty/ios-app.md delete mode 100644 posts/bounty/windows-build.md create mode 100644 posts/drafts/bounty/bug-bounty.md diff --git a/controller/action/BountyActions.class.php b/controller/action/BountyActions.class.php index 2af7e18d..23e17a3a 100644 --- a/controller/action/BountyActions.class.php +++ b/controller/action/BountyActions.class.php @@ -7,11 +7,11 @@ class BountyActions extends Actions public static function executeList() { $allBounties = Post::find(ROOT_DIR . '/posts/bounty'); - - $allCategories = ['' => ''] + Post::collectMetadata($allBounties, 'category'); - $allStatuses = ['' => ''] + Post::collectMetadata($allBounties, 'status'); - $selectedStatus = static::param('status'); + $allCategories = ['' => ''] + Post::collectMetadata($allBounties, 'category'); + $allStatuses = ['' => ''] + array_merge(Post::collectMetadata($allBounties, 'status'), ['complete' => 'unavailable']); + + $selectedStatus = static::param('status', 'available'); $selectedCategory = static::param('category'); $filters = array_filter([ diff --git a/data/i18n/en.yaml b/data/i18n/en.yaml index 69f5250e..c17ede01 100644 --- a/data/i18n/en.yaml +++ b/data/i18n/en.yaml @@ -10,9 +10,10 @@ bounty: list: - noresult: No matching bounties found. + noresults: No matching bounties found. show: - completednotice: This bounty has already been completed and can no longer be claimed. + completed_notice: This bounty has already been completed and can no longer be claimed. + pull_request_link: View the Pull Request description: allowed: Download/install the latest version of LBRY for %os%. faq: Frequently asked questions about LBRY. diff --git a/lib/i18n.class.php b/lib/i18n.class.php index 4ce0f5c1..9771178d 100644 --- a/lib/i18n.class.php +++ b/lib/i18n.class.php @@ -4,7 +4,7 @@ * i18n dummy we'll be happy to have later */ function __($msg, $args = []) -{ +{ return strtr(i18n::translate($msg), $args); } @@ -61,7 +61,7 @@ class i18n public static function formatCredits($amount) { - return '' . number_format($amount, 1) . ' LBC'; + return '' . (is_numeric($amount) ? number_format($amount, 1) : $amount) . ' LBC'; } public static function translate($token, $language = null) diff --git a/posts/bounty/android-app.md b/posts/bounty/android-app.md deleted file mode 100644 index 94a9a5e8..00000000 --- a/posts/bounty/android-app.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -category: android -title: Mirror existing LBRY behavior in Android -award: 10000 -status: available -date: '2016-07-01' ---- - -Domo arigato, Rami Malek. \ No newline at end of file diff --git a/posts/bounty/ios-app.md b/posts/bounty/ios-app.md deleted file mode 100644 index 3e9eb068..00000000 --- a/posts/bounty/ios-app.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -category: ios -title: Mirror existing LBRY behavior in iOS -award: 10000 -status: available -date: '2016-07-01' ---- - -An Apple a day keeps the FBI away. \ No newline at end of file diff --git a/posts/bounty/refer-publisher.md b/posts/bounty/refer-publisher.md index 48058005..8f0a45d9 100644 --- a/posts/bounty/refer-publisher.md +++ b/posts/bounty/refer-publisher.md @@ -6,4 +6,10 @@ status: available date: '2016-07-01' --- -Create a build for Windows that is reproducible in Travis CI. This involves blah, blah, and blah. \ No newline at end of file +LBRY is offering $1,000 in LBC to content creators as part of our [Publisher Partnership Program](https://lbry.io/publish). + +If you refer someone that is accepted into the program, you will receive this bounty award. + +**Note: Do not notify us to claim this bounty. When we accept publishers into the program, we will ask who referred them.** + +This award will remain open as long as the publisher program continues to run. \ No newline at end of file diff --git a/posts/bounty/wallet-ui.md b/posts/bounty/wallet-ui.md index 18a39f3d..d59ef381 100644 --- a/posts/bounty/wallet-ui.md +++ b/posts/bounty/wallet-ui.md @@ -3,7 +3,13 @@ category: browser title: Add Wallet Interface to LBRY Browser award: 1000 status: complete +pr: https://github.com/lbryio/lbry-web-ui/pull/23/files date: '2016-07-01' --- -Wallet wallet wallet, wallet wallet. \ No newline at end of file +Add a basic wallet interface to the LBRY Browser [`lbry-web-ui`](https://github.com/lbry/lbry-web-ui). + +The interface must support: + +- Generating a new wallet address. +- Sending a variable number of credits to a specified address from the active wallet. diff --git a/posts/bounty/windows-build.md b/posts/bounty/windows-build.md deleted file mode 100644 index b42cab0f..00000000 --- a/posts/bounty/windows-build.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -category: ci -title: Build LBRY for Windows -award: 1000 -status: available -date: '2016-07-01' ---- - -Contact your favorite YouTuber or other online publisher and let them know about [LBRY's publishing partnerships](http://lbry.io/publish). - -If you notify someone that is accepted, you'll earn a referral bonus. \ No newline at end of file diff --git a/posts/drafts/bounty/bug-bounty.md b/posts/drafts/bounty/bug-bounty.md new file mode 100644 index 00000000..6d7dd83e --- /dev/null +++ b/posts/drafts/bounty/bug-bounty.md @@ -0,0 +1,22 @@ +--- +category: human +title: Bug and Security Bounty +award: 10-10,000+ +status: available +date: '2016-07-01' +--- + +LBRY will award LBC for all cleanly documented bugs, security vulnerabilities, or other flaws in LBRY's software, servers, infrastructure, or procedures. + +Awards will be variable based on the severity of the issue. Any discoveries that risk exploitation of the LBRY network, it's users, or LBRY Inc. should be disclosed privately to [grin@lbry.io](mailto:grin@lbry.io). + +Extremely severe discoveries will warrant commensurate awards. Typical bug discoveries will be at the bottom of the scale. + +### Reporting a Bug + +To report a bug, please open an Issue on the relevant Github project: + +[`lbry-web-ui`](https://github.com/lbry/lbry-web-ui) - UI bugs or display issues +[`lbry`](https://github.com/lbry/lbry-web-ui) - Connection or hosting issues +[`lbrycrdd`](https://github.com/lbry/lbry-web-ui) - Blockchain related issues + diff --git a/view/template/bounty/_meta.php b/view/template/bounty/_meta.php index 8b195c05..4e4cf00a 100644 --- a/view/template/bounty/_meta.php +++ b/view/template/bounty/_meta.php @@ -1,4 +1,5 @@
- +
\ No newline at end of file diff --git a/view/template/bounty/list.php b/view/template/bounty/list.php index 23c0f5bf..666113ff 100644 --- a/view/template/bounty/list.php +++ b/view/template/bounty/list.php @@ -24,7 +24,7 @@ ]) ?>
- +