Skip to content

GitLab

pleroma
pleroma
Commit 337ea3e1 authored by lain's avatar lain
1 Browse files
Options

Merge branch 'hotfix-0.9.999'

parents 5e0a4d1f 480da5d0
Pipeline #8935 passed with stages
      in 6 minutes and 48 seconds
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 21 additions and 12 deletions
      README.md
      View file @ 337ea3e1
      ......@@ -23,7 +23,7 @@ Client applications that are known to work well:
      * Tootle (iOS, No Streaming)
      * Whalebird (Windows + Mac + Linux)
      This is the 0.9.99 release.
      This is the 0.9.999 release.
      If you want to run your own server, feel free to contact us in our dev chat at #pleroma on freenode or via matrix at <https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org>.
      ......
      mix.exs
      View file @ 337ea3e1
      ......@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
      def project do
      [
      app: :pleroma,
      version: version("0.9.99"),
      version: version("0.9.999"),
      elixir: "~> 1.7",
      elixirc_paths: elixirc_paths(Mix.env()),
      compilers: [:phoenix, :gettext] ++ Mix.compilers(),
      ......
      priv/static/index.html
      View file @ 337ea3e1
      <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><!--server-generated-meta--><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.6da3b5e56eb2330b1b175cca622a3d42.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.da7b1e2e94e4118615f9.js></script><script type=text/javascript src=/static/js/vendor.eb5120a656a95e9fe803.js></script><script type=text/javascript src=/static/js/app.878d696f7688bd8709b5.js></script></body></html>
      \ No newline at end of file
      <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>Pleroma</title><!--server-generated-meta--><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.ea66966b753e709d7ce58f910a2c003e.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.0b2f423dda42f0dbbf65.js></script><script type=text/javascript src=/static/js/vendor.e4475fde034685231799.js></script><script type=text/javascript src=/static/js/app.77434de4e756a5d79672.js></script></body></html>
      \ No newline at end of file
      priv/static/static/css/app.6da3b5e56eb2330b1b175cca622a3d42.css deleted 100644 → 0
      View file @ 5e0a4d1f
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/css/app.ea66966b753e709d7ce58f910a2c003e.css 0 → 100644
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/font/LICENSE.txt 100644 → 100755
      View file @ 337ea3e1
      File mode changed from 100644 to 100755
      priv/static/static/font/README.txt 100644 → 100755
      View file @ 337ea3e1
      File mode changed from 100644 to 100755
      priv/static/static/font/config.json 100644 → 100755
      View file @ 337ea3e1
      ......@@ -233,6 +233,12 @@
      "css": "play-circled",
      "code": 61764,
      "src": "fontawesome"
      },
      {
      "uid": "d35a1d35efeb784d1dc9ac18b9b6c2b6",
      "css": "pencil",
      "code": 59416,
      "src": "fontawesome"
      }
      ]
      }
      \ No newline at end of file
      priv/static/static/font/css/animation.css 100644 → 100755
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/font/css/fontello-codes.css 100644 → 100755
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/font/css/fontello-embedded.css 100644 → 100755
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/font/css/fontello-ie7-codes.css 100644 → 100755
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/font/css/fontello-ie7.css 100644 → 100755
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/font/css/fontello.css 100644 → 100755
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/font/demo.html 100644 → 100755
      View file @ 337ea3e1
      ......@@ -229,11 +229,11 @@ body {
      }
      @font-face {
      font-family: 'fontello';
      src: url('./font/fontello.eot?28736547');
      src: url('./font/fontello.eot?28736547#iefix') format('embedded-opentype'),
      url('./font/fontello.woff?28736547') format('woff'),
      url('./font/fontello.ttf?28736547') format('truetype'),
      url('./font/fontello.svg?28736547#fontello') format('svg');
      src: url('./font/fontello.eot?50378338');
      src: url('./font/fontello.eot?50378338#iefix') format('embedded-opentype'),
      url('./font/fontello.woff?50378338') format('woff'),
      url('./font/fontello.ttf?50378338') format('truetype'),
      url('./font/fontello.svg?50378338#fontello') format('svg');
      font-weight: normal;
      font-style: normal;
      }
      ......@@ -334,24 +334,25 @@ body {
      <div class="the-icons span3" title="Code: 0xe817"><i class="demo-icon icon-edit">&#xe817;</i> <span class="i-name">icon-edit</span><span class="i-code">0xe817</span></div>
      </div>
      <div class="row">
      <div class="the-icons span3" title="Code: 0xe818"><i class="demo-icon icon-pencil">&#xe818;</i> <span class="i-name">icon-pencil</span><span class="i-code">0xe818</span></div>
      <div class="the-icons span3" title="Code: 0xe832"><i class="demo-icon icon-spin3 animate-spin">&#xe832;</i> <span class="i-name">icon-spin3</span><span class="i-code">0xe832</span></div>
      <div class="the-icons span3" title="Code: 0xe834"><i class="demo-icon icon-spin4 animate-spin">&#xe834;</i> <span class="i-name">icon-spin4</span><span class="i-code">0xe834</span></div>
      <div class="the-icons span3" title="Code: 0xf08e"><i class="demo-icon icon-link-ext">&#xf08e;</i> <span class="i-name">icon-link-ext</span><span class="i-code">0xf08e</span></div>
      <div class="the-icons span3" title="Code: 0xf08f"><i class="demo-icon icon-link-ext-alt">&#xf08f;</i> <span class="i-name">icon-link-ext-alt</span><span class="i-code">0xf08f</span></div>
      </div>
      <div class="row">
      <div class="the-icons span3" title="Code: 0xf08f"><i class="demo-icon icon-link-ext-alt">&#xf08f;</i> <span class="i-name">icon-link-ext-alt</span><span class="i-code">0xf08f</span></div>
      <div class="the-icons span3" title="Code: 0xf0c9"><i class="demo-icon icon-menu">&#xf0c9;</i> <span class="i-name">icon-menu</span><span class="i-code">0xf0c9</span></div>
      <div class="the-icons span3" title="Code: 0xf0e0"><i class="demo-icon icon-mail-alt">&#xf0e0;</i> <span class="i-name">icon-mail-alt</span><span class="i-code">0xf0e0</span></div>
      <div class="the-icons span3" title="Code: 0xf0e5"><i class="demo-icon icon-comment-empty">&#xf0e5;</i> <span class="i-name">icon-comment-empty</span><span class="i-code">0xf0e5</span></div>
      <div class="the-icons span3" title="Code: 0xf0fe"><i class="demo-icon icon-plus-squared">&#xf0fe;</i> <span class="i-name">icon-plus-squared</span><span class="i-code">0xf0fe</span></div>
      </div>
      <div class="row">
      <div class="the-icons span3" title="Code: 0xf0fe"><i class="demo-icon icon-plus-squared">&#xf0fe;</i> <span class="i-name">icon-plus-squared</span><span class="i-code">0xf0fe</span></div>
      <div class="the-icons span3" title="Code: 0xf112"><i class="demo-icon icon-reply">&#xf112;</i> <span class="i-name">icon-reply</span><span class="i-code">0xf112</span></div>
      <div class="the-icons span3" title="Code: 0xf13e"><i class="demo-icon icon-lock-open-alt">&#xf13e;</i> <span class="i-name">icon-lock-open-alt</span><span class="i-code">0xf13e</span></div>
      <div class="the-icons span3" title="Code: 0xf144"><i class="demo-icon icon-play-circled">&#xf144;</i> <span class="i-name">icon-play-circled</span><span class="i-code">0xf144</span></div>
      <div class="the-icons span3" title="Code: 0xf164"><i class="demo-icon icon-thumbs-up-alt">&#xf164;</i> <span class="i-name">icon-thumbs-up-alt</span><span class="i-code">0xf164</span></div>
      </div>
      <div class="row">
      <div class="the-icons span3" title="Code: 0xf164"><i class="demo-icon icon-thumbs-up-alt">&#xf164;</i> <span class="i-name">icon-thumbs-up-alt</span><span class="i-code">0xf164</span></div>
      <div class="the-icons span3" title="Code: 0xf1e5"><i class="demo-icon icon-binoculars">&#xf1e5;</i> <span class="i-name">icon-binoculars</span><span class="i-code">0xf1e5</span></div>
      <div class="the-icons span3" title="Code: 0xf234"><i class="demo-icon icon-user-plus">&#xf234;</i> <span class="i-name">icon-user-plus</span><span class="i-code">0xf234</span></div>
      </div>
      ......
      priv/static/static/font/font/fontello.eot 100644 → 100755
      View file @ 337ea3e1
      No preview for this file type
      priv/static/static/font/font/fontello.svg 100644 → 100755
      View file @ 337ea3e1
      ......@@ -54,6 +54,8 @@
      <glyph glyph-name="edit" unicode="&#xe817;" d="M496 196l64 65-85 85-64-65v-31h53v-54h32z m245 402q-9 9-18 0l-196-196q-9-9 0-18t18 0l196 196q9 9 0 18z m45-331v-106q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h464q35 0 65-14 9-4 10-13 2-10-5-16l-27-28q-8-8-18-4-13 3-25 3h-464q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v70q0 7 5 12l36 36q8 8 20 4t11-16z m-54 411l161-160-375-375h-161v160z m248-73l-51-52-161 161 51 52q16 15 38 15t38-15l85-85q16-16 16-38t-16-38z" horiz-adv-x="1000" />
      <glyph glyph-name="pencil" unicode="&#xe818;" d="M203 0l50 51-131 131-51-51v-60h72v-71h60z m291 518q0 12-12 12-5 0-9-4l-303-302q-4-4-4-10 0-12 13-12 5 0 9 4l303 302q3 4 3 10z m-30 107l232-232-464-465h-232v233z m381-54q0-29-20-50l-93-93-232 233 93 92q20 21 50 21 29 0 51-21l131-131q20-22 20-51z" horiz-adv-x="857.1" />
      <glyph glyph-name="spin3" unicode="&#xe832;" d="M494 857c-266 0-483-210-494-472-1-19 13-20 13-20l84 0c16 0 19 10 19 18 10 199 176 358 378 358 107 0 205-45 273-118l-58-57c-11-12-11-27 5-31l247-50c21-5 46 11 37 44l-58 227c-2 9-16 22-29 13l-65-60c-89 91-214 148-352 148z m409-508c-16 0-19-10-19-18-10-199-176-358-377-358-108 0-205 45-274 118l59 57c10 12 10 27-5 31l-248 50c-21 5-46-11-37-44l58-227c2-9 16-22 30-13l64 60c89-91 214-148 353-148 265 0 482 210 493 473 1 18-13 19-13 19l-84 0z" horiz-adv-x="1000" />
      <glyph glyph-name="spin4" unicode="&#xe834;" d="M498 857c-114 0-228-39-320-116l0 0c173 140 428 130 588-31 134-134 164-332 89-495-10-29-5-50 12-68 21-20 61-23 84 0 3 3 12 15 15 24 71 180 33 393-112 539-99 98-228 147-356 147z m-409-274c-14 0-29-5-39-16-3-3-13-15-15-24-71-180-34-393 112-539 185-185 479-195 676-31l0 0c-173-140-428-130-589 31-134 134-163 333-89 495 11 29 6 50-12 68-11 11-27 17-44 16z" horiz-adv-x="1001" />
      ......
      priv/static/static/font/font/fontello.ttf 100644 → 100755
      View file @ 337ea3e1
      No preview for this file type
      priv/static/static/font/font/fontello.woff 100644 → 100755
      View file @ 337ea3e1
      No preview for this file type
      priv/static/static/font/font/fontello.woff2 100644 → 100755
      View file @ 337ea3e1
      No preview for this file type
      priv/static/static/js/app.77434de4e756a5d79672.js 0 → 100644
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/js/app.77434de4e756a5d79672.js.map 0 → 100644
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/js/app.878d696f7688bd8709b5.js deleted 100644 → 0
      View file @ 5e0a4d1f
      This diff was suppressed by a .gitattributes entry.
      priv/static/static/js/app.878d696f7688bd8709b5.js.map deleted 100644 → 0
      View file @ 5e0a4d1f
      This diff was suppressed by a .gitattributes entry.
      priv/static/sw-pleroma.js
      View file @ 337ea3e1
      This diff was suppressed by a .gitattributes entry.
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment