squeegily
/
pleroma
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 42 Wiki Activity
Browse Source

Merge branch '2018-12-10-update-frontend' into 'develop' 

2018 12 10 update frontend

See merge request pleroma/pleroma!534
tags/v0.9.9
lambda 5 years ago
parent
0863ec2737 d6bf06ab4f
commit
37bd32e58b
17 changed files with 57 additions and 56 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      lib/pleroma/user.ex
  2. +1
    -1
      priv/static/index.html
  3. +1
    -0
      priv/static/static/config.json
  4. +0
    -1
      priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css.map
  5. +2
    -2
      priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css
  6. +1
    -0
      priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css.map
  7. +0
    -11
      priv/static/static/js/app.3f7c9aaedc6b87fa9653.js
  8. +0
    -1
      priv/static/static/js/app.3f7c9aaedc6b87fa9653.js.map
  9. +11
    -0
      priv/static/static/js/app.c10f63ec367fc4f92eea.js
  10. +1
    -0
      priv/static/static/js/app.c10f63ec367fc4f92eea.js.map
  11. +0
    -2
      priv/static/static/js/manifest.18df0da570d88ba76ec5.js
  12. +2
    -0
      priv/static/static/js/manifest.f60b0c5412942809e9e3.js
  13. +1
    -1
      priv/static/static/js/manifest.f60b0c5412942809e9e3.js.map
  14. +0
    -34
      priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js
  15. +0
    -1
      priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js.map
  16. +34
    -0
      priv/static/static/js/vendor.3be52ab73ddf60b35112.js
  17. +1
    -0
      priv/static/static/js/vendor.3be52ab73ddf60b35112.js.map

+ 2
- 2
lib/pleroma/user.ex View File

@@ -807,8 +807,8 @@ defmodule Pleroma.User do
end

def parse_bio(bio, user \\ %User{info: %{source_data: %{}}})
def parse_bio(nil, user), do: ""
def parse_bio(bio, user) when bio == "", do: bio
def parse_bio(nil, _user), do: ""
def parse_bio(bio, _user) when bio == "", do: bio

def parse_bio(bio, user) do
mentions = Formatter.parse_mentions(bio)


+ 1
- 1
priv/static/index.html View File

@@ -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.0808aeafc6252b3050ea95b17dcaff1a.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.18df0da570d88ba76ec5.js></script><script type=text/javascript src=/static/js/vendor.0e895ca116d5ba12f2b6.js></script><script type=text/javascript src=/static/js/app.3f7c9aaedc6b87fa9653.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.ef3dfe574a06c79d5c5ca88943ef4673.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.f60b0c5412942809e9e3.js></script><script type=text/javascript src=/static/js/vendor.3be52ab73ddf60b35112.js></script><script type=text/javascript src=/static/js/app.c10f63ec367fc4f92eea.js></script></body></html>

+ 1
- 0
priv/static/static/config.json View File

@@ -13,6 +13,7 @@
"collapseMessageWithSubject": false,
"scopeCopy": false,
"subjectLineBehavior": "email",
"alwaysShowSubjectInput": true,
"hidePostStats": false,
"hideUserStats": false,
"loginMethod": "password"


+ 0
- 1
priv/static/static/css/app.0808aeafc6252b3050ea95b17dcaff1a.css.map
File diff suppressed because it is too large
View File


priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css
File diff suppressed because it is too large
View File


+ 1
- 0
priv/static/static/css/app.ef3dfe574a06c79d5c5ca88943ef4673.css.map
File diff suppressed because it is too large
View File


+ 0
- 11
priv/static/static/js/app.3f7c9aaedc6b87fa9653.js
File diff suppressed because it is too large
View File


+ 0
- 1
priv/static/static/js/app.3f7c9aaedc6b87fa9653.js.map
File diff suppressed because it is too large
View File


+ 11
- 0
priv/static/static/js/app.c10f63ec367fc4f92eea.js
File diff suppressed because it is too large
View File


+ 1
- 0
priv/static/static/js/app.c10f63ec367fc4f92eea.js.map
File diff suppressed because it is too large
View File


+ 0
- 2
priv/static/static/js/manifest.18df0da570d88ba76ec5.js View File

@@ -1,2 +0,0 @@
!function(e){function t(a){if(r[a])return r[a].exports;var n=r[a]={exports:{},id:a,loaded:!1};return e[a].call(n.exports,n,n.exports,t),n.loaded=!0,n.exports}var a=window.webpackJsonp;window.webpackJsonp=function(c,o){for(var p,l,s=0,i=[];s<c.length;s++)l=c[s],n[l]&&i.push.apply(i,n[l]),n[l]=0;for(p in o)Object.prototype.hasOwnProperty.call(o,p)&&(e[p]=o[p]);for(a&&a(c,o);i.length;)i.shift().call(null,t);if(o[0])return r[0]=0,t(0)};var r={},n={0:0};t.e=function(e,a){if(0===n[e])return a.call(null,t);if(void 0!==n[e])n[e].push(a);else{n[e]=[a];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:"0e895ca116d5ba12f2b6",2:"3f7c9aaedc6b87fa9653"}[e]+".js",r.appendChild(c)}},t.m=e,t.c=r,t.p="/"}([]);
//# sourceMappingURL=manifest.18df0da570d88ba76ec5.js.map

+ 2
- 0
priv/static/static/js/manifest.f60b0c5412942809e9e3.js View 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(c,o){for(var p,l,s=0,i=[];s<c.length;s++)l=c[s],a[l]&&i.push.apply(i,a[l]),a[l]=0;for(p in o)Object.prototype.hasOwnProperty.call(o,p)&&(e[p]=o[p]);for(r&&r(c,o);i.length;)i.shift().call(null,t);if(o[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],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.src=t.p+"static/js/"+e+"."+{1:"3be52ab73ddf60b35112",2:"c10f63ec367fc4f92eea"}[e]+".js",n.appendChild(c)}},t.m=e,t.c=n,t.p="/"}([]);
//# sourceMappingURL=manifest.f60b0c5412942809e9e3.js.map

priv/static/static/js/manifest.f60b0c5412942809e9e3.js.map
File diff suppressed because it is too large
View File


+ 0
- 34
priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js
File diff suppressed because it is too large
View File


+ 0
- 1
priv/static/static/js/vendor.0e895ca116d5ba12f2b6.js.map
File diff suppressed because it is too large
View File


+ 34
- 0
priv/static/static/js/vendor.3be52ab73ddf60b35112.js
File diff suppressed because it is too large
View File


+ 1
- 0
priv/static/static/js/vendor.3be52ab73ddf60b35112.js.map
File diff suppressed because it is too large
View File


Write Preview
Loading…
Cancel
Save