Merge branch 'develop' into feature/activitypub

2018-02-11 09:50:55 +01:00 · 2018-02-11 09:50:55 +01:00 · 52200998c9
commit 52200998c9
parent 4a13b84887 0e2ca77eec
101 changed files with 661 additions and 146 deletions
--- a/priv/static/emoji/blank.png
+++ b/priv/static/emoji/blank.png
--- a/priv/static/emoji/f_00b.png
+++ b/priv/static/emoji/f_00b.png
--- a/priv/static/emoji/f_00b11b.png
+++ b/priv/static/emoji/f_00b11b.png
--- a/priv/static/emoji/f_00b33b.png
+++ b/priv/static/emoji/f_00b33b.png
--- a/priv/static/emoji/f_00h.png
+++ b/priv/static/emoji/f_00h.png
--- a/priv/static/emoji/f_00t.png
+++ b/priv/static/emoji/f_00t.png
--- a/priv/static/emoji/f_01b.png
+++ b/priv/static/emoji/f_01b.png
--- a/priv/static/emoji/f_03b.png
+++ b/priv/static/emoji/f_03b.png
--- a/priv/static/emoji/f_10b.png
+++ b/priv/static/emoji/f_10b.png
--- a/priv/static/emoji/f_11b.png
+++ b/priv/static/emoji/f_11b.png
--- a/priv/static/emoji/f_11b00b.png
+++ b/priv/static/emoji/f_11b00b.png
--- a/priv/static/emoji/f_11b22b.png
+++ b/priv/static/emoji/f_11b22b.png
--- a/priv/static/emoji/f_11h.png
+++ b/priv/static/emoji/f_11h.png
--- a/priv/static/emoji/f_11t.png
+++ b/priv/static/emoji/f_11t.png
--- a/priv/static/emoji/f_12b.png
+++ b/priv/static/emoji/f_12b.png
--- a/priv/static/emoji/f_21b.png
+++ b/priv/static/emoji/f_21b.png
--- a/priv/static/emoji/f_22b.png
+++ b/priv/static/emoji/f_22b.png
--- a/priv/static/emoji/f_22b11b.png
+++ b/priv/static/emoji/f_22b11b.png
--- a/priv/static/emoji/f_22b33b.png
+++ b/priv/static/emoji/f_22b33b.png
--- a/priv/static/emoji/f_22h.png
+++ b/priv/static/emoji/f_22h.png
--- a/priv/static/emoji/f_22t.png
+++ b/priv/static/emoji/f_22t.png
--- a/priv/static/emoji/f_23b.png
+++ b/priv/static/emoji/f_23b.png
--- a/priv/static/emoji/f_30b.png
+++ b/priv/static/emoji/f_30b.png
--- a/priv/static/emoji/f_32b.png
+++ b/priv/static/emoji/f_32b.png
--- a/priv/static/emoji/f_33b.png
+++ b/priv/static/emoji/f_33b.png
--- a/priv/static/emoji/f_33b00b.png
+++ b/priv/static/emoji/f_33b00b.png
--- a/priv/static/emoji/f_33b22b.png
+++ b/priv/static/emoji/f_33b22b.png
--- a/priv/static/emoji/f_33h.png
+++ b/priv/static/emoji/f_33h.png
--- a/priv/static/emoji/f_33t.png
+++ b/priv/static/emoji/f_33t.png
--- a/priv/static/images/avi.png
+++ b/priv/static/images/avi.png
--- a/priv/static/images/banner.png
+++ b/priv/static/images/banner.png
--- a/priv/static/index.html
+++ b/priv/static/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.67f64792f89a96e59442c437c7ded0b3.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.ee87253244897e08bdce.js></script><script type=text/javascript src=/static/js/vendor.50cd70f77f559bfe1f27.js></script><script type=text/javascript src=/static/js/app.fefccf252cac9e1310ea.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.b3deb1dd44970d86cc6b368f36fd09d9.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.15dfe939c498cca9840c.js></script><script type=text/javascript src=/static/js/vendor.409059e5a814f448f5bc.js></script><script type=text/javascript src=/static/js/app.30c01d7540d43b760f03.js></script></body></html>
--- a/priv/static/instance/thumbnail.jpeg
+++ b/priv/static/instance/thumbnail.jpeg
--- a/priv/static/static/config.json
+++ b/priv/static/static/config.json
@ -1,7 +1,7 @@
 {
-  "name": "Pleroma FE",
  "theme": "pleroma-dark",
  "background": "/static/bg.jpg",
  "logo": "/static/logo.png",
-  "registrationOpen": true
+  "defaultPath": "/main/all",
+  "chatDisabled": false
 }
