Merge branch 'update/pleroma-fe-20180831' into 'develop'
update pleroma frontend See merge request pleroma/pleroma!311
This commit is contained in:
commit
03ecbe0456
16 changed files with 53 additions and 53 deletions
priv/static
index.html
static
config.json
css
app.5ba9f148d51b8e9e88aa093eb3241a0e.cssapp.5ba9f148d51b8e9e88aa093eb3241a0e.css.mapapp.b76dcba564bc8d13e27c546e95fbb72e.cssapp.b76dcba564bc8d13e27c546e95fbb72e.css.map
js
app.6e2e9ee92450f3681b96.jsapp.6e2e9ee92450f3681b96.js.mapapp.d3eba781c5f30aabbb47.jsapp.d3eba781c5f30aabbb47.js.mapmanifest.f70689e27c09390170e6.jsmanifest.f70689e27c09390170e6.js.mapvendor.48cf760f1485c83eb636.jsvendor.48cf760f1485c83eb636.js.mapvendor.5cb6d04a9de200fd9af1.jsvendor.5cb6d04a9de200fd9af1.js.map
|
@ -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=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.b76dcba564bc8d13e27c546e95fbb72e.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.004e63f0a7e5719fbbe8.js></script><script type=text/javascript src=/static/js/vendor.48cf760f1485c83eb636.js></script><script type=text/javascript src=/static/js/app.d3eba781c5f30aabbb47.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=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link href=/static/css/app.5ba9f148d51b8e9e88aa093eb3241a0e.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f70689e27c09390170e6.js></script><script type=text/javascript src=/static/js/vendor.5cb6d04a9de200fd9af1.js></script><script type=text/javascript src=/static/js/app.6e2e9ee92450f3681b96.js></script></body></html>
|
|
@ -2,14 +2,11 @@
|
|||
"theme": "pleroma-dark",
|
||||
"background": "/static/aurora_borealis.jpg",
|
||||
"logo": "/static/logo.png",
|
||||
"logoMask": true,
|
||||
"logoMargin": ".1em",
|
||||
"redirectRootNoLogin": "/main/all",
|
||||
"redirectRootLogin": "/main/friends",
|
||||
"chatDisabled": false,
|
||||
"showWhoToFollowPanel": false,
|
||||
"whoToFollowProvider": "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
|
||||
"whoToFollowProviderDummy2": "https://followlink.osa-p.net/api/get_recommend.json?acct=@{{user}}@{{host}}",
|
||||
"whoToFollowLink": "https://vinayaka.distsn.org/?{{host}}+{{user}}",
|
||||
"whoToFollowLinkDummy2": "https://followlink.osa-p.net/recommend.html",
|
||||
"showInstanceSpecificPanel": false,
|
||||
"scopeOptionsEnabled": false,
|
||||
"collapseMessageWithSubject": false
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
9
priv/static/static/js/app.6e2e9ee92450f3681b96.js
Normal file
9
priv/static/static/js/app.6e2e9ee92450f3681b96.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/app.6e2e9ee92450f3681b96.js.map
Normal file
1
priv/static/static/js/app.6e2e9ee92450f3681b96.js.map
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
priv/static/static/js/manifest.f70689e27c09390170e6.js
Normal file
2
priv/static/static/js/manifest.f70689e27c09390170e6.js
Normal file
|
@ -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,p){for(var c,l,s=0,i=[];s<o.length;s++)l=o[s],a[l]&&i.push.apply(i,a[l]),a[l]=0;for(c in p)Object.prototype.hasOwnProperty.call(p,c)&&(e[c]=p[c]);for(r&&r(o,p);i.length;)i.shift().call(null,t);if(p[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:"5cb6d04a9de200fd9af1",2:"6e2e9ee92450f3681b96"}[e]+".js",n.appendChild(o)}},t.m=e,t.c=n,t.p="/"}([]);
|
||||
//# sourceMappingURL=manifest.f70689e27c09390170e6.js.map
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
33
priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js
Normal file
33
priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js.map
Normal file
1
priv/static/static/js/vendor.5cb6d04a9de200fd9af1.js.map
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue