diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-23 18:20:08 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-23 18:20:08 +0000 |
| commit | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (patch) | |
| tree | 7b4647efceeca5885f171bc94371d858a853f2f8 /test/instance_static | |
| parent | 472e7b796cfeb1445ee1572df414531655b050ce (diff) | |
| parent | 6b3d5ed6db6a3c73eb1f8373ebd670427aa8849d (diff) | |
| download | pleroma-fd48bd80eb7eab563c25586b1deba2ed42c02c5a.tar.gz pleroma-fd48bd80eb7eab563c25586b1deba2ed42c02c5a.zip | |
Merge branch 'better-emoji-packs' into 'develop'
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
Diffstat (limited to 'test/instance_static')
| -rw-r--r-- | test/instance_static/emoji/test_pack/blank.png | bin | 0 -> 95 bytes | |||
| -rw-r--r-- | test/instance_static/emoji/test_pack/pack.json | 13 | ||||
| -rw-r--r-- | test/instance_static/emoji/test_pack_for_import/blank.png | bin | 0 -> 95 bytes | |||
| -rw-r--r-- | test/instance_static/emoji/test_pack_nonshared/nonshared.zip | bin | 0 -> 256 bytes | |||
| -rw-r--r-- | test/instance_static/emoji/test_pack_nonshared/pack.json | 16 |
5 files changed, 29 insertions, 0 deletions
diff --git a/test/instance_static/emoji/test_pack/blank.png b/test/instance_static/emoji/test_pack/blank.png Binary files differnew file mode 100644 index 000000000..8f50fa023 --- /dev/null +++ b/test/instance_static/emoji/test_pack/blank.png diff --git a/test/instance_static/emoji/test_pack/pack.json b/test/instance_static/emoji/test_pack/pack.json new file mode 100644 index 000000000..5a8ee75f9 --- /dev/null +++ b/test/instance_static/emoji/test_pack/pack.json @@ -0,0 +1,13 @@ +{ + "pack": { + "license": "Test license", + "homepage": "https://pleroma.social", + "description": "Test description", + + "share-files": true + }, + + "files": { + "blank": "blank.png" + } +} diff --git a/test/instance_static/emoji/test_pack_for_import/blank.png b/test/instance_static/emoji/test_pack_for_import/blank.png Binary files differnew file mode 100644 index 000000000..8f50fa023 --- /dev/null +++ b/test/instance_static/emoji/test_pack_for_import/blank.png diff --git a/test/instance_static/emoji/test_pack_nonshared/nonshared.zip b/test/instance_static/emoji/test_pack_nonshared/nonshared.zip Binary files differnew file mode 100644 index 000000000..148446c64 --- /dev/null +++ b/test/instance_static/emoji/test_pack_nonshared/nonshared.zip diff --git a/test/instance_static/emoji/test_pack_nonshared/pack.json b/test/instance_static/emoji/test_pack_nonshared/pack.json new file mode 100644 index 000000000..b96781f81 --- /dev/null +++ b/test/instance_static/emoji/test_pack_nonshared/pack.json @@ -0,0 +1,16 @@ +{ + "pack": { + "license": "Test license", + "homepage": "https://pleroma.social", + "description": "Test description", + + "fallback-src": "https://nonshared-pack", + "fallback-src-sha256": "74409E2674DAA06C072729C6C8426C4CB3B7E0B85ED77792DB7A436E11D76DAF", + + "share-files": false + }, + + "files": { + "blank": "blank.png" + } +} |
