akkoma
5 years agoUpdate CHANGELOG and pleroma_api.md
Egor Kislitsyn [Wed, 2 Oct 2019 07:51:30 +0000 (14:51 +0700)]
Update CHANGELOG and pleroma_api.md

5 years agoRemove `:enqueued` counter
Egor Kislitsyn [Wed, 2 Oct 2019 07:50:25 +0000 (14:50 +0700)]
Remove `:enqueued` counter

5 years agoAdd Pleroma.JobQueueMonitor
Egor Kislitsyn [Thu, 26 Sep 2019 11:49:57 +0000 (18:49 +0700)]
Add Pleroma.JobQueueMonitor

5 years agoMerge branch 'refactor/notification-controller' into 'develop'
kaniini [Thu, 26 Sep 2019 03:13:22 +0000 (03:13 +0000)]
Merge branch 'refactor/notification-controller' into 'develop'

Extract notification actions from `MastodonAPIController` into `NotificationController`

See merge request pleroma/pleroma!1646

5 years agoMerge branch 'feature/return-link-for-password-reset' into 'develop'
kaniini [Thu, 26 Sep 2019 03:12:03 +0000 (03:12 +0000)]
Merge branch 'feature/return-link-for-password-reset' into 'develop'

Admin API: Return link alongside with token on password reset

See merge request pleroma/pleroma!1691

5 years agoMerge branch 'refactor/user' into 'develop'
kaniini [Thu, 26 Sep 2019 03:00:38 +0000 (03:00 +0000)]
Merge branch 'refactor/user' into 'develop'

Simplify updating user's `info`

See merge request pleroma/pleroma!1712

5 years agoMerge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into ...
kaniini [Thu, 26 Sep 2019 02:57:42 +0000 (02:57 +0000)]
Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into 'develop'

Activitypub/Add `discoverable` parameter in ActivityPub actor

See merge request pleroma/pleroma!1641

5 years agoRevert "add _discoverable_ keyword into ActivityPub @context"
Hakaba Hitoyo [Thu, 26 Sep 2019 02:57:41 +0000 (02:57 +0000)]
Revert "add _discoverable_ keyword into ActivityPub @context"

This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.

5 years agoMerge branch 'hex-flake-id' into 'develop'
kaniini [Thu, 26 Sep 2019 02:51:54 +0000 (02:51 +0000)]
Merge branch 'hex-flake-id' into 'develop'

Replace `Pleroma.FlakeId` with `flake_id` hex package

See merge request pleroma/pleroma!1692

5 years agoMerge branch 'feature/activities-pagination-by-offset' into 'develop'
kaniini [Thu, 26 Sep 2019 02:49:45 +0000 (02:49 +0000)]
Merge branch 'feature/activities-pagination-by-offset' into 'develop'

Allow activities pagination via limit/offset

See merge request pleroma/pleroma!1714

5 years agoMerge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
kaniini [Thu, 26 Sep 2019 00:03:47 +0000 (00:03 +0000)]
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'

Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern

See merge request pleroma/pleroma!1716

5 years agoMerge branch 'hotfix/hackney-1.15.2' into 'develop'
rinpatch [Wed, 25 Sep 2019 21:28:20 +0000 (21:28 +0000)]
Merge branch 'hotfix/hackney-1.15.2' into 'develop'

mix.lock: Bump hackney to 1.15.2

Closes #1267

See merge request pleroma/pleroma!1717

5 years agomix.lock: Bump hackney to 1.15.2
Haelwenn (lanodan) Monnier [Wed, 25 Sep 2019 21:16:35 +0000 (23:16 +0200)]
mix.lock: Bump hackney to 1.15.2

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
5 years agoMerge branch 'support/test' into 'develop'
rinpatch [Wed, 25 Sep 2019 18:51:45 +0000 (18:51 +0000)]
Merge branch 'support/test' into 'develop'

clears `robot.txt` after tests

See merge request pleroma/pleroma!1715

5 years agoApply suggestion to test/tasks/instance_test.exs
Maksim [Wed, 25 Sep 2019 17:47:22 +0000 (17:47 +0000)]
Apply suggestion to test/tasks/instance_test.exs

5 years agoMerge branch 'emoji-packs-create-dir' into 'develop'
rinpatch [Wed, 25 Sep 2019 17:12:22 +0000 (17:12 +0000)]
Merge branch 'emoji-packs-create-dir' into 'develop'

When listing emoji packs, be sure to create the directory + add an endpoint to list remote packs since JS can't do that

See merge request pleroma/pleroma!1711

