commit: ede4883ac93b1827c8fab125125bff94c1a855db
parent: 64e51c2cfa3e6da0f4998bab5358646cba8f29fa
Author: Roger Braun <roger@rogerbraun.net>
Date: Mon, 29 Jan 2018 17:45:44 +0100
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat:
31 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/config/emoji.txt b/config/emoji.txt
@@ -1 +1,31 @@
firefox, /emoji/Firefox.gif
+blank, /emoji/blank.png
+f_00b, /emoji/f_00b.png
+f_00b11b, /emoji/f_00b11b.png
+f_00b33b, /emoji/f_00b33b.png
+f_00h, /emoji/f_00h.png
+f_00t, /emoji/f_00t.png
+f_01b, /emoji/f_01b.png
+f_03b, /emoji/f_03b.png
+f_10b, /emoji/f_10b.png
+f_11b, /emoji/f_11b.png
+f_11b00b, /emoji/f_11b00b.png
+f_11b22b, /emoji/f_11b22b.png
+f_11h, /emoji/f_11h.png
+f_11t, /emoji/f_11t.png
+f_12b, /emoji/f_12b.png
+f_21b, /emoji/f_21b.png
+f_22b, /emoji/f_22b.png
+f_22b11b, /emoji/f_22b11b.png
+f_22b33b, /emoji/f_22b33b.png
+f_22h, /emoji/f_22h.png
+f_22t, /emoji/f_22t.png
+f_23b, /emoji/f_23b.png
+f_30b, /emoji/f_30b.png
+f_32b, /emoji/f_32b.png
+f_33b, /emoji/f_33b.png
+f_33b00b, /emoji/f_33b00b.png
+f_33b22b, /emoji/f_33b22b.png
+f_33h, /emoji/f_33h.png
+f_33t, /emoji/f_33t.png
+
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
@@ -22,6 +22,7 @@ server {
server_name example.tld;
location / {
+ add_header 'Access-Control-Allow-Origin' '*';
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
diff --git a/priv/static/emoji/blank.png b/priv/static/emoji/blank.png
Binary files differ.
diff --git a/priv/static/emoji/f_00b.png b/priv/static/emoji/f_00b.png
Binary files differ.
diff --git a/priv/static/emoji/f_00b11b.png b/priv/static/emoji/f_00b11b.png
Binary files differ.
diff --git a/priv/static/emoji/f_00b33b.png b/priv/static/emoji/f_00b33b.png
Binary files differ.
diff --git a/priv/static/emoji/f_00h.png b/priv/static/emoji/f_00h.png
Binary files differ.
diff --git a/priv/static/emoji/f_00t.png b/priv/static/emoji/f_00t.png
Binary files differ.
diff --git a/priv/static/emoji/f_01b.png b/priv/static/emoji/f_01b.png
Binary files differ.
diff --git a/priv/static/emoji/f_03b.png b/priv/static/emoji/f_03b.png
Binary files differ.
diff --git a/priv/static/emoji/f_10b.png b/priv/static/emoji/f_10b.png
Binary files differ.
diff --git a/priv/static/emoji/f_11b.png b/priv/static/emoji/f_11b.png
Binary files differ.
diff --git a/priv/static/emoji/f_11b00b.png b/priv/static/emoji/f_11b00b.png
Binary files differ.
diff --git a/priv/static/emoji/f_11b22b.png b/priv/static/emoji/f_11b22b.png
Binary files differ.
diff --git a/priv/static/emoji/f_11h.png b/priv/static/emoji/f_11h.png
Binary files differ.
diff --git a/priv/static/emoji/f_11t.png b/priv/static/emoji/f_11t.png
Binary files differ.
diff --git a/priv/static/emoji/f_12b.png b/priv/static/emoji/f_12b.png
Binary files differ.
diff --git a/priv/static/emoji/f_21b.png b/priv/static/emoji/f_21b.png
Binary files differ.
diff --git a/priv/static/emoji/f_22b.png b/priv/static/emoji/f_22b.png
Binary files differ.
diff --git a/priv/static/emoji/f_22b11b.png b/priv/static/emoji/f_22b11b.png
Binary files differ.
diff --git a/priv/static/emoji/f_22b33b.png b/priv/static/emoji/f_22b33b.png
Binary files differ.
diff --git a/priv/static/emoji/f_22h.png b/priv/static/emoji/f_22h.png
Binary files differ.
diff --git a/priv/static/emoji/f_22t.png b/priv/static/emoji/f_22t.png
Binary files differ.
diff --git a/priv/static/emoji/f_23b.png b/priv/static/emoji/f_23b.png
Binary files differ.
diff --git a/priv/static/emoji/f_30b.png b/priv/static/emoji/f_30b.png
Binary files differ.
diff --git a/priv/static/emoji/f_32b.png b/priv/static/emoji/f_32b.png
Binary files differ.
diff --git a/priv/static/emoji/f_33b.png b/priv/static/emoji/f_33b.png
Binary files differ.
diff --git a/priv/static/emoji/f_33b00b.png b/priv/static/emoji/f_33b00b.png
Binary files differ.
diff --git a/priv/static/emoji/f_33b22b.png b/priv/static/emoji/f_33b22b.png
Binary files differ.
diff --git a/priv/static/emoji/f_33h.png b/priv/static/emoji/f_33h.png
Binary files differ.
diff --git a/priv/static/emoji/f_33t.png b/priv/static/emoji/f_33t.png
Binary files differ.