Merge pull request #936 from lbryio/staging

cuts release from staging
lbryio · Feb 26, 2019 · dfdb933 · dfdb933
2 parents 34e9d0c + c79573f
commit dfdb933
Show file tree

Hide file tree

Showing 17 changed files with 685 additions and 466 deletions.
diff --git a/README.md b/README.md
@@ -118,7 +118,7 @@ Instructions are coming at [lbry-docker] to install your own chainquery instance
 ## Settings
 
 There are a number of settings available for customizing the behavior of your installation.  
-_INSERT LINK TO SETTINGS.MD_
+[Here](https://github.com/lbryio/spee.ch/blob/master/docs/settings.md) is some documentation on them.
 
 ## API
 

diff --git a/cli/defaults/siteConfig.json b/cli/defaults/siteConfig.json
@@ -46,10 +46,7 @@
       "customByContentType": {
         "application/octet-stream": 50000000
       }
-    },
-    "maxSizeImage": 10000000,
-    "maxSizeGif": 50000000,
-    "maxSizeVideo": 50000000
+    }
   },
   "serving": {
     "markdownSettings": {
@@ -92,18 +89,18 @@
       "disallowedTypesExample": ["image", "html"]
     },
     "customFileExtensions": {
-      "application/x-troff-man": ".man",
-      "application/x-troff-me": ".me",
-      "application/x-mif": ".mif",
-      "application/x-troff-ms": ".ms",
-      "application/x-troff": ".roff",
-      "application/x-python-code": ".pyc",
-      "text/x-python": ".py",
-      "application/x-pn-realaudio": ".ram",
-      "application/x-sgml": ".sgm",
-      "model/stl": ".stl",
-      "image/pict": ".pct",
-      "text/xul": ".xul",
+      "application/x-troff-man": "man",
+      "application/x-troff-me": "me",
+      "application/x-mif": "mif",
+      "application/x-troff-ms": "ms",
+      "application/x-troff": "roff",
+      "application/x-python-code": "pyc",
+      "text/x-python": "py",
+      "application/x-pn-realaudio": "ram",
+      "application/x-sgml": "sgm",
+      "model/stl": "stl",
+      "image/pict": "pct",
+      "text/xul": "xul",
       "text/x-go": "go"
     }
   },

diff --git a/client/scss/_asset-preview.scss b/client/scss/_asset-preview.scss
@@ -8,7 +8,7 @@
   height: 280px;
   &:hover {
     border: 1px solid $highlight-border-color;
-    color: #000000;
+    color: $primary-color;
   }
 }
 

