diff --git a/README.md b/README.md index 7bbeecb6..ea6eaa60 100644 --- a/README.md +++ b/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`. diff --git a/content/bio/sean-yesmunt.md b/content/bio/sean-yesmunt.md index b9c89453..7edc720b 100644 --- a/content/bio/sean-yesmunt.md +++ b/content/bio/sean-yesmunt.md @@ -2,7 +2,8 @@ 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. -So, he did what many LBRYians have done, and dropped out to focus on coding. His excitement for crypto and open-source projects focused on decentralization, led him to discover LBRY, which he began working on the very same day. His passion for developing intuitive user experiences have been a welcome addition to the team. +So, he did what many LBRYians have done, and dropped out to focus on coding. His excitement for crypto and open-source projects focused on decentralization, led him to discover LBRY, which he began working on the very same day. His passion for developing intuitive user experiences have been a welcome addition to the team. diff --git a/content/bounty/automatic-app-updates.md b/content/bounty/automatic-app-updates.md index fbe3f8ff..1d9c5223 100644 --- a/content/bounty/automatic-app-updates.md +++ b/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' --- diff --git a/content/bounty/paper-wallet.md b/content/bounty/paper-wallet.md index 5664fe71..734e5be7 100644 --- a/content/bounty/paper-wallet.md +++ b/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' --- diff --git a/content/faq/rewards.md b/content/faq/rewards.md index 84aeaadc..4a4aea32 100644 --- a/content/faq/rewards.md +++ b/content/faq/rewards.md @@ -3,11 +3,11 @@ title: What are LBRY Rewards? category: getstarted --- -To provide a rich user experience and to [distribute](https://lbry.io/faq/credit-policy) LBRY Credits (LBC) into the hands of new and returning users, LBRY created a Rewards system where credits are earned by completing tasks throughout the application. Rewards are given to promote application testing, learning certain in-app skills, building the LBRY economy through purchasing and publishing content, and as a small "thank you" gift for being part of a revolutionary digital media platform. For qualified users, Rewards are issued automatically by the LBRY app into each users' [LBRY wallet](https://lbry.io/faq/how-to-backup-wallet). +To provide a rich user experience and to [distribute](https://lbry.io/faq/credit-policy) LBRY Credits (LBC) into the hands of new and returning users, LBRY created a Rewards system where credits are earned by completing tasks throughout the application. Rewards are given to promote application testing, learning certain in-app skills, building the LBRY economy through purchasing and publishing content, and as a small "thank you" gift for being part of a revolutionary digital media platform. For qualified users, Rewards are issued automatically by the LBRY app into each users' [LBRY wallet](https://lbry.io/faq/how-to-backup-wallet). ### 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 | diff --git a/docker.sh b/docker.sh index e5bb466e..2a2d9ab6 100755 --- a/docker.sh +++ b/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" diff --git a/view/template/content/_bio.php b/view/template/content/_bio.php index 1dc58475..f8c3a655 100644 --- a/view/template/content/_bio.php +++ b/view/template/content/_bio.php @@ -11,6 +11,9 @@ + + +
diff --git a/view/template/page/join-us.php b/view/template/page/join-us.php index 976f9914..ccf39232 100644 --- a/view/template/page/join-us.php +++ b/view/template/page/join-us.php @@ -1,4 +1,4 @@ - + false]) ?>