From 4a0a3286b113bbf18d95c72f0b9b2b18cd467436 Mon Sep 17 00:00:00 2001 From: Maxime St-Pierre Date: Fri, 19 Jan 2018 08:45:06 -0500 Subject: [PATCH 1/7] Add twitter to team page --- content/bio/sean-yesmunt.md | 3 ++- view/template/content/_bio.php | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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/view/template/content/_bio.php b/view/template/content/_bio.php index 7edf71fe..0765f454 100644 --- a/view/template/content/_bio.php +++ b/view/template/content/_bio.php @@ -8,10 +8,13 @@ + + +
- \ No newline at end of file + From f2a8c8a0c5bcc055a5a9f90e4f01099e790ff145 Mon Sep 17 00:00:00 2001 From: Fabrizio Lungo Date: Sat, 20 Jan 2018 17:49:39 +0000 Subject: [PATCH 2/7] Fixed Docker script and README Updated the Docker script to start the site correctly. The DIR variable was not being used in each place which it should have been used and this has allowed the removal of the `readlink -f` command which had compatibility issues with MacOS (#297). The README did not have the change in name for the docker script reflected in all references so this has also been corrected. --- README.md | 2 +- docker.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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" From c75b87601b5dbbea1159af2044977997179b48a8 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Sun, 21 Jan 2018 20:33:59 -0500 Subject: [PATCH 3/7] update app updates to complete --- content/bounty/automatic-app-updates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' --- From aa64c7bbf98ccc598075d38b7acd84340d95cb16 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Sun, 21 Jan 2018 20:34:43 -0500 Subject: [PATCH 4/7] change wallet to complete --- content/bounty/paper-wallet.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' --- From 830882832be1fa88c699647ff266d24ef2aadbb5 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Mon, 22 Jan 2018 14:49:33 -0500 Subject: [PATCH 5/7] add note abut vpn/proxy / revoke --- content/faq/rewards.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/faq/rewards.md b/content/faq/rewards.md index 84aeaadc..02d2b9a4 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). **LBRY reserves the right to revoke rewards priveledges on any account if abuse is suspected or if VPN/proxy is being used.** ### 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** ### List of the current LBRY Rewards | Reward | Amount | Description | From 21ee6dcdd7b6a58feac1e87390ba9b7970c5e5da Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Mon, 22 Jan 2018 17:41:14 -0500 Subject: [PATCH 6/7] move to requirements section --- content/faq/rewards.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/faq/rewards.md b/content/faq/rewards.md index 02d2b9a4..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). **LBRY reserves the right to revoke rewards priveledges on any account if abuse is suspected or if VPN/proxy is being used.** +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 | From 98f455e7a334944f916252a9badc6ba0980b15c3 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 22 Jan 2018 19:29:49 -0500 Subject: [PATCH 7/7] better join us page meta --- view/template/page/join-us.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]) ?>