rinpatch
|
ad2ffd7ef1
|
Merge branch 'update-adminfe/2019-09-23' into 'develop'
Update AdminFE bundle
See merge request pleroma/pleroma!1707
|
2019-09-23 19:23:33 +00:00 |
|
Haelwenn (lanodan) Monnier
|
646bf01608
|
Update AdminFE bundle
|
2019-09-23 21:13:39 +02:00 |
|
rinpatch
|
fd48bd80eb
|
Merge branch 'better-emoji-packs' into 'develop'
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
|
2019-09-23 18:20:08 +00:00 |
|
rinpatch
|
6b3d5ed6db
|
Emoji API Controller: Follow phoenix directory structure
|
2019-09-23 21:14:51 +03:00 |
|
Haelwenn
|
472e7b796c
|
Merge branch 'config/update-mongoose' into 'develop'
Make it obvious how to support dual stack for MongooseIM
See merge request pleroma/pleroma!1702
|
2019-09-20 13:21:07 +00:00 |
|
|
|
df3feb9412
|
Make it obvious how to support dual stack for MongooseIM
|
2019-09-20 13:21:07 +00:00 |
|
rinpatch
|
c4da7499a3
|
Merge branch 'conversation-docs' into 'develop'
API Docs: Document conversation ids.
See merge request pleroma/pleroma!1701
|
2019-09-19 19:04:55 +00:00 |
|
lain
|
fe4db3b94e
|
API Docs: Document conversation ids.
|
2019-09-19 21:01:05 +02:00 |
|
Haelwenn
|
c1e011624d
|
Merge branch 'docs/clients-update' into 'develop'
docs/clients.md: Update source code urls
See merge request pleroma/pleroma!1697
|
2019-09-19 18:01:49 +00:00 |
|
lain
|
b80c41a14f
|
Merge branch 'outbox_pagination' into 'develop'
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
|
2019-09-19 16:53:59 +00:00 |
|
D Anzorge
|
9aca2cc95d
|
Add test for correct AP outbox pagination
|
2019-09-19 16:49:27 +02:00 |
|
rinpatch
|
9c8a94bae2
|
Merge branch 'direct_conversation_id_on_status_creation' into 'develop'
Return `pleroma.direct_conversation_id` when creating a direct message
See merge request pleroma/pleroma!1699
|
2019-09-19 14:34:24 +00:00 |
|
D Anzorge
|
0e6085da10
|
Fix pagination in AP outbox.json
|
2019-09-19 16:09:07 +02:00 |
|
eugenijm
|
fe5e0b7846
|
Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)
|
2019-09-19 08:59:25 +03:00 |
|
Haelwenn
|
f95a2b2cda
|
Merge branch 'issue/733' into 'develop'
[#733] added test for Ostatus
See merge request pleroma/pleroma!1657
|
2019-09-18 22:28:10 +00:00 |
|
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
2019-09-18 21:57:49 +00:00 |
|
Ekaterina Vaartis
|
3e972c0456
|
Add :shared_pack_cache_seconds_per_file to description.exs
|
2019-09-19 00:23:18 +03:00 |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2019-09-18 23:21:11 +02:00 |
|
Haelwenn (lanodan) Monnier
|
c3856bed0c
|
docs/clients.md: Update source code urls
|
2019-09-18 23:17:15 +02:00 |
|
Ekaterina Vaartis
|
b585134c90
|
Get the nodeinfo address from the well-known
|
2019-09-19 00:16:34 +03:00 |
|
Ekaterina Vaartis
|
a1325d5fd9
|
Change path from nodeinfo to metadata->features
|
2019-09-19 00:16:34 +03:00 |
|
Ekaterina Vaartis
|
86795d5ac2
|
Document emoji pack listing in the api docs
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
43022c347f
|
Apply suggestion to docs/api/pleroma_api.md
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
8aed05ac15
|
Apply suggestion to docs/api/pleroma_api.md
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
d51e5e447e
|
Move emoji reloading to admin api
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
7680aec17d
|
Move emoji api to pleroma api dir
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
36f2275dc9
|
A feature for shareable emoji packs, use it in download_from & tests
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
74fb6d8647
|
Move EmojiAPIController from EmojiAPI to PleromaAPI
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
dd818bdd48
|
Add documentation for the emoji endpoints
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
6cd651a38b
|
Make the emoji controller api more RESTy
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
3971bf9c5f
|
Change :sha to :checksum
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
7c784128fd
|
Change emoji api responses to JSON
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
f24731788e
|
Move emoji pack list from /list to /
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
cb125ffaf7
|
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
8f509e6d1e
|
Use with w/ pack_info_res
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
8790365fef
|
Remove unused variable
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
b8a214b0ab
|
Split list_packs
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
f251225cae
|
Apply suggestions to emoji_api_controller.ex
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
c049c32270
|
Fixed a typo in create_archive_and_cache
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
163082de6f
|
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
f6d4acc871
|
Fix credo warnings
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
87057101b0
|
Add documentation for the emoji api endpoints
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
9eb2ee4df0
|
Allow importing old (emoji.txt / plain) packs from the filesystem
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
13cd93a0d3
|
Use && insted of "and" for checking shared-files for packs
share-files can be nil and "and" does not like that
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
f5131540dc
|
Add a way to create emoji packs via an endpoint
|
2019-09-19 00:16:33 +03:00 |
|
vaartis
|
6b4a144e4d
|
Remove unused yaml dependency from mix.lock
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
8dbdd5c280
|
Allow uploading new emojis to packs from URLs
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
16edfef12e
|
Handle empty shortcode/filename/new_shortcode/new_filename
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
9afe7258dd
|
Implememt emoji pack file updating + write tests
|
2019-09-19 00:16:33 +03:00 |
|
Ekaterina Vaartis
|
261d92f9c2
|
Update the pack fallback-src sha generation condition
The old one would not regenerate sha when fallback src changed
|
2019-09-19 00:16:33 +03:00 |
|
