nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7111 commits 2 branches 0 tags 272 MiB
Commit graph

7111 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rinpatch f60beecfa7 Merge branch 'develop' into 'develop' 
add tunable for stream uploads, as needed for jortage to work.

See merge request pleroma/pleroma!1708
 2019-09-23 20:38:53 +00:00
Rachel Fae Fox 63af6951fa add tunable for stream uploads, as needed for jortage to work. 2019-09-23 20:38:53 +00:00
Maksim Pechnikov 494bb6bac6 updated tests 2019-09-23 22:37:30 +03:00
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
Maksim Pechnikov 179fa32dd5 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-23 21:41:57 +03:00
Maksim Pechnikov 38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-23 21:32:50 +03: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 (lanodan) Monnier 815b904508
Add support for AP C2S uploadMedia 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
 2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier 2ad50583f0
Document and test /api/ap/whoami 2019-09-23 19:47:35 +02:00
Maxim Filippov cf1960d596 Better changelog wording 2019-09-22 23:14:18 +03:00
Maxim Filippov d72d4757a8 Format 2019-09-22 23:13:48 +03:00
Maxim Filippov 79c3443b60 Update CHANGELOG 2019-09-22 17:00:49 +03:00
Maxim Filippov c8fdf757c1 I did not put these lines in CHANGELOG 2019-09-22 16:59:37 +03:00
Maxim Filippov 02bbcd6180 Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-22 16:58:39 +03:00
Maxim Filippov f89fe3ac06 Update docs 2019-09-22 16:45:38 +03:00
Maxim Filippov 72a01f1350 Use router helper to generate reset password link 2019-09-22 16:36:59 +03:00
Maxim Filippov 6f25668215 Admin API: Add ability to force user's password reset 2019-09-22 16:08:07 +03:00
eugenijm 7cf1252455 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public) 2019-09-20 18:27:00 +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
feld 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
Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	lib/pleroma/web/admin_api/admin_api_controller.ex
 2019-09-19 10:59:09 +03:00
Egor Kislitsyn ae1d371428 Update CHANGELOG 2019-09-19 14:57:37 +07:00
Egor Kislitsyn 95c948110c Add rel="ugc" to hashtags and mentions 2019-09-19 14:56:10 +07:00
Egor Kislitsyn d639cdcecb Update "config/description.exs" 2019-09-19 14:56:10 +07:00
Egor Kislitsyn cf3041220a Add support for rel="ugc" 2019-09-19 14:56:10 +07: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
Maksim Pechnikov d4ed3a35b8 Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-19 07:35:34 +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