merge master changes into roadmap

.gitignore

@@ -3,8 +3,10 @@
 /data/config.php
 /data/writeable/*
 /web/css/*
+/web/js/*.gz
 /log
 /web/zohoverify
 nbproject
-
+composer
 .ht*
+/vendor/

LICENSE

@@ -0,0 +1,15 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2016 LBRY Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

autoload.php

@@ -11,7 +11,7 @@ class Autoloader
     }
 
     $class = strtolower($class);
-    $path = isset(static::$classes[$class]) ? static::$classes[$class] : false;
+    $path = static::$classes[$class] ?? false;
 
     if ($path)
     {

composer.json

@@ -0,0 +1,7 @@
+{
+  "name": "lbry/lbry.io",
+  "require": {
+    "php": ">=7.0",
+    "ext-curl": "*"
+  }
+}

composer.lock

@@ -0,0 +1,21 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "37d65c68b462975921781df87dbfb52a",
+    "content-hash": "a9b88596dfa02452b6d63461accdf07f",
+    "packages": [],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=7.0",
+        "ext-curl": "*"
+    },
+    "platform-dev": []
+}

content/bio/alex-grintsvayg.md

@@ -7,4 +7,4 @@ One of Alex's job titles is Wizard, so named because he can seemingly understand
 
 Alex designs and manages scalable infrastructure solutions for SaaS firms, and is leveraging that experience to ensure LBRY's architecture is rock-solid.
 
-Alex is one of three dual-degree graduate from RPI on this team, receiving degrees in Computer Science and Psychology. He is also an alumni of Stuyvesant High School.
+Alex is one of three dual-degree graduates from RPI on this team, receiving degrees in Computer Science and Psychology. He is also an alumnus of Stuyvesant High School.

content/bio/ray-carballada.md

@@ -0,0 +1,10 @@
+---
+name: Ray Carballada
+role: Media Advisor
+---
+Ray Carballada is a creative, accomplished senior business leader in the converging worlds of content: advertising, television, motion pictures, social, and online media.
+
+As former CEO of Alkemy X, Ray led its transformation from a small production company into a fully integrated creative content company with offices in Philadelphia and New York.  Clients include global ad agencies such as BBDO, Gray, and 360i; Fortune 500 brands including Campbell Soup, Samsung, Pepsi and BMW; TV networks including Discovery, Food Network, and HBO; and motion picture studios including Sony and the Weinstein Company.
+
+Alkemy X made the INC 5000 list of the fastest growing companies in the U.S. six times since 2008, and received the “Creative Economy Award for Distinction" from the Arts and Business Council of Greater Philadelphia, as well as 60 Addy and Emmy awards, among others. Ray received his BS in Photography from Rochester Institute of Technology and a Masters in Business Administration from Bucknell University.
+

content/bounty/modified-block-explorer.md

@@ -2,7 +2,7 @@
 category: code
 title: Modified Block Explorer
 award: 1500
-status: available
+status: complete
 date: '2016-07-01'
 ---
 

content/bounty/slack-lbry-url-handler.md

@@ -2,7 +2,7 @@
 category: slack
 title: Create a URL Handler for Slack
 award: 1000
-status: available
+status: complete
 date: '2016-07-01'
 ---
 

content/bounty/web-i18n.md

@@ -2,7 +2,7 @@
 category: web
 title: Internationalization of lbry.io
 award: 1000
-status: available
+status: complete
 date: '2016-07-01'
 ---
 
@@ -14,4 +14,4 @@ To complete this bounty, lbry.io must be modified to:
 - Storing selected language in the user session
 - Reverse look-up your IP and choose a default language if a user has not selected one
 
-[`lbry.io` on GitHub](https://github.com/lbryio/lbry.io)
+[`lbry.io` on GitHub](https://github.com/lbryio/lbry.io)

content/faq/credit-policy.md

@@ -23,7 +23,8 @@ LBRY issues a quarterly report every 3 months in January, April, July, and Octob
 
 | Date | Report | Balance Sheet |
 | ---- | ------ | ------------ |
-| July 2016 | [report](/faq/quarterly-report-july-2016) | [sheet](https://docs.google.com/spreadsheets/d/1r7puheE4Ut4c08R47uCDZbDdMHAoQa0WDqw470gjMIw/edit#gid=0) |
+| Q2 2016 | [report](/faq/quarterly-report-july-2016) | [sheet](https://docs.google.com/spreadsheets/d/1r7puheE4Ut4c08R47uCDZbDdMHAoQa0WDqw470gjMIw/edit#gid=0) |
+| Q3 2016 | [report](/faq/quarterly-report-3q-2016) | [sheet](https://docs.google.com/spreadsheets/d/1zPG58YuLPqpB3yzypntRWouoEVc4saDOifpnvnwS8Rc/edit?ts=57f28d0e#gid=799352054) |
 
 Specific details of historic, ongoing, and anticipated fund expenditures can be seen in the most recent quarterly report.
 

content/faq/earn-credits.md

@@ -7,7 +7,7 @@ Currently, there are five ways to obtain LBRY Credits, or LBC for short.
 
 1. Beta testers get an LBC gift. Talk to us on [Slack](https://slack.lbry.io/) if
    you're interested.
-1. Buy then: see [Exchanges](/faq/exchanges)
+1. Buy them: see [Exchanges](/faq/exchanges)
 1. Mine them: see [Mining](/faq/mining-credits).
 1. Host content: see [Hosting](/faq/host-content) for details. Note that
    hosting requires the LBRY app, which is currently open to beta testers only.

content/faq/exchanges.md

@@ -7,3 +7,6 @@ We are listed on several exchanges. You can buy or sell credits at one of these:
 
 - [Bittrex](https://bittrex.com/Market/Index?MarketName=BTC-LBC)
 - [Poloniex](https://poloniex.com/exchange#btc_lbc)
+- [Shapeshift](https://shapeshift.io)
+- [Changelly](https://changelly.com/exchange/BTC/LBC/1)
+- [BitSquare](https://bitsquare.io/)

content/faq/how-to-check-hashrate.md

@@ -3,6 +3,6 @@ title: How do I check my hashrate?
 category: mining
 ---
 
-IF GPU mining please use the pool dashboard or local mining client UI.
+If GPU mining please use the pool dashboard or local mining client UI.
 
 If CPU mining, you check your hashrate using `lbrycrd-cli gethashespersec`.

content/faq/mining-credits.md

@@ -7,19 +7,19 @@ Block rewards increase every 100 blocks by 1LBC, peak at 500, and decline slowly
 
 For GPU mining, please see our list of [pools](https://lbry.io/faq/mining-pools). Each pool has a slightly different setup so please check their Getting Started page.
 
-For CPU mining, LBRY binaries are out for OS X and Ubuntu. Others may try compiling from source.
+For CPU mining, LBRY binaries are out for OS X, Windows, and Ubuntu. Others may try compiling from source.
+
+You can download the latest binaries [here](https://github.com/lbryio/lbrycrd/releases/latest)
 
 ## Mining on Ubuntu
 
-1. `wget https://s3.amazonaws.com/files.lbry.io/bins.zip`
-1. `unzip bins.zip`
+1. unzip the binaries, and `cd` into the directory containing them
 1. `./lbrycrdd -server -printtoconsole -gen`
 1. If you need to start over, run `rm -rf bins.zip lbry* ~/.lbry*`. **Note:** this will delete your wallet and any credits you may have.
 
 ## Mining on macOS
 
-1. `wget https://s3.amazonaws.com/files.lbry.io/osxbins.zip`
-1. `unzip osxbins.zip`
+1. unzip the binaries, and `cd` into the directory containing them
 1. `mkdir ~/Library/Application\ Support/lbrycrd`
 1. `sudo chown -R "$(whoami)" ~/Library/Application\ Support/lbrycrd`
 1. `echo -e "rpcuser=lbryrpc\nrpcpassword=$(env LC_CTYPE=C LC_ALL=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 16 | xargs)" > ~/Library/Application\ Support/lbrycrd/lbrycrd.conf`

content/faq/quarterly-report-3q-2016.md

@@ -0,0 +1,36 @@
+---
+title: "Quarterly Credit Report: Third Quarter 2016"
+category: policy
+---
+## Summary
+
+This is LBRY's second quarterly report. This quarter we outlaid only 267,778 of the  2,000,000 allocated Community credits. 100,000 operational credits were exchanged with Shapeshift to provide liquidity. No institutional credits were moved or spent.
+
+## Current Balance Sheet
+
+[Available here](https://docs.google.com/spreadsheets/d/1zPG58YuLPqpB3yzypntRWouoEVc4saDOifpnvnwS8Rc/edit?ts=57f28d0e#gid=799352054)
+
+## Overview By Fund
+
+### Community Fund
+
+- 10,600 credits outlaid to community managers
+- 171,251 credits outlaid to Alpha and Beta testers
+- 19,150 credits outlaid to community members for completing bounties
+- 75,777 credits outlaid in Slack tips*
+
+*Some tip outlays were for bounties and to reward early people who stepped up to manage the community before we had a formal program. We have ceased using Slack tips for bounties and community management and will be able to better differentiate these moving forward.
+
+Over the next quarter we anticipate continued substantial use of the Community credits to grow both the user base and the publishing base. We expect these outlays to match or exceed those of this quarter, but not to dramatically exceed these outlays.
+
+### Operational Fund
+
+- 100,000 credits exchanged to ShapeShift to provide liquidity on their platform.
+
+ShapeShift required ownership over a pool of credits to maintain their exchange services. These credits were sold at near-market rates.
+
+We do not anticipate any expenditures from this fund through Q2 2017.
+
+### Institutional Fund
+
+We have no current plans to expend any credits from this fund this quarter, but are examining possibilities. Any institutional fund expenditures at this time would likely come with restrictions that prevent exchange or sale.

content/news/43-ultimate-wizard-meet-alex-grin.md

@@ -8,7 +8,7 @@ Alex Grintsvayg (aka “Grin”) played ultimate frisbee with LBRY founders Jere
 
 Grin has been named LBRY’s *Chief Infrastructure Officer*, but *Wizard* is probably more descriptive of his role on the team. He will contribute to the technical side of the operation, ensuring LBRY’s underlying infrastructure is rock-solid.
 
-![alexgrin](/img/team/grin-644x450.jpg)
+![alexgrin](/img/team/alex-grintsvayg-644x450.jpg)
 
 With degrees in computer science and psychology from Rensselaer Polytechnic Institute, Grin has a unique ability to understand and apply new technologies. He also brings plenty of business knowledge to the table, with six years of experience running startup tech companies. Add to all of that his ultimate-frisbee skills – he played for a national-caliber team for seven years and professionally for the Philly Spinners – and you can see why we’ve dubbed him the Wizard.