Merge branch 'master' into feature/team_github_id

README.md

@@ -18,7 +18,7 @@ You can also run the development server using docker:
 - Run `./docker.sh` from the project root
 - Access [localhost:8000](http://localhost:8000) in your browser
 
-Both the `dev.sh` and `dev-docker.sh` scripts will initialise a configuration based on `data/config.php.example` if `data/config.php` does not exist.
+Both the `dev.sh` and `docker.sh` scripts will initialise a configuration based on `data/config.php.example` if `data/config.php` does not exist.
 
 To run remotely, simply install PHP and configure Apache or your server of choice to serve `web/index.php`.
 

content/bio/sean-yesmunt.md

@@ -2,6 +2,7 @@
 name: Sean Yesmunt
 role: App Developer
 email: sean@lbry.io
+twitter: seanyesmunt
 ---
 Sean is a recent addition to the LBRY team who has hit the ground running with serious contributions to the project as an app engineer focused on user experience (he spends his time making the LBRY app easier to use). Sean was part way through an Aerospace Engineering degree at Penn State, when he decided he didn’t want to end up working on rockets for the government.
 

content/bounty/automatic-app-updates.md

@@ -2,7 +2,7 @@
 category: browser
 title: Automatic App Updates
 award: 1000
-status: available
+status: complete
 date: '2017-07-22'
 ---
 

content/bounty/paper-wallet.md

@@ -2,7 +2,7 @@
 category: code
 title: LBC Paper Wallet
 award: 300
-status: available
+status: complete
 date: '2017-09-12'
 ---
 

content/faq/rewards.md

@@ -7,7 +7,7 @@ To provide a rich user experience and to [distribute](https://lbry.io/faq/credit
 
 ### Verification requirements
 
-In order to be eligible for LBRY Rewards, users must have a [verified account](https://lbry.io/faq/identity-requirements). If users choose not to verify themselves, LBRY works with full functionality but they will not be able to earn any free credits from LBRY. **Rewards will only be granted on a 1 account per household basis** 
+In order to be eligible for LBRY Rewards, users must have a [verified account](https://lbry.io/faq/identity-requirements). If users choose not to verify themselves, LBRY works with full functionality but they will not be able to earn any free credits from LBRY.  **Rewards will only be granted on a 1 account per household basis and LBRY reserves the right to revoke Rewards priveledges on any account if abuse is suspected or if VPN is used.** 
 
 ### List of the current LBRY Rewards
 | Reward | Amount | Description |

docker.sh

@@ -3,14 +3,14 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 
-if [ ! -e "data/config.php" ]; then
+if [ ! -e "$DIR/data/config.php" ]; then
   cp "$DIR/data/config.php.example" "$DIR/data/config.php"
 fi
 
 docker run --rm -it --name "dev.lbry.io" \
-  -v "$(readlink -f .):/usr/src/lbry.io" \
+  -v "$DIR:/usr/src/lbry.io" \
   -w "/usr/src/lbry.io" \
   -p "127.0.0.1:8000:8000" \
   -u "$(id -u):$(id -g)" \
   php:7-alpine \
-  php --server "0.0.0.0:8000" --docroot "web/" "web/index.php"
+  php --server "0.0.0.0:8000" --docroot "web/" "index.php"

view/template/content/_bio.php

@@ -11,6 +11,9 @@
       <?php if (isset ($github)): ?>
         <a href="https://github.com/<?php echo $github ?>" class="link-primary"><span class="icon icon-github"></span></a>
       <?php endif ?>
+      <?php if (isset($twitter)): ?>
+        <a href="https://www.twitter.com/<?php echo $twitter?>" class="link-primary"><span class="icon icon-twitter"></span></a>
+      <?php endif ?>
     </h4>
     <div class="meta spacer1"><?php echo $role ?></div>
     <div class="markdown">

view/template/page/join-us.php

@@ -1,4 +1,4 @@
-<?php Response::setMetaDescription('Join Us') ?>
+<?php Response::setMetaDescription('Like contributing to digital freedom and making money? Why not both? LBRY is hiring!') ?>
 <?php Response::addMetaImage('https://spee.ch/@lbryteam/everyone.jpg') ?>
 <?php echo View::render('nav/_header', ['isDark' => false]) ?>
 <main>