Emojies stuff

diff --git a/ap b/ap
index 4b5268c09a088e786be5fa2fcda7daab893ab595..da47fe9e56021678fd5af975557758246e612006 120000 (symlink)
--- a/ap
+++ b/ap
@@ -1 +1 @@
-/raid/servers/ap/
\ No newline at end of file
+/server/ap/
\ No newline at end of file

diff --git a/mix.exs b/mix.exs
index 39befc81d204985bf7f83693d48c87723e76f3f7..57fd193cfa33bf96ff533107bc253b5fcdfb084a 100755 (executable)
--- a/mix.exs
+++ b/mix.exs
@@ -16,11 +16,11 @@ defmodule Pleroma.Mixfile do
       test_coverage: [tool: :covertool, summary: true],
       # Docs
       name: "Pleroma",
-      homepage_url: "https://pleroma.social/",
-      source_url: "https://git.pleroma.social/pleroma/pleroma",
+      homepage_url: "https://annihilation.social/",
+      source_url: "https://git.logografos.com/?p=anni",
       docs: [
         source_url_pattern:
-          "https://git.pleroma.social/pleroma/pleroma/blob/develop/%{path}#L%{line}",
+          "https://git.logografos.com/?p=anni/%{path}#L%{line}",
         logo: "priv/static/images/logo.png",
         extras: ["README.md", "CHANGELOG.md"] ++ Path.wildcard("docs/**/*.md"),
         groups_for_extras: [

diff --git a/patches/5(search_i2p).diff b/patches/5(search_i2p).diff
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4e7d77b5f03427cb0ca913e8e6408d4ce431478e 100755 (executable)
--- a/patches/5(search_i2p).diff
+++ b/patches/5(search_i2p).diff
@@ -0,0 +1 @@
+Linkify in mix.exs and mix.lock is changed

diff --git a/priv/static/adminfe/app.147d87e8.css b/priv/static/adminfe1/app.147d87e8.css
similarity index 100%
rename from priv/static/adminfe/app.147d87e8.css
rename to priv/static/adminfe1/app.147d87e8.css

diff --git a/priv/static/adminfe/chunk-0c3d.79348811.css b/priv/static/adminfe1/chunk-0c3d.79348811.css
similarity index 100%
rename from priv/static/adminfe/chunk-0c3d.79348811.css
rename to priv/static/adminfe1/chunk-0c3d.79348811.css

diff --git a/priv/static/adminfe/chunk-0c60.ee394b7b.css b/priv/static/adminfe1/chunk-0c60.ee394b7b.css
similarity index 100%
rename from priv/static/adminfe/chunk-0c60.ee394b7b.css
rename to priv/static/adminfe1/chunk-0c60.ee394b7b.css

diff --git a/priv/static/adminfe/chunk-0fa6.d224ff3a.css b/priv/static/adminfe1/chunk-0fa6.d224ff3a.css
similarity index 100%
rename from priv/static/adminfe/chunk-0fa6.d224ff3a.css
rename to priv/static/adminfe1/chunk-0fa6.d224ff3a.css

diff --git a/priv/static/adminfe/chunk-1a25.098b6a73.css b/priv/static/adminfe1/chunk-1a25.098b6a73.css
similarity index 100%
rename from priv/static/adminfe/chunk-1a25.098b6a73.css
rename to priv/static/adminfe1/chunk-1a25.098b6a73.css

diff --git a/priv/static/adminfe/chunk-2be3.846d0d5a.css b/priv/static/adminfe1/chunk-2be3.846d0d5a.css
similarity index 100%
rename from priv/static/adminfe/chunk-2be3.846d0d5a.css
rename to priv/static/adminfe1/chunk-2be3.846d0d5a.css

diff --git a/priv/static/adminfe/chunk-2cfa.c090392a.css b/priv/static/adminfe1/chunk-2cfa.c090392a.css
similarity index 100%
rename from priv/static/adminfe/chunk-2cfa.c090392a.css
rename to priv/static/adminfe1/chunk-2cfa.c090392a.css

diff --git a/priv/static/adminfe/chunk-305b.64cc20ab.css b/priv/static/adminfe1/chunk-305b.64cc20ab.css
similarity index 100%
rename from priv/static/adminfe/chunk-305b.64cc20ab.css
rename to priv/static/adminfe1/chunk-305b.64cc20ab.css

diff --git a/priv/static/adminfe/chunk-31b9.abc32430.css b/priv/static/adminfe1/chunk-31b9.abc32430.css
similarity index 100%
rename from priv/static/adminfe/chunk-31b9.abc32430.css
rename to priv/static/adminfe1/chunk-31b9.abc32430.css

diff --git a/priv/static/adminfe/chunk-33c9.3c0c7538.css b/priv/static/adminfe1/chunk-33c9.3c0c7538.css
similarity index 100%
rename from priv/static/adminfe/chunk-33c9.3c0c7538.css
rename to priv/static/adminfe1/chunk-33c9.3c0c7538.css

diff --git a/priv/static/adminfe/chunk-42d5.9ade3c1d.css b/priv/static/adminfe1/chunk-42d5.9ade3c1d.css
similarity index 100%
rename from priv/static/adminfe/chunk-42d5.9ade3c1d.css
rename to priv/static/adminfe1/chunk-42d5.9ade3c1d.css

diff --git a/priv/static/adminfe/chunk-45ed.fc62bc5c.css b/priv/static/adminfe1/chunk-45ed.fc62bc5c.css
similarity index 100%
rename from priv/static/adminfe/chunk-45ed.fc62bc5c.css
rename to priv/static/adminfe1/chunk-45ed.fc62bc5c.css

diff --git a/priv/static/adminfe/chunk-4995.ba9a98d5.css b/priv/static/adminfe1/chunk-4995.ba9a98d5.css
similarity index 100%
rename from priv/static/adminfe/chunk-4995.ba9a98d5.css
rename to priv/static/adminfe1/chunk-4995.ba9a98d5.css

diff --git a/priv/static/adminfe/chunk-5669.9e91529b.css b/priv/static/adminfe1/chunk-5669.9e91529b.css
similarity index 100%
rename from priv/static/adminfe/chunk-5669.9e91529b.css
rename to priv/static/adminfe1/chunk-5669.9e91529b.css

diff --git a/priv/static/adminfe/chunk-59e6.07d1d2f0.css b/priv/static/adminfe1/chunk-59e6.07d1d2f0.css
similarity index 100%
rename from priv/static/adminfe/chunk-59e6.07d1d2f0.css
rename to priv/static/adminfe1/chunk-59e6.07d1d2f0.css

diff --git a/priv/static/adminfe/chunk-5cf2.5bf52c8f.css b/priv/static/adminfe1/chunk-5cf2.5bf52c8f.css
similarity index 100%
rename from priv/static/adminfe/chunk-5cf2.5bf52c8f.css
rename to priv/static/adminfe1/chunk-5cf2.5bf52c8f.css

diff --git a/priv/static/adminfe/chunk-68b6.d7a7a7ea.css b/priv/static/adminfe1/chunk-68b6.d7a7a7ea.css
similarity index 100%
rename from priv/static/adminfe/chunk-68b6.d7a7a7ea.css
rename to priv/static/adminfe1/chunk-68b6.d7a7a7ea.css

diff --git a/priv/static/adminfe/chunk-7c11.5c2bbb9c.css b/priv/static/adminfe1/chunk-7c11.5c2bbb9c.css
similarity index 100%
rename from priv/static/adminfe/chunk-7c11.5c2bbb9c.css
rename to priv/static/adminfe1/chunk-7c11.5c2bbb9c.css

diff --git a/priv/static/adminfe/chunk-elementUI.852ab1db.css b/priv/static/adminfe1/chunk-elementUI.852ab1db.css
similarity index 100%
rename from priv/static/adminfe/chunk-elementUI.852ab1db.css
rename to priv/static/adminfe1/chunk-elementUI.852ab1db.css

diff --git a/priv/static/adminfe/chunk-libs.0b4a26df.css b/priv/static/adminfe1/chunk-libs.0b4a26df.css
similarity index 100%
rename from priv/static/adminfe/chunk-libs.0b4a26df.css
rename to priv/static/adminfe1/chunk-libs.0b4a26df.css

diff --git a/priv/static/adminfe/favicon.ico b/priv/static/adminfe1/favicon.ico
similarity index 100%
rename from priv/static/adminfe/favicon.ico
rename to priv/static/adminfe1/favicon.ico

diff --git a/priv/static/adminfe/index.html b/priv/static/adminfe1/index.html
similarity index 100%
rename from priv/static/adminfe/index.html
rename to priv/static/adminfe1/index.html

diff --git a/priv/static/adminfe/static/fonts/element-icons.535877f.woff b/priv/static/adminfe1/static/fonts/element-icons.535877f.woff
similarity index 100%
rename from priv/static/adminfe/static/fonts/element-icons.535877f.woff
rename to priv/static/adminfe1/static/fonts/element-icons.535877f.woff

diff --git a/priv/static/adminfe/static/fonts/element-icons.732389d.ttf b/priv/static/adminfe1/static/fonts/element-icons.732389d.ttf
similarity index 100%
rename from priv/static/adminfe/static/fonts/element-icons.732389d.ttf
rename to priv/static/adminfe1/static/fonts/element-icons.732389d.ttf

diff --git a/priv/static/adminfe/static/js/7zzA.e1ae1c94.js b/priv/static/adminfe1/static/js/7zzA.e1ae1c94.js
similarity index 100%
rename from priv/static/adminfe/static/js/7zzA.e1ae1c94.js
rename to priv/static/adminfe1/static/js/7zzA.e1ae1c94.js

diff --git a/priv/static/adminfe/static/js/7zzA.e1ae1c94.js.map b/priv/static/adminfe1/static/js/7zzA.e1ae1c94.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/7zzA.e1ae1c94.js.map
rename to priv/static/adminfe1/static/js/7zzA.e1ae1c94.js.map

diff --git a/priv/static/adminfe/static/js/JEtC.f9ba4594.js b/priv/static/adminfe1/static/js/JEtC.f9ba4594.js
similarity index 100%
rename from priv/static/adminfe/static/js/JEtC.f9ba4594.js
rename to priv/static/adminfe1/static/js/JEtC.f9ba4594.js

diff --git a/priv/static/adminfe/static/js/JEtC.f9ba4594.js.map b/priv/static/adminfe1/static/js/JEtC.f9ba4594.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/JEtC.f9ba4594.js.map
rename to priv/static/adminfe1/static/js/JEtC.f9ba4594.js.map

diff --git a/priv/static/adminfe/static/js/app.c3e187df.js b/priv/static/adminfe1/static/js/app.c3e187df.js
similarity index 100%
rename from priv/static/adminfe/static/js/app.c3e187df.js
rename to priv/static/adminfe1/static/js/app.c3e187df.js

diff --git a/priv/static/adminfe/static/js/app.c3e187df.js.map b/priv/static/adminfe1/static/js/app.c3e187df.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/app.c3e187df.js.map
rename to priv/static/adminfe1/static/js/app.c3e187df.js.map

diff --git a/priv/static/adminfe/static/js/chunk-0c3d.00a00ec3.js b/priv/static/adminfe1/static/js/chunk-0c3d.00a00ec3.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0c3d.00a00ec3.js
rename to priv/static/adminfe1/static/js/chunk-0c3d.00a00ec3.js

diff --git a/priv/static/adminfe/static/js/chunk-0c3d.00a00ec3.js.map b/priv/static/adminfe1/static/js/chunk-0c3d.00a00ec3.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0c3d.00a00ec3.js.map
rename to priv/static/adminfe1/static/js/chunk-0c3d.00a00ec3.js.map

diff --git a/priv/static/adminfe/static/js/chunk-0c60.e0f08810.js b/priv/static/adminfe1/static/js/chunk-0c60.e0f08810.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0c60.e0f08810.js
rename to priv/static/adminfe1/static/js/chunk-0c60.e0f08810.js

diff --git a/priv/static/adminfe/static/js/chunk-0c60.e0f08810.js.map b/priv/static/adminfe1/static/js/chunk-0c60.e0f08810.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0c60.e0f08810.js.map
rename to priv/static/adminfe1/static/js/chunk-0c60.e0f08810.js.map

diff --git a/priv/static/adminfe/static/js/chunk-0e2d.04760e2c.js b/priv/static/adminfe1/static/js/chunk-0e2d.04760e2c.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0e2d.04760e2c.js
rename to priv/static/adminfe1/static/js/chunk-0e2d.04760e2c.js

diff --git a/priv/static/adminfe/static/js/chunk-0e2d.04760e2c.js.map b/priv/static/adminfe1/static/js/chunk-0e2d.04760e2c.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0e2d.04760e2c.js.map
rename to priv/static/adminfe1/static/js/chunk-0e2d.04760e2c.js.map

diff --git a/priv/static/adminfe/static/js/chunk-0fa6.ddd4199e.js b/priv/static/adminfe1/static/js/chunk-0fa6.ddd4199e.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0fa6.ddd4199e.js
rename to priv/static/adminfe1/static/js/chunk-0fa6.ddd4199e.js

diff --git a/priv/static/adminfe/static/js/chunk-0fa6.ddd4199e.js.map b/priv/static/adminfe1/static/js/chunk-0fa6.ddd4199e.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-0fa6.ddd4199e.js.map
rename to priv/static/adminfe1/static/js/chunk-0fa6.ddd4199e.js.map

diff --git a/priv/static/adminfe/static/js/chunk-16d0.7d343bb9.js b/priv/static/adminfe1/static/js/chunk-16d0.7d343bb9.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-16d0.7d343bb9.js
rename to priv/static/adminfe1/static/js/chunk-16d0.7d343bb9.js

diff --git a/priv/static/adminfe/static/js/chunk-16d0.7d343bb9.js.map b/priv/static/adminfe1/static/js/chunk-16d0.7d343bb9.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-16d0.7d343bb9.js.map
rename to priv/static/adminfe1/static/js/chunk-16d0.7d343bb9.js.map

diff --git a/priv/static/adminfe/static/js/chunk-1a25.107c34e7.js b/priv/static/adminfe1/static/js/chunk-1a25.107c34e7.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-1a25.107c34e7.js
rename to priv/static/adminfe1/static/js/chunk-1a25.107c34e7.js

diff --git a/priv/static/adminfe/static/js/chunk-1a25.107c34e7.js.map b/priv/static/adminfe1/static/js/chunk-1a25.107c34e7.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-1a25.107c34e7.js.map
rename to priv/static/adminfe1/static/js/chunk-1a25.107c34e7.js.map

diff --git a/priv/static/adminfe/static/js/chunk-2be3.7b7c045e.js b/priv/static/adminfe1/static/js/chunk-2be3.7b7c045e.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-2be3.7b7c045e.js
rename to priv/static/adminfe1/static/js/chunk-2be3.7b7c045e.js

diff --git a/priv/static/adminfe/static/js/chunk-2be3.7b7c045e.js.map b/priv/static/adminfe1/static/js/chunk-2be3.7b7c045e.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-2be3.7b7c045e.js.map
rename to priv/static/adminfe1/static/js/chunk-2be3.7b7c045e.js.map

diff --git a/priv/static/adminfe/static/js/chunk-2cfa.608c3714.js b/priv/static/adminfe1/static/js/chunk-2cfa.608c3714.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-2cfa.608c3714.js
rename to priv/static/adminfe1/static/js/chunk-2cfa.608c3714.js

diff --git a/priv/static/adminfe/static/js/chunk-2cfa.608c3714.js.map b/priv/static/adminfe1/static/js/chunk-2cfa.608c3714.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-2cfa.608c3714.js.map
rename to priv/static/adminfe1/static/js/chunk-2cfa.608c3714.js.map

diff --git a/priv/static/adminfe/static/js/chunk-305b.3a7fb27b.js b/priv/static/adminfe1/static/js/chunk-305b.3a7fb27b.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-305b.3a7fb27b.js
rename to priv/static/adminfe1/static/js/chunk-305b.3a7fb27b.js

diff --git a/priv/static/adminfe/static/js/chunk-305b.3a7fb27b.js.map b/priv/static/adminfe1/static/js/chunk-305b.3a7fb27b.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-305b.3a7fb27b.js.map
rename to priv/static/adminfe1/static/js/chunk-305b.3a7fb27b.js.map

diff --git a/priv/static/adminfe/static/js/chunk-319f.8919d1e7.js b/priv/static/adminfe1/static/js/chunk-319f.8919d1e7.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-319f.8919d1e7.js
rename to priv/static/adminfe1/static/js/chunk-319f.8919d1e7.js

diff --git a/priv/static/adminfe/static/js/chunk-319f.8919d1e7.js.map b/priv/static/adminfe1/static/js/chunk-319f.8919d1e7.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-319f.8919d1e7.js.map
rename to priv/static/adminfe1/static/js/chunk-319f.8919d1e7.js.map

diff --git a/priv/static/adminfe/static/js/chunk-31b9.7b89f7b5.js b/priv/static/adminfe1/static/js/chunk-31b9.7b89f7b5.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-31b9.7b89f7b5.js
rename to priv/static/adminfe1/static/js/chunk-31b9.7b89f7b5.js

diff --git a/priv/static/adminfe/static/js/chunk-31b9.7b89f7b5.js.map b/priv/static/adminfe1/static/js/chunk-31b9.7b89f7b5.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-31b9.7b89f7b5.js.map
rename to priv/static/adminfe1/static/js/chunk-31b9.7b89f7b5.js.map

diff --git a/priv/static/adminfe/static/js/chunk-33c9.cf3bdd1b.js b/priv/static/adminfe1/static/js/chunk-33c9.cf3bdd1b.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-33c9.cf3bdd1b.js
rename to priv/static/adminfe1/static/js/chunk-33c9.cf3bdd1b.js

diff --git a/priv/static/adminfe/static/js/chunk-33c9.cf3bdd1b.js.map b/priv/static/adminfe1/static/js/chunk-33c9.cf3bdd1b.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-33c9.cf3bdd1b.js.map
rename to priv/static/adminfe1/static/js/chunk-33c9.cf3bdd1b.js.map

diff --git a/priv/static/adminfe/static/js/chunk-42d5.f83ab775.js b/priv/static/adminfe1/static/js/chunk-42d5.f83ab775.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-42d5.f83ab775.js
rename to priv/static/adminfe1/static/js/chunk-42d5.f83ab775.js

diff --git a/priv/static/adminfe/static/js/chunk-42d5.f83ab775.js.map b/priv/static/adminfe1/static/js/chunk-42d5.f83ab775.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-42d5.f83ab775.js.map
rename to priv/static/adminfe1/static/js/chunk-42d5.f83ab775.js.map

diff --git a/priv/static/adminfe/static/js/chunk-45ed.10b6b7a7.js b/priv/static/adminfe1/static/js/chunk-45ed.10b6b7a7.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-45ed.10b6b7a7.js
rename to priv/static/adminfe1/static/js/chunk-45ed.10b6b7a7.js

diff --git a/priv/static/adminfe/static/js/chunk-45ed.10b6b7a7.js.map b/priv/static/adminfe1/static/js/chunk-45ed.10b6b7a7.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-45ed.10b6b7a7.js.map
rename to priv/static/adminfe1/static/js/chunk-45ed.10b6b7a7.js.map

diff --git a/priv/static/adminfe/static/js/chunk-4995.94e052fc.js b/priv/static/adminfe1/static/js/chunk-4995.94e052fc.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-4995.94e052fc.js
rename to priv/static/adminfe1/static/js/chunk-4995.94e052fc.js

diff --git a/priv/static/adminfe/static/js/chunk-4995.94e052fc.js.map b/priv/static/adminfe1/static/js/chunk-4995.94e052fc.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-4995.94e052fc.js.map
rename to priv/static/adminfe1/static/js/chunk-4995.94e052fc.js.map

diff --git a/priv/static/adminfe/static/js/chunk-5669.88725eaa.js b/priv/static/adminfe1/static/js/chunk-5669.88725eaa.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-5669.88725eaa.js
rename to priv/static/adminfe1/static/js/chunk-5669.88725eaa.js

diff --git a/priv/static/adminfe/static/js/chunk-5669.88725eaa.js.map b/priv/static/adminfe1/static/js/chunk-5669.88725eaa.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-5669.88725eaa.js.map
rename to priv/static/adminfe1/static/js/chunk-5669.88725eaa.js.map

diff --git a/priv/static/adminfe/static/js/chunk-59e6.01e205d8.js b/priv/static/adminfe1/static/js/chunk-59e6.01e205d8.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-59e6.01e205d8.js
rename to priv/static/adminfe1/static/js/chunk-59e6.01e205d8.js

diff --git a/priv/static/adminfe/static/js/chunk-59e6.01e205d8.js.map b/priv/static/adminfe1/static/js/chunk-59e6.01e205d8.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-59e6.01e205d8.js.map
rename to priv/static/adminfe1/static/js/chunk-59e6.01e205d8.js.map

diff --git a/priv/static/adminfe/static/js/chunk-5cf2.a8562f1f.js b/priv/static/adminfe1/static/js/chunk-5cf2.a8562f1f.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-5cf2.a8562f1f.js
rename to priv/static/adminfe1/static/js/chunk-5cf2.a8562f1f.js

diff --git a/priv/static/adminfe/static/js/chunk-5cf2.a8562f1f.js.map b/priv/static/adminfe1/static/js/chunk-5cf2.a8562f1f.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-5cf2.a8562f1f.js.map
rename to priv/static/adminfe1/static/js/chunk-5cf2.a8562f1f.js.map

diff --git a/priv/static/adminfe/static/js/chunk-68b6.4347fd87.js b/priv/static/adminfe1/static/js/chunk-68b6.4347fd87.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-68b6.4347fd87.js
rename to priv/static/adminfe1/static/js/chunk-68b6.4347fd87.js

diff --git a/priv/static/adminfe/static/js/chunk-68b6.4347fd87.js.map b/priv/static/adminfe1/static/js/chunk-68b6.4347fd87.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-68b6.4347fd87.js.map
rename to priv/static/adminfe1/static/js/chunk-68b6.4347fd87.js.map

diff --git a/priv/static/adminfe/static/js/chunk-7c11.b858969e.js b/priv/static/adminfe1/static/js/chunk-7c11.b858969e.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-7c11.b858969e.js
rename to priv/static/adminfe1/static/js/chunk-7c11.b858969e.js

diff --git a/priv/static/adminfe/static/js/chunk-7c11.b858969e.js.map b/priv/static/adminfe1/static/js/chunk-7c11.b858969e.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-7c11.b858969e.js.map
rename to priv/static/adminfe1/static/js/chunk-7c11.b858969e.js.map

diff --git a/priv/static/adminfe/static/js/chunk-elementUI.bec6fa77.js b/priv/static/adminfe1/static/js/chunk-elementUI.bec6fa77.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-elementUI.bec6fa77.js
rename to priv/static/adminfe1/static/js/chunk-elementUI.bec6fa77.js

diff --git a/priv/static/adminfe/static/js/chunk-elementUI.bec6fa77.js.map b/priv/static/adminfe1/static/js/chunk-elementUI.bec6fa77.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-elementUI.bec6fa77.js.map
rename to priv/static/adminfe1/static/js/chunk-elementUI.bec6fa77.js.map

diff --git a/priv/static/adminfe/static/js/chunk-libs.eb232bda.js b/priv/static/adminfe1/static/js/chunk-libs.eb232bda.js
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-libs.eb232bda.js
rename to priv/static/adminfe1/static/js/chunk-libs.eb232bda.js

diff --git a/priv/static/adminfe/static/js/chunk-libs.eb232bda.js.map b/priv/static/adminfe1/static/js/chunk-libs.eb232bda.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/chunk-libs.eb232bda.js.map
rename to priv/static/adminfe1/static/js/chunk-libs.eb232bda.js.map

diff --git a/priv/static/adminfe/static/js/oAJy.25bb7cc7.js b/priv/static/adminfe1/static/js/oAJy.25bb7cc7.js
similarity index 100%
rename from priv/static/adminfe/static/js/oAJy.25bb7cc7.js
rename to priv/static/adminfe1/static/js/oAJy.25bb7cc7.js

diff --git a/priv/static/adminfe/static/js/oAJy.25bb7cc7.js.map b/priv/static/adminfe1/static/js/oAJy.25bb7cc7.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/oAJy.25bb7cc7.js.map
rename to priv/static/adminfe1/static/js/oAJy.25bb7cc7.js.map

diff --git a/priv/static/adminfe/static/js/runtime.f1a41c33.js b/priv/static/adminfe1/static/js/runtime.f1a41c33.js
similarity index 100%
rename from priv/static/adminfe/static/js/runtime.f1a41c33.js
rename to priv/static/adminfe1/static/js/runtime.f1a41c33.js

diff --git a/priv/static/adminfe/static/js/runtime.f1a41c33.js.map b/priv/static/adminfe1/static/js/runtime.f1a41c33.js.map
similarity index 100%
rename from priv/static/adminfe/static/js/runtime.f1a41c33.js.map
rename to priv/static/adminfe1/static/js/runtime.f1a41c33.js.map

diff --git a/static/emoji/kek/.pack.json.un~ b/static/emoji/kek/.pack.json.un~
index 9102c379fdf0aadd47567ed89305043f066f0868..d517fd8f44aba4fb2a00bb8cc1c4c752786486fb 100755 (executable)
Binary files a/static/emoji/kek/.pack.json.un~ and b/static/emoji/kek/.pack.json.un~ differ

diff --git a/static/emoji/kek/1681509580066640.png b/static/emoji/kek/a_openbsd.png
similarity index 100%
rename from static/emoji/kek/1681509580066640.png
rename to static/emoji/kek/a_openbsd.png

diff --git a/static/emoji/kek/alex_huh.png b/static/emoji/kek/alex_huh.png
new file mode 100644 (file)
index 0000000..352edaa
Binary files /dev/null and b/static/emoji/kek/alex_huh.png differ

diff --git a/static/emoji/kek/apu_see_and_say_farmer.png b/static/emoji/kek/based.png
similarity index 100%
rename from static/emoji/kek/apu_see_and_say_farmer.png
rename to static/emoji/kek/based.png

diff --git a/static/emoji/kek/C05522B5-2BC0-46FC-A0CC-837CF552DCC8.png b/static/emoji/kek/biznus.png
similarity index 100%
rename from static/emoji/kek/C05522B5-2BC0-46FC-A0CC-837CF552DCC8.png
rename to static/emoji/kek/biznus.png

diff --git a/static/emoji/kek/cunny.png b/static/emoji/kek/cunny.png
new file mode 100644 (file)
index 0000000..df6e5a7
Binary files /dev/null and b/static/emoji/kek/cunny.png differ

diff --git a/static/emoji/kek/eb25679f7d871c24e3a3ab50ea89bf52e07e4ccd456efc1f63246c592e489098.png b/static/emoji/kek/goth_gf.png
similarity index 100%
rename from static/emoji/kek/eb25679f7d871c24e3a3ab50ea89bf52e07e4ccd456efc1f63246c592e489098.png
rename to static/emoji/kek/goth_gf.png

diff --git a/static/emoji/kek/pack.json b/static/emoji/kek/pack.json
index 12aeab765b8dad41a10fb64d92f9fda36a111411..4053dfa502380680179ea5bd576f0e22c15ebe8e 100755 (executable)
--- a/static/emoji/kek/pack.json
+++ b/static/emoji/kek/pack.json
@@ -2,7 +2,8 @@
   "files": {
     "mr_regan": "mrregan.png",
     "oj_sad": "oj_sad.png",
-    "chink_soup": "chink_soup.png",
+    "cunny": "cunny.png",
+     "chink_soup": "chink_soup.png",
     "shutuppoastuser": "shutuppoastuser.png",
     "vault_7": "vault_7.png",
     "oj_laugh": "oj_laugh.png",
@@ -23,6 +24,7 @@
     "dance": "1636330811762.gif",
     "pepe_taketheshot": "pepe_taketheshot.png",
     "pepe_tea": "pepe_tea.png",
+    "alex_lol": "alex_lol.png",
     "pepe_cofe": "inquiring_frog.png",
     "dubs": "1636564709982.png",
     "pepe_drink_capri": "pepe-drinking-capri-sun.png",
@@ -101,17 +103,21 @@
     "troll": "1636660554221.png",
     "spangler": "spangler.jpg",
     "terry_gross": "terry_gross.png",
-    "biznus": "C05522B5-2BC0-46FC-A0CC-837CF552DCC8.png",
-    "based": "apu_see_and_say_farmer.png",
+    "biznus": "biznus.png",
+    "based": "based.png",
     "rifu": "c9edfb103365012d.png",
     "mfw": "mfw.png",
-    "goth_gf": "eb25679f7d871c24e3a3ab50ea89bf52e07e4ccd456efc1f63246c592e489098.png",
+    "goth_gf": "goth_gf.png",
     "jackdripper": "jackdripper.png",
-    "troon_land": "ba279a2d167cb1749e1fcb470f16facbcbf78538680f6da72efe6b08475e7df5.png",
+    "troon_land": "troon_land.png",
     "dude_mad": "dude_mad.png",
-    "a_openbsd": "1681509580066640.png",
+    "pepe_cat": "pepe_cat.gif",
+    "pepe_cofe_2": "pepe_cofe_2.png",
+    "tony": "tony.png",
+    "a_openbsd": "a_openbsd.png",
+    "pepe_cofe_2_mad": "pepe_cofe_2_mad.png",
     "grrungy_pepe": "grrungypepe.jpg",
-    "pepe_gun": "1665656990154.png"
+    "pepe_gun": "pepe_gun.png"
   },
   "pack": {
     "description": "based af",

diff --git a/static/emoji/kek/pack.json~ b/static/emoji/kek/pack.json~
index 12aeab765b8dad41a10fb64d92f9fda36a111411..c4ec3bea7620abafd6bd4b3ea3778b695332e02c 100755 (executable)
--- a/static/emoji/kek/pack.json~
+++ b/static/emoji/kek/pack.json~
@@ -2,7 +2,8 @@
   "files": {
     "mr_regan": "mrregan.png",
     "oj_sad": "oj_sad.png",
-    "chink_soup": "chink_soup.png",
+    "cunny": "cunny.png",
+     "chink_soup": "chink_soup.png",
     "shutuppoastuser": "shutuppoastuser.png",
     "vault_7": "vault_7.png",
     "oj_laugh": "oj_laugh.png",
@@ -23,6 +24,7 @@
     "dance": "1636330811762.gif",
     "pepe_taketheshot": "pepe_taketheshot.png",
     "pepe_tea": "pepe_tea.png",
+    "alex_lol": "alex_lol.png",
     "pepe_cofe": "inquiring_frog.png",
     "dubs": "1636564709982.png",
     "pepe_drink_capri": "pepe-drinking-capri-sun.png",
@@ -101,17 +103,21 @@
     "troll": "1636660554221.png",
     "spangler": "spangler.jpg",
     "terry_gross": "terry_gross.png",
-    "biznus": "C05522B5-2BC0-46FC-A0CC-837CF552DCC8.png",
-    "based": "apu_see_and_say_farmer.png",
+    "biznus": "biznus.png",
+    "based": "based.png",
     "rifu": "c9edfb103365012d.png",
     "mfw": "mfw.png",
-    "goth_gf": "eb25679f7d871c24e3a3ab50ea89bf52e07e4ccd456efc1f63246c592e489098.png",
+    "goth_gf": "goth_gf.png",
     "jackdripper": "jackdripper.png",
-    "troon_land": "ba279a2d167cb1749e1fcb470f16facbcbf78538680f6da72efe6b08475e7df5.png",
+    "troon_land": "troon_land.png",
     "dude_mad": "dude_mad.png",
-    "a_openbsd": "1681509580066640.png",
+    "pepe_cat": "pepe_cat.gif",
+    "pepe_cofe_2": "pepe_cofe_2.png",
+    "tony": : "tony.png",
+    "a_openbsd": "a_openbsd.png",
+    "pepe_cofe_2_mad": "pepe_cofe_2_mad.png",
     "grrungy_pepe": "grrungypepe.jpg",
-    "pepe_gun": "1665656990154.png"
+    "pepe_gun": "pepe_gun.png"
   },
   "pack": {
     "description": "based af",

diff --git a/static/emoji/kek/pepe_cat.gif b/static/emoji/kek/pepe_cat.gif
new file mode 100644 (file)
index 0000000..c1a95a3
Binary files /dev/null and b/static/emoji/kek/pepe_cat.gif differ

diff --git a/static/emoji/kek/pepe_cofe_2.png b/static/emoji/kek/pepe_cofe_2.png
new file mode 100644 (file)
index 0000000..0016a05
Binary files /dev/null and b/static/emoji/kek/pepe_cofe_2.png differ

diff --git a/static/emoji/kek/pepe_cofe_2_mad.png b/static/emoji/kek/pepe_cofe_2_mad.png
new file mode 100644 (file)
index 0000000..a800874
Binary files /dev/null and b/static/emoji/kek/pepe_cofe_2_mad.png differ

diff --git a/static/emoji/kek/1665656990154.png b/static/emoji/kek/pepe_gun.png
similarity index 100%
rename from static/emoji/kek/1665656990154.png
rename to static/emoji/kek/pepe_gun.png

diff --git a/static/emoji/kek/tony.png b/static/emoji/kek/tony.png
new file mode 100644 (file)
index 0000000..925cfa5
Binary files /dev/null and b/static/emoji/kek/tony.png differ

diff --git a/static/emoji/kek/ba279a2d167cb1749e1fcb470f16facbcbf78538680f6da72efe6b08475e7df5.png b/static/emoji/kek/troon_land.png
similarity index 100%
rename from static/emoji/kek/ba279a2d167cb1749e1fcb470f16facbcbf78538680f6da72efe6b08475e7df5.png
rename to static/emoji/kek/troon_land.png

diff --git a/static/emoji/os_emojies/.pack.json.un~ b/static/emoji/os_emojies/.pack.json.un~
new file mode 100755 (executable)
index 0000000..ddd73e5
Binary files /dev/null and b/static/emoji/os_emojies/.pack.json.un~ differ

diff --git a/static/emoji/os_emojies/Arch-linux-logo-1602415784 b/static/emoji/os_emojies/arch.png
similarity index 100%
rename from static/emoji/os_emojies/Arch-linux-logo-1602415784
rename to static/emoji/os_emojies/arch.png

diff --git a/static/emoji/os_emojies/crux.png b/static/emoji/os_emojies/crux.png
new file mode 100644 (file)
index 0000000..30ba3f1
Binary files /dev/null and b/static/emoji/os_emojies/crux.png differ

diff --git a/static/emoji/os_emojies/debian-2-logo-png-transparent-2413097916 b/static/emoji/os_emojies/debian.png
similarity index 100%
rename from static/emoji/os_emojies/debian-2-logo-png-transparent-2413097916
rename to static/emoji/os_emojies/debian.png

diff --git a/static/emoji/os_emojies/pack.json b/static/emoji/os_emojies/pack.json
index 5f09badd5367d3082ee121903676aa7779c72091..fb48f698639d50c45377a4081daadaa2fd01cc82 100755 (executable)
--- a/static/emoji/os_emojies/pack.json
+++ b/static/emoji/os_emojies/pack.json
@@ -1,17 +1,18 @@
 {
   "files": {
-    "arch": "Arch-linux-logo-1602415784",
-    "debian": "debian-2-logo-png-transparent-2413097916",
+    "arch": "arch.png",
+    "crux": "crux.png",
+    "debian": "debian.png",
     "freebsd": "freebsd.png",
-    "puffy": "puffy-3288799037",
-    "qubeos": "2b388a8bc0ec60c6.png",
-    "ratposien": "2a05af87d93c2553150a18a8279210f0df7753c735d84b5203177e009045a940(1).png"
+    "puffy": "puffy.png",
+    "qubeos": "qube_os.png",
+    "rat_poison": "rat_poison.png"
   },
   "pack": {
-    "can-download": false,
+    "can-download": true,
     "description": "I really don't know what I'm doing",
-    "homepage": "pp.dembased.xyz",
+    "homepage": "poop",
     "license": "BSD"
   },
   "files_count": 6
-}
\ No newline at end of file
+}

diff --git a/static/emoji/os_emojies/pack.json~ b/static/emoji/os_emojies/pack.json~
new file mode 100755 (executable)
index 0000000..8b85057
--- /dev/null
+++ b/static/emoji/os_emojies/pack.json~
@@ -0,0 +1,17 @@
+{
+  "files": {
+    "arch": "arch.png",
+    "debian": "debian.png",
+    "freebsd": "freebsd.png",
+    "puffy": "puffy.png",
+    "qubeos": "qube_os.png",
+    "rat_poison": "rat_poison.png"
+  },
+  "pack": {
+    "can-download": true,
+    "description": "I really don't know what I'm doing",
+    "homepage": "poop",
+    "license": "BSD"
+  },
+  "files_count": 6
+}

diff --git a/static/emoji/os_emojies/puffy-3288799037 b/static/emoji/os_emojies/puffy.png
similarity index 100%
rename from static/emoji/os_emojies/puffy-3288799037
rename to static/emoji/os_emojies/puffy.png

diff --git a/static/emoji/os_emojies/2b388a8bc0ec60c6.png b/static/emoji/os_emojies/qube_os.png
similarity index 100%
rename from static/emoji/os_emojies/2b388a8bc0ec60c6.png
rename to static/emoji/os_emojies/qube_os.png

diff --git a/static/emoji/os_emojies/2a05af87d93c2553150a18a8279210f0df7753c735d84b5203177e009045a940(1).png b/static/emoji/os_emojies/rat_poison.png
similarity index 100%
rename from static/emoji/os_emojies/2a05af87d93c2553150a18a8279210f0df7753c735d84b5203177e009045a940(1).png
rename to static/emoji/os_emojies/rat_poison.png

diff --git a/static/frontends/pleroma-fe/dev/.index.html.un~ b/static/frontends/pleroma-fe/dev/.index.html.un~
new file mode 100755 (executable)
index 0000000..4a29f5f
Binary files /dev/null and b/static/frontends/pleroma-fe/dev/.index.html.un~ differ

diff --git a/static/frontends/pleroma-fe/dev/index.html b/static/frontends/pleroma-fe/dev/index.html
index a033de881caff655cecaa24736cb2e621714e2ea..2bdc3940f652d80ffc2854e3475c98b5416811d6 100755 (executable)
--- a/static/frontends/pleroma-fe/dev/index.html
+++ b/static/frontends/pleroma-fe/dev/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><script defer=defer src=/static/js/6245.81d7492d1e93fc14b23f.js></script><script defer=defer src=/static/js/app.9d382c9a57c5453fd21a.js></script><link href=/static/css/app.8daec525d1948b8e9f60.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><div id=modal></div><div id=popovers></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><link rel="stylesheet" href="static/styles.css" /><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><script defer=defer src=/static/js/6245.81d7492d1e93fc14b23f.js></script><script defer=defer src=/static/js/app.9d382c9a57c5453fd21a.js></script><link href=/static/css/app.8daec525d1948b8e9f60.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><div id=modal></div><div id=popovers></body></html>

diff --git a/static/frontends/pleroma-fe/dev/static/.config.json.un~ b/static/frontends/pleroma-fe/dev/static/.config.json.un~
new file mode 100755 (executable)
index 0000000..2e74b20
Binary files /dev/null and b/static/frontends/pleroma-fe/dev/static/.config.json.un~ differ

diff --git a/static/frontends/pleroma-fe/dev/static/.styles.css.un~ b/static/frontends/pleroma-fe/dev/static/.styles.css.un~
new file mode 100644 (file)
index 0000000..526c9fe
Binary files /dev/null and b/static/frontends/pleroma-fe/dev/static/.styles.css.un~ differ

diff --git a/static/frontends/pleroma-fe/dev/static/config.json b/static/frontends/pleroma-fe/dev/static/config.json
index 8a5f3076b3a1a23048201f1801b8beda821cf5ca..632f83b6d42ce0b21d44ff1e357b3800c5c26084 100755 (executable)
--- a/static/frontends/pleroma-fe/dev/static/config.json
+++ b/static/frontends/pleroma-fe/dev/static/config.json
@@ -25,5 +25,5 @@
   "sidebarRight": false,
   "subjectLineBehavior": "email",
   "theme": "pleroma-dark",
-  "webPushNotifications": false
+  "webPushNotifications": true
 }

diff --git a/static/frontends/pleroma-fe/dev/static/styles.css b/static/frontends/pleroma-fe/dev/static/styles.css
new file mode 100644 (file)
index 0000000..843a978
--- /dev/null
+++ b/static/frontends/pleroma-fe/dev/static/styles.css
@@ -0,0 +1,11 @@
+:root {
+        --emoji-size: 39px;
+}
+
+.RichContent .emoji {
+        transition: transform .3s ease;
+}
+
+.RichContent .emoji:hover {
+        transform: scale(1.5) !important;
+}