diff --git a/client/scss/_input.scss b/client/scss/_input.scss
@@ -8,6 +8,7 @@ input {
   border: 0;
   background-color: $background-color;
   display: inline-block;
+  color: $text-color
 }
 
 .input-slider {

diff --git a/client/scss/_link.scss b/client/scss/_link.scss
@@ -9,7 +9,6 @@ a, a:visited {
 
 .link--nav {
   color: $text-color;
-  border-bottom: 2px solid white;
   &:hover {
     color: $primary-color;
   }
@@ -18,4 +17,4 @@ a, a:visited {
 
 .link--nav-active {
   border-bottom: 2px solid $primary-color;
-}
+}
diff --git a/client/scss/_nav-bar.scss b/client/scss/_nav-bar.scss
@@ -1,15 +1,24 @@
 .nav-bar {
   box-sizing: border-box;
   padding: $thin-padding $primary-padding;
-  background: $base-color;
+  background: $chrome-color;
   flex: 0 1 auto;
   width: 100%;
   border-bottom: $subtle-border;
+  color: $primary-color;
 
   @media (max-width: $break-point-mobile) {
     margin-left: 15px;
     margin-right: 15px;
   }
+  input {
+    background: $chrome-color;
+
+  }
+  select {
+    background: $chrome-color;
+    color: $text-color;
+  }
 }
 
 .nav-bar-link {

diff --git a/client/scss/_variables.scss b/client/scss/_variables.scss
@@ -1,7 +1,7 @@
 //backgrounds
 $base-color: white; //default white
 $card-color: white; //default white
-$chrome-color: lightgray; //default white (navbar)
+$chrome-color: white; //default white (navbar)
 $blockquote-background: #EEEEFF;
 $background-color: $base-color;
 
@@ -19,7 +19,7 @@ $blockquote-text: $text-color;
 $grey: #9095A5;
 $help-color: $grey;
 $subtle-border-color: #DDD;
-$highlight-border-color: #333;
+$highlight-border-color: #777;
 $shadow-color: rgba(169, 173, 186, 0.2);
 $subtle-border: 1px dashed $subtle-border-color;
 $grey-border: $subtle-border-color; //factor this out for all customers

diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx
@@ -151,7 +151,7 @@ class AssetInfo extends React.Component {
           <a
             className={'link--primary'}
             href={`${assetCanonicalUrl}.${fileExt}`}
-            download={name}
+            download={`${name}.${fileExt}`}
           >
             Download
           </a>

diff --git a/docs/settings.md b/docs/settings.md
@@ -39,10 +39,18 @@ PUBLISHING:
     "publishingChannelWhitelist": [],
     "channelClaimBidAmount": "0.1", - When creating a channel, how much you deposit to control the name
     "fileClaimBidAmount": "0.01", - When publishing content, how much you deposit to control the name
-    "maxSizeImage": 10000000, - You may not want people uploading 50GB files. 1000000 = 1MB
-    "maxSizeGif": 50000000,
-    "maxSizeVideo": 50000000
-
+    "fileSizeLimits": {
+      "image": 50000000,
+      "video": 50000000,
+      "audio": 50000000,
+      "text": 10000000,
+      "model": 50000000,
+      "application": 500000000,
+      "customByContentType": {
+        "application/octet-stream": 50000000
+      }
+    }
+
 SERVING:
 
     "markdownSettings": {
@@ -80,9 +88,6 @@ SERVING:
         "html", - potentially DANGEROUS, intended for `serveOnlyApproved = true` environments, includes iframes, divs.
         "parsedHtml"
       ],
-      "disallowedTypesMain": [], - not implemented
-      "disallowedTypesDescriptions": ["image", "html"], - not implemented
-      "disallowedTypesExample": ["image", "html"] - not implemented
     },
     "customFileExtensions": { - suggest a file extension for experimental content types you may be publishing
       "application/example-type": "example"

diff --git a/docs/ubuntuinstall.md b/docs/ubuntuinstall.md
@@ -163,7 +163,7 @@ Log in as username@domainname or username@ip_address
 
   `mysql -u root -p` and then entering your_mysql_password should give you the mysql> shell
 
-# 5 Get Lbrynet Daemon
+# 5 Get Lbrynet SDK Daemon
 
 ## Start tmux
 
@@ -174,11 +174,34 @@ tmux allows you to run multiple things in different sessions. Useful for manuall
   * `tmux`, reenters tmux, then
     * `Ctrl+b`, `(` goes back to through sessions
 
-## Get the daemon
+## Get the SDK
   `wget -O ~/latest_daemon.zip https://lbry.io/get/lbrynet.linux.zip`
 
   `unzip -o -u ~/latest_daemon.zip`
 
+## Customize SDK settings
+
+  These settings will prevent you and your users from spending your server's LBC on paid content. Full documentation is [here](https://lbry.tech/resources/daemon-settings).
+
+  ~$
+  `mkdir .lbrynet`
+
+  `cd .lbrynet`
+
+  `nano daemon_settings.yml`
+
+   copy and paste in the following code (Ctrl+Shift V)
+
+  ```
+  run_reflector_server: false
+  disable_max_key_fee: false
+  max_key_fee: {amount: 0, currency: LBC}
+  use_upnp: false
+  auto_re_reflect_interval: 0
+ ```
+
+ `CONTROL+O` then `CONTROL+X` to save and exit
+
 ## Start the daemon
    `./lbrynet start`