From 9aed5786514a7f8ee9c641818c6d75e95824b90c Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Sun, 17 Apr 2016 22:14:04 -0400 Subject: [PATCH 1/5] update dmg to 0.2.2 --- controller/Controller.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/Controller.class.php b/controller/Controller.class.php index 0e8ab0bc..269665f3 100644 --- a/controller/Controller.class.php +++ b/controller/Controller.class.php @@ -54,7 +54,7 @@ class Controller case '/dl/lbry_setup.sh': return static::redirect('https://raw.githubusercontent.com/lbryio/lbry-setup/master/lbry_setup.sh', 307); case '/lbry-osx-latest.dmg': - return static::redirect('https://s3.amazonaws.com/files.lbry.io/osx/lbry.0.2.1.dmg', 307); + return static::redirect('https://s3.amazonaws.com/files.lbry.io/osx/lbry.0.2.2.dmg', 307); case '/lbry-linux-latest.deb': return static::redirect('https://s3.amazonaws.com/files.lbry.io/linux/lbry_0.2.1_amd64.deb', 307); default: From ac5d59605c38992f429fa6fbda5790d5298f08fd Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Wed, 20 Apr 2016 17:20:32 -0400 Subject: [PATCH 2/5] Update Linux header tags --- view/page/linux.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/page/linux.php b/view/page/linux.php index b5beb615..864840c6 100644 --- a/view/page/linux.php +++ b/view/page/linux.php @@ -5,13 +5,13 @@
Choose an install option.
-

For the Efficient and Lazy

+

Casuals

- Download + Download .deb

-

For the Shrewd and Frivolous

+

Masochists Professionals

  1. Clone and follow the build steps for lbryum, a lightweight client for LBRY.
  2. Clone and follow the build steps for lbry, a console based application for using the LBRY protocol.
    3. From befdd1c952afc341223a6d550d92c2e3aa4ff2c1 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Thu, 21 Apr 2016 11:42:38 -0400 Subject: [PATCH 3/5] update to latest deb --- controller/Controller.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/Controller.class.php b/controller/Controller.class.php index 269665f3..9df54d46 100644 --- a/controller/Controller.class.php +++ b/controller/Controller.class.php @@ -56,7 +56,7 @@ class Controller case '/lbry-osx-latest.dmg': return static::redirect('https://s3.amazonaws.com/files.lbry.io/osx/lbry.0.2.2.dmg', 307); case '/lbry-linux-latest.deb': - return static::redirect('https://s3.amazonaws.com/files.lbry.io/linux/lbry_0.2.1_amd64.deb', 307); + return static::redirect('https://s3.amazonaws.com/files.lbry.io/linux/lbry_0.2.2_amd64.deb', 307); default: if (preg_match('#^/blog($|/)#', $uri)) { From 03f529a5721717e1963def83c6df9660ee4fbc6e Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 21 Apr 2016 13:53:55 -0400 Subject: [PATCH 4/5] fix unset index warning --- controller/action/ContentActions.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller/action/ContentActions.class.php b/controller/action/ContentActions.class.php index 1bd56e82..0c07dfd4 100644 --- a/controller/action/ContentActions.class.php +++ b/controller/action/ContentActions.class.php @@ -22,7 +22,7 @@ class ContentActions extends Actions Controller::redirect('/get'); } return ['page/get', [ - 'isSubscribed' => $_GET['email'] || in_array(Mailchimp::LIST_GENERAL_ID, Session::get(Session::KEY_MAILCHIMP_LIST_IDS, [])) + 'isSubscribed' => (isset($_GET['email']) && $_GET['email']) || in_array(Mailchimp::LIST_GENERAL_ID, Session::get(Session::KEY_MAILCHIMP_LIST_IDS, [])) ]]; } // From 4a155b9f7172efbec83ea2f27cfa1452d3ee37da Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 21 Apr 2016 14:24:36 -0400 Subject: [PATCH 5/5] clean up /get to match current processes --- view/get/alphaNotice.php | 4 ++-- view/get/getSharedCli.php | 31 ----------------------------- view/page/get.php | 42 +++++++++++++++++++-------------------- view/page/linux.php | 6 +++--- view/page/osx.php | 2 +- 5 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 view/get/getSharedCli.php diff --git a/view/get/alphaNotice.php b/view/get/alphaNotice.php index bbae97bf..7cbe6b82 100644 --- a/view/get/alphaNotice.php +++ b/view/get/alphaNotice.php @@ -1,4 +1,4 @@ -
    - This is a pre-release, alpha version of LBRY. It is only designed to show what LBRY makes possible. +
    + This is a pre-release, alpha version of LBRY. It is only designed to show what LBRY makes possible. Future releases will involve a full network reboot.
    \ No newline at end of file diff --git a/view/get/getSharedCli.php b/view/get/getSharedCli.php deleted file mode 100644 index 716ce48d..00000000 --- a/view/get/getSharedCli.php +++ /dev/null @@ -1,31 +0,0 @@ - - false]) ?> - -
    -
    -
    - -
    -
    -
    - -
    -

    Test and Earn

    - -

    Test Your Install

    -
      -
    1. Run lbrynet-console from the command line
      2. -
    2. Enter get wonderfullife
      3. -
    3. Continue to play as you desire
      4. -
    -

    Feedback

    -

    - In addition to , your feedback will be personally read by the developers and help signal - interest in LBRY to investors. -

    - Provide Your Feedback -
    -
    -
    - - \ No newline at end of file diff --git a/view/page/get.php b/view/page/get.php index 5c348e26..d552e026 100644 --- a/view/page/get.php +++ b/view/page/get.php @@ -5,36 +5,19 @@
    -
    - -
    -

    -

    LBRY is coming out on your favorite platform soon. Join our list to know when.

    - 'Go', - 'returnUrl' => '/get', - 'listId' => Mailchimp::LIST_GENERAL_ID, - 'mergeFields' => ['CLI' => 'No'], - 'btnClass' => 'btn-alt' - ]) ?> -
    -
    -
    -
    -
    -
    -

    -

    Earn early adopter rewards and interact directly with developers via our Alpha client.

    +

    +

    Earn early adopter rewards for downloading our Alpha client.

    'Go', 'listId' => Mailchimp::LIST_GENERAL_ID, 'mergeFields' => ['CLI' => 'Yes'], 'fbEvent' => 'Alpha', - 'returnUrl' => '/get?email=1' + 'returnUrl' => '/get?email=1', + 'btnClass' => 'btn-alt' ]) ?>
    @@ -56,5 +39,22 @@
    +
    +
    +
    +
    + +
    +

    +

    LBRY is coming out on your favorite platform soon. Join our list to know when.

    + 'Go', + 'returnUrl' => '/get', + 'listId' => Mailchimp::LIST_GENERAL_ID, + 'mergeFields' => ['CLI' => 'No'], + ]) ?> +
    +
    +
    diff --git a/view/page/linux.php b/view/page/linux.php index 864840c6..397988b1 100644 --- a/view/page/linux.php +++ b/view/page/linux.php @@ -1,8 +1,8 @@ -

    Install LBRY on Linux

    +

    Install LBRY on Linux

    -
    Choose an install option.
    +
    Choose your install level.

    Casuals

    @@ -19,4 +19,4 @@
    - $html]) ?> + $html]) ?> diff --git a/view/page/osx.php b/view/page/osx.php index 69c9fd50..ce31dff3 100644 --- a/view/page/osx.php +++ b/view/page/osx.php @@ -1,6 +1,6 @@ -

    Install LBRY on OS X (command line)

    +

    Install LBRY on OS X

    Download for OS X