projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a300336 f98ee94)
Merge branch 'develop' into oembed_provider
authorraeno <just.raeno@gmail.com>
Wed, 19 Dec 2018 18:39:44 +0000 (22:39 +0400)
committerraeno <just.raeno@gmail.com>
Wed, 19 Dec 2018 18:39:44 +0000 (22:39 +0400)
1  2 
.idea/libraries/gen_smtp.xml patch | | | blob
.idea/libraries/html_entities.xml patch | | | blob
.idea/libraries/plug_cowboy.xml patch | | | blob
.idea/libraries/plug_crypto.xml patch | | | blob
.idea/libraries/swoosh.xml patch | | | blob
config/config.exs patch | diff1 | diff2 | blob | history
lib/pleroma/formatter.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history
priv/static/index.html patch | diff1 | diff2 | blob | history

diff --cc .idea/libraries/gen_smtp.xml
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e02c2c68ca85b599b56f5ac1fa3cc10c753fcf93
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.idea/libraries/gen_smtp.xml
@@@ -1,0 -1,0 +1,6 @@@
++<component name="libraryTable">
++  <library name="gen_smtp" type="mix">
++    <CLASSES />
++    <SOURCES />
++  </library>
++</component>
diff --cc .idea/libraries/html_entities.xml
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..996a8d55c0f94c01b5d8b4e6f61573593f5a8280
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.idea/libraries/html_entities.xml
@@@ -1,0 -1,0 +1,6 @@@
++<component name="libraryTable">
++  <library name="html_entities" type="mix">
++    <CLASSES />
++    <SOURCES />
++  </library>
++</component>
diff --cc .idea/libraries/plug_cowboy.xml
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..30a8b72578be4e7ae515c62c62862ef1fcd854fd
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.idea/libraries/plug_cowboy.xml
@@@ -1,0 -1,0 +1,8 @@@
++<component name="libraryTable">
++  <library name="plug_cowboy" type="mix">
++    <CLASSES />
++    <SOURCES>
++      <root url="file://$PROJECT_DIR$/deps/plug_cowboy/lib" />
++    </SOURCES>
++  </library>
++</component>
diff --cc .idea/libraries/plug_crypto.xml
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..69d4a35b358e211e338c4b7bf30fef226c6a216d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.idea/libraries/plug_crypto.xml
@@@ -1,0 -1,0 +1,8 @@@
++<component name="libraryTable">
++  <library name="plug_crypto" type="mix">
++    <CLASSES />
++    <SOURCES>
++      <root url="file://$PROJECT_DIR$/deps/plug_crypto/lib" />
++    </SOURCES>
++  </library>
++</component>
diff --cc .idea/libraries/swoosh.xml
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..546fdb7cdc6a70cad1fa7413a31c41658ef63eb2
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/.idea/libraries/swoosh.xml
@@@ -1,0 -1,0 +1,6 @@@
++<component name="libraryTable">
++  <library name="swoosh" type="mix">
++    <CLASSES />
++    <SOURCES />
++  </library>
++</component>
diff --cc config/config.exs
Simple merge
diff --cc lib/pleroma/formatter.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
diff --cc priv/static/index.html
index 5958e16b1ca1e18da1307ac834cad5d4c04b47ae,1679447531f0a12e874e3aeb686aa85504505070..e897a336dc766356a48a4f53ae5e2b4fb474a802
--- 1/priv/static/index.html
--- 2/priv/static/index.html
+++ b/priv/static/index.html
@@@ -1,1 -1,1 +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><!--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.ea00efb3229c8591fcc5249f0241b986.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.e076977b8e6c6844fb00.js></script><script type=text/javascript src=/static/js/vendor.cc4190750f6ed4d697bd.js></script><script type=text/javascript src=/static/js/app.67f548ecb9e9fd6b25b0.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><!--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.285fa56c62b811bbd37880f7e2656b13.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.60e190da7cc4cc4711dc.js></script><script type=text/javascript src=/static/js/vendor.48d4753220bd83360796.js></script><script type=text/javascript src=/static/js/app.6cb7378f44092df9536a.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><!--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.285fa56c62b811bbd37880f7e2656b13.css rel=stylesheet></head><body style="display: none"><div id=app></div><script type=text/javascript src=/static/js/manifest.60e190da7cc4cc4711dc.js></script><script type=text/javascript src=/static/js/vendor.48d4753220bd83360796.js></script><script type=text/javascript src=/static/js/app.6cb7378f44092df9536a.js></script></body></html>
Fork of https://akkoma.dev/AkkomaGang/akkoma.git