5 years agoApply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
rinpatch [Wed, 25 Sep 2019 13:38:45 +0000 (13:38 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex

5 years agoCredo considered harmful
rinpatch [Wed, 25 Sep 2019 13:36:46 +0000 (16:36 +0300)]
Credo considered harmful

5 years agoRemove useless with clause
rinpatch [Wed, 25 Sep 2019 13:26:47 +0000 (16:26 +0300)]
Remove useless with clause

5 years agoApply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
rinpatch [Wed, 25 Sep 2019 13:20:48 +0000 (13:20 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex

5 years agoDon't embed the first page in inboxes/outboxes and refactor the views to
rinpatch [Wed, 25 Sep 2019 12:59:04 +0000 (15:59 +0300)]
Don't embed the first page in inboxes/outboxes and refactor the views to
follow View/Controller pattern

Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.

5 years agoFix emoji tags for shareable packs to be "pack:{name}"
Ekaterina Vaartis [Tue, 24 Sep 2019 19:20:48 +0000 (22:20 +0300)]
Fix emoji tags for shareable packs to be "pack:{name}"

5 years agoFix nodeinfo handling
Ekaterina Vaartis [Tue, 24 Sep 2019 16:38:05 +0000 (19:38 +0300)]
Fix nodeinfo handling

5 years agoAdd an API endpoint for listing remote packs
Ekaterina Vaartis [Tue, 24 Sep 2019 16:18:07 +0000 (19:18 +0300)]
Add an API endpoint for listing remote packs

5 years agoCredo fix (remove parens on function definition)
vaartis [Tue, 24 Sep 2019 12:15:52 +0000 (12:15 +0000)]
Credo fix (remove parens on function definition)

5 years agoMove emoji_dir_path & cache_seconds_per_file
vaartis [Tue, 24 Sep 2019 12:11:25 +0000 (12:11 +0000)]
Move emoji_dir_path & cache_seconds_per_file

5 years agoWhen listing emoji packs, be sure to create the directory
Ekaterina Vaartis [Tue, 24 Sep 2019 06:27:34 +0000 (09:27 +0300)]
When listing emoji packs, be sure to create the directory

5 years agoclears `robot.txt` after tests
Maksim Pechnikov [Wed, 25 Sep 2019 10:13:35 +0000 (13:13 +0300)]
clears `robot.txt` after tests

5 years agoMerge branch 'issue/1218' into 'develop'
lain [Wed, 25 Sep 2019 10:26:41 +0000 (10:26 +0000)]
Merge branch 'issue/1218' into 'develop'

[#1218] Issue/1218

See merge request pleroma/pleroma!1609

5 years agoReplace `Pleroma.FlakeId` with `flake_id` hex package
Egor Kislitsyn [Wed, 18 Sep 2019 14:54:31 +0000 (21:54 +0700)]
Replace `Pleroma.FlakeId` with `flake_id` hex package

5 years agoMerge branch 'develop' into issue/1218
Maksim Pechnikov [Wed, 25 Sep 2019 09:24:12 +0000 (12:24 +0300)]
Merge branch 'develop' into issue/1218

5 years agoAllow activities pagination via limit/offset
Maxim Filippov [Tue, 24 Sep 2019 22:25:42 +0000 (01:25 +0300)]
Allow activities pagination via limit/offset

5 years agoFix Credo warnings
Egor Kislitsyn [Tue, 24 Sep 2019 07:49:02 +0000 (14:49 +0700)]
Fix Credo warnings

5 years agoCleanup Pleroma.User
Egor Kislitsyn [Tue, 24 Sep 2019 07:14:34 +0000 (14:14 +0700)]
Cleanup Pleroma.User

5 years agoAdd User.change_info/2 and User.update_info/2
Egor Kislitsyn [Tue, 24 Sep 2019 12:50:07 +0000 (19:50 +0700)]
Add User.change_info/2 and User.update_info/2

5 years agoMerge branch 'develop' into feature/return-link-for-password-reset
Maxim Filippov [Tue, 24 Sep 2019 10:00:48 +0000 (13:00 +0300)]
Merge branch 'develop' into feature/return-link-for-password-reset

5 years agoExtract notification actions from `MastodonAPIController` into `NotificationController`
Egor Kislitsyn [Tue, 24 Sep 2019 08:16:44 +0000 (15:16 +0700)]
Extract notification actions from `MastodonAPIController` into `NotificationController`

5 years agoDo not return tuple when unneeded
Egor Kislitsyn [Tue, 24 Sep 2019 07:16:52 +0000 (14:16 +0700)]
Do not return tuple when unneeded

5 years agoMerge branch 'feature/force-password-reset' into 'develop'
kaniini [Mon, 23 Sep 2019 22:42:34 +0000 (22:42 +0000)]
Merge branch 'feature/force-password-reset' into 'develop'

Admin API: Add ability to require password reset

See merge request pleroma/pleroma!1705

5 years agoMerge branch 'support-rel-ugc' into 'develop'
kaniini [Mon, 23 Sep 2019 22:41:31 +0000 (22:41 +0000)]
Merge branch 'support-rel-ugc' into 'develop'

Add support for `rel="ugc"`

Closes #1255

See merge request pleroma/pleroma!1679

5 years agoMerge branch 'remove-direct-messages-from-public-timeline' into 'develop'
kaniini [Mon, 23 Sep 2019 22:35:09 +0000 (22:35 +0000)]
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'

Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.

Closes #1223

See merge request pleroma/pleroma!1703

5 years agoMerge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
kaniini [Mon, 23 Sep 2019 22:34:52 +0000 (22:34 +0000)]
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'

added tests /activity_pub/transmogrifier.ex

See merge request pleroma/pleroma!1651

5 years agoMerge branch 'clean-up-views' into 'develop'
kaniini [Mon, 23 Sep 2019 22:33:59 +0000 (22:33 +0000)]
Merge branch 'clean-up-views' into 'develop'

Clean up views

See merge request pleroma/pleroma!1709

5 years agoClean up views
Steven Fuchs [Mon, 23 Sep 2019 22:33:59 +0000 (22:33 +0000)]
Clean up views

5 years agoMerge branch 'emoji-pack-json-pretty' into 'develop'
kaniini [Mon, 23 Sep 2019 22:30:31 +0000 (22:30 +0000)]
Merge branch 'emoji-pack-json-pretty' into 'develop'

Also pretty print pack.json

See merge request pleroma/pleroma!1710

5 years agoAlso pretty print pack.json
Ekaterina Vaartis [Mon, 23 Sep 2019 21:37:27 +0000 (00:37 +0300)]
Also pretty print pack.json

5 years agoMerge branch 'develop' into 'develop'
rinpatch [Mon, 23 Sep 2019 20:38:53 +0000 (20:38 +0000)]
Merge branch 'develop' into 'develop'

add tunable for stream uploads, as needed for jortage to work.

See merge request pleroma/pleroma!1708

5 years agoadd tunable for stream uploads, as needed for jortage to work.
Rachel Fae Fox [Mon, 23 Sep 2019 20:38:53 +0000 (20:38 +0000)]
add tunable for stream uploads, as needed for jortage to work.

5 years agoMerge branch 'update-adminfe/2019-09-23' into 'develop'
rinpatch [Mon, 23 Sep 2019 19:23:33 +0000 (19:23 +0000)]
Merge branch 'update-adminfe/2019-09-23' into 'develop'

Update AdminFE bundle

See merge request pleroma/pleroma!1707

5 years agoUpdate AdminFE bundle
Haelwenn (lanodan) Monnier [Mon, 23 Sep 2019 19:13:39 +0000 (21:13 +0200)]
Update AdminFE bundle

5 years agoMerge branch 'develop' into test/activity_pub/transmogrifier.ex
Maksim Pechnikov [Mon, 23 Sep 2019 18:32:50 +0000 (21:32 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex

5 years agoMerge branch 'better-emoji-packs' into 'develop'
rinpatch [Mon, 23 Sep 2019 18:20:08 +0000 (18:20 +0000)]
Merge branch 'better-emoji-packs' into 'develop'

Shareable emoji packs

Closes #833 and #1096

See merge request pleroma/pleroma!1551

5 years agoEmoji API Controller: Follow phoenix directory structure
rinpatch [Mon, 23 Sep 2019 18:14:51 +0000 (21:14 +0300)]
Emoji API Controller: Follow phoenix directory structure

5 years agoBetter changelog wording
Maxim Filippov [Sun, 22 Sep 2019 20:14:18 +0000 (23:14 +0300)]
Better changelog wording

5 years agoFormat
Maxim Filippov [Sun, 22 Sep 2019 20:13:48 +0000 (23:13 +0300)]
Format

5 years agoUpdate CHANGELOG
Maxim Filippov [Sun, 22 Sep 2019 14:00:49 +0000 (17:00 +0300)]
Update CHANGELOG

5 years agoI did not put these lines in CHANGELOG
Maxim Filippov [Sun, 22 Sep 2019 13:59:37 +0000 (16:59 +0300)]
I did not put these lines in CHANGELOG

5 years agoMerge branch 'develop' into feature/return-link-for-password-reset
Maxim Filippov [Sun, 22 Sep 2019 13:58:39 +0000 (16:58 +0300)]
Merge branch 'develop' into feature/return-link-for-password-reset

5 years agoUpdate docs
Maxim Filippov [Sun, 22 Sep 2019 13:45:38 +0000 (16:45 +0300)]
Update docs

5 years agoUse router helper to generate reset password link
Maxim Filippov [Sun, 22 Sep 2019 13:36:59 +0000 (16:36 +0300)]
Use router helper to generate reset password link

5 years agoAdmin API: Add ability to force user's password reset
Maxim Filippov [Sun, 22 Sep 2019 13:08:07 +0000 (16:08 +0300)]
Admin API: Add ability to force user's password reset

5 years agoMastodon API: Fix private and direct statuses not being filtered out from the public...
eugenijm [Fri, 20 Sep 2019 14:54:38 +0000 (17:54 +0300)]
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)

5 years agoMerge branch 'config/update-mongoose' into 'develop'
Haelwenn [Fri, 20 Sep 2019 13:21:07 +0000 (13:21 +0000)]
Merge branch 'config/update-mongoose' into 'develop'

Make it obvious how to support dual stack for MongooseIM

See merge request pleroma/pleroma!1702

5 years agoMake it obvious how to support dual stack for MongooseIM
feld [Fri, 20 Sep 2019 13:21:07 +0000 (13:21 +0000)]
Make it obvious how to support dual stack for MongooseIM

5 years agoMerge branch 'conversation-docs' into 'develop'
rinpatch [Thu, 19 Sep 2019 19:04:55 +0000 (19:04 +0000)]
Merge branch 'conversation-docs' into 'develop'

API Docs: Document conversation ids.

See merge request pleroma/pleroma!1701

5 years agoAPI Docs: Document conversation ids.
lain [Thu, 19 Sep 2019 19:01:05 +0000 (21:01 +0200)]
API Docs: Document conversation ids.

5 years agoMerge branch 'docs/clients-update' into 'develop'
Haelwenn [Thu, 19 Sep 2019 18:01:49 +0000 (18:01 +0000)]
Merge branch 'docs/clients-update' into 'develop'

docs/clients.md: Update source code urls

See merge request pleroma/pleroma!1697

5 years agoMerge branch 'outbox_pagination' into 'develop'
lain [Thu, 19 Sep 2019 16:53:59 +0000 (16:53 +0000)]
Merge branch 'outbox_pagination' into 'develop'

Fix AP outbox pagination

See merge request pleroma/pleroma!1700

5 years agoAdd test for correct AP outbox pagination
D Anzorge [Thu, 19 Sep 2019 14:09:24 +0000 (16:09 +0200)]
Add test for correct AP outbox pagination

5 years agoMerge branch 'direct_conversation_id_on_status_creation' into 'develop'
rinpatch [Thu, 19 Sep 2019 14:34:24 +0000 (14:34 +0000)]
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

5 years agoFix pagination in AP outbox.json
D Anzorge [Thu, 19 Sep 2019 14:09:07 +0000 (16:09 +0200)]
Fix pagination in AP outbox.json

5 years agoUpdate CHANGELOG
Egor Kislitsyn [Thu, 19 Sep 2019 07:53:34 +0000 (14:53 +0700)]
Update CHANGELOG

5 years ago Add `rel="ugc"` to hashtags and mentions
Egor Kislitsyn [Thu, 19 Sep 2019 07:39:52 +0000 (14:39 +0700)]
 Add `rel="ugc"` to hashtags and mentions

5 years agoUpdate "config/description.exs"
Egor Kislitsyn [Thu, 19 Sep 2019 07:04:13 +0000 (14:04 +0700)]
Update "config/description.exs"

5 years agoAdd support for `rel="ugc"`
Egor Kislitsyn [Tue, 17 Sep 2019 08:22:46 +0000 (15:22 +0700)]
Add support for `rel="ugc"`

5 years agoMastodon API: Return `pleroma.direct_conversation_id` when creating direct messages...
eugenijm [Thu, 19 Sep 2019 05:27:55 +0000 (08:27 +0300)]
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)

5 years agoMerge branch 'develop' into test/activity_pub/transmogrifier.ex
Maksim Pechnikov [Thu, 19 Sep 2019 04:35:34 +0000 (07:35 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex

5 years agoMerge branch 'issue/733' into 'develop'
Haelwenn [Wed, 18 Sep 2019 22:28:10 +0000 (22:28 +0000)]
Merge branch 'issue/733' into 'develop'

[#733] added test for Ostatus

See merge request pleroma/pleroma!1657

5 years agoMerge branch 'chores/bump-copyright-year' into 'develop'
rinpatch [Wed, 18 Sep 2019 21:57:49 +0000 (21:57 +0000)]
Merge branch 'chores/bump-copyright-year' into 'develop'

Bump copyright years of files changed in 2019

See merge request pleroma/pleroma!1698

5 years agoAdd :shared_pack_cache_seconds_per_file to description.exs
Ekaterina Vaartis [Wed, 18 Sep 2019 21:21:16 +0000 (00:21 +0300)]
Add :shared_pack_cache_seconds_per_file to description.exs

5 years agoBump copyright years of files changed in 2019
Haelwenn (lanodan) Monnier [Wed, 18 Sep 2019 21:20:54 +0000 (23:20 +0200)]
Bump copyright years of files changed in 2019

Done via the following command:
git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'

5 years agodocs/clients.md: Update source code urls
Haelwenn (lanodan) Monnier [Wed, 18 Sep 2019 21:17:15 +0000 (23:17 +0200)]
docs/clients.md: Update source code urls

5 years agoGet the nodeinfo address from the well-known
Ekaterina Vaartis [Wed, 18 Sep 2019 16:48:25 +0000 (19:48 +0300)]
Get the nodeinfo address from the well-known

5 years agoChange path from nodeinfo to metadata->features
Ekaterina Vaartis [Wed, 18 Sep 2019 15:09:57 +0000 (18:09 +0300)]
Change path from nodeinfo to metadata->features

5 years agoDocument emoji pack listing in the api docs
Ekaterina Vaartis [Fri, 13 Sep 2019 18:00:28 +0000 (21:00 +0300)]
Document emoji pack listing in the api docs

5 years agoApply suggestion to docs/api/pleroma_api.md
vaartis [Fri, 13 Sep 2019 12:32:40 +0000 (12:32 +0000)]
Apply suggestion to docs/api/pleroma_api.md

5 years agoApply suggestion to docs/api/pleroma_api.md
vaartis [Fri, 13 Sep 2019 12:32:23 +0000 (12:32 +0000)]
Apply suggestion to docs/api/pleroma_api.md

5 years agoMove emoji reloading to admin api
Ekaterina Vaartis [Thu, 12 Sep 2019 17:38:57 +0000 (20:38 +0300)]
Move emoji reloading to admin api

5 years agoMove emoji api to pleroma api dir
Ekaterina Vaartis [Wed, 11 Sep 2019 21:00:28 +0000 (00:00 +0300)]
Move emoji api to pleroma api dir

5 years agoA feature for shareable emoji packs, use it in download_from & tests
Ekaterina Vaartis [Wed, 11 Sep 2019 19:58:55 +0000 (22:58 +0300)]
A feature for shareable emoji packs, use it in download_from & tests

5 years agoMove EmojiAPIController from EmojiAPI to PleromaAPI
Ekaterina Vaartis [Wed, 11 Sep 2019 19:43:00 +0000 (22:43 +0300)]
Move EmojiAPIController from EmojiAPI to PleromaAPI

5 years agoAdd documentation for the emoji endpoints
Ekaterina Vaartis [Wed, 11 Sep 2019 19:39:26 +0000 (22:39 +0300)]
Add documentation for the emoji endpoints

5 years agoMake the emoji controller api more RESTy
Ekaterina Vaartis [Wed, 11 Sep 2019 18:50:55 +0000 (21:50 +0300)]
Make the emoji controller api more RESTy

5 years agoChange :sha to :checksum
Ekaterina Vaartis [Wed, 11 Sep 2019 18:43:16 +0000 (21:43 +0300)]
Change :sha to :checksum

5 years agoChange emoji api responses to JSON
Ekaterina Vaartis [Wed, 11 Sep 2019 16:39:47 +0000 (19:39 +0300)]
Change emoji api responses to JSON

5 years agoMove emoji pack list from /list to /
Ekaterina Vaartis [Wed, 11 Sep 2019 16:01:21 +0000 (19:01 +0300)]
Move emoji pack list from /list to /

5 years agoApply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
vaartis [Wed, 11 Sep 2019 16:00:48 +0000 (16:00 +0000)]
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex

5 years agoUse with w/ pack_info_res
Ekaterina Vaartis [Wed, 11 Sep 2019 15:59:31 +0000 (18:59 +0300)]
Use with w/ pack_info_res

5 years agoRemove unused variable
Ekaterina Vaartis [Wed, 11 Sep 2019 15:52:21 +0000 (18:52 +0300)]
Remove unused variable

5 years agoSplit list_packs
vaartis [Wed, 11 Sep 2019 15:48:51 +0000 (15:48 +0000)]
Split list_packs