--- a/priv/static/static/css/app.67f64792f89a96e59442c437c7ded0b3.css
+++ b/priv/static/static/css/app.67f64792f89a96e59442c437c7ded0b3.css
--- a/priv/static/static/css/app.67f64792f89a96e59442c437c7ded0b3.css.map
+++ b/priv/static/static/css/app.67f64792f89a96e59442c437c7ded0b3.css.map
--- a/priv/static/static/css/app.b3deb1dd44970d86cc6b368f36fd09d9.css
+++ b/priv/static/static/css/app.b3deb1dd44970d86cc6b368f36fd09d9.css
--- a/priv/static/static/css/app.b3deb1dd44970d86cc6b368f36fd09d9.css.map
+++ b/priv/static/static/css/app.b3deb1dd44970d86cc6b368f36fd09d9.css.map
--- a/priv/static/static/emoji.json
+++ b/priv/static/static/emoji.json
--- a/priv/static/static/js/app.30c01d7540d43b760f03.js
+++ b/priv/static/static/js/app.30c01d7540d43b760f03.js
--- a/priv/static/static/js/app.30c01d7540d43b760f03.js.map
+++ b/priv/static/static/js/app.30c01d7540d43b760f03.js.map
--- a/priv/static/static/js/app.fefccf252cac9e1310ea.js
+++ b/priv/static/static/js/app.fefccf252cac9e1310ea.js
--- a/priv/static/static/js/app.fefccf252cac9e1310ea.js.map
+++ b/priv/static/static/js/app.fefccf252cac9e1310ea.js.map
--- a/priv/static/static/js/manifest.15dfe939c498cca9840c.js
+++ b/priv/static/static/js/manifest.15dfe939c498cca9840c.js
@ -0,0 +1,2 @@
+!function(e){function t(r){if(n[r])return n[r].exports;var a=n[r]={exports:{},id:r,loaded:!1};return e[r].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var r=window.webpackJsonp;window.webpackJsonp=function(o,c){for(var p,l,s=0,i=[];s<o.length;s++)l=o[s],a[l]&&i.push.apply(i,a[l]),a[l]=0;for(p in c)Object.prototype.hasOwnProperty.call(c,p)&&(e[p]=c[p]);for(r&&r(o,c);i.length;)i.shift().call(null,t);if(c[0])return n[0]=0,t(0)};var n={},a={0:0};t.e=function(e,r){if(0===a[e])return r.call(null,t);if(void 0!==a[e])a[e].push(r);else{a[e]=[r];var n=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.src=t.p+"static/js/"+e+"."+{1:"409059e5a814f448f5bc",2:"30c01d7540d43b760f03"}[e]+".js",n.appendChild(o)}},t.m=e,t.c=n,t.p="/"}([]);
+//# sourceMappingURL=manifest.15dfe939c498cca9840c.js.map
--- a/priv/static/static/js/manifest.15dfe939c498cca9840c.js.map
+++ b/priv/static/static/js/manifest.15dfe939c498cca9840c.js.map
--- a/priv/static/static/js/manifest.ee87253244897e08bdce.js
+++ b/priv/static/static/js/manifest.ee87253244897e08bdce.js
@ -1,2 +0,0 @@
-!function(e){function t(n){if(r[n])return r[n].exports;var a=r[n]={exports:{},id:n,loaded:!1};return e[n].call(a.exports,a,a.exports,t),a.loaded=!0,a.exports}var n=window.webpackJsonp;window.webpackJsonp=function(c,o){for(var f,p,s=0,l=[];s<c.length;s++)p=c[s],a[p]&&l.push.apply(l,a[p]),a[p]=0;for(f in o)e[f]=o[f];for(n&&n(c,o);l.length;)l.shift().call(null,t);if(o[0])return r[0]=0,t(0)};var r={},a={0:0};t.e=function(e,n){if(0===a[e])return n.call(null,t);if(void 0!==a[e])a[e].push(n);else{a[e]=[n];var r=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.src=t.p+"static/js/"+e+"."+{1:"50cd70f77f559bfe1f27",2:"fefccf252cac9e1310ea"}[e]+".js",r.appendChild(c)}},t.m=e,t.c=r,t.p="/"}([]);
-//# sourceMappingURL=manifest.ee87253244897e08bdce.js.map
--- a/priv/static/static/js/manifest.ee87253244897e08bdce.js.map
+++ b/priv/static/static/js/manifest.ee87253244897e08bdce.js.map
--- a/priv/static/static/js/vendor.409059e5a814f448f5bc.js
+++ b/priv/static/static/js/vendor.409059e5a814f448f5bc.js
--- a/priv/static/static/js/vendor.409059e5a814f448f5bc.js.map
+++ b/priv/static/static/js/vendor.409059e5a814f448f5bc.js.map
--- a/priv/static/static/js/vendor.50cd70f77f559bfe1f27.js
+++ b/priv/static/static/js/vendor.50cd70f77f559bfe1f27.js
--- a/priv/static/static/js/vendor.50cd70f77f559bfe1f27.js.map
+++ b/priv/static/static/js/vendor.50cd70f77f559bfe1f27.js.map