kaniini [Fri, 27 Sep 2019 03:46:34 +0000 (03:46 +0000)]
Merge branch 'patch-1' into 'develop'
Fix code block for admin api document
See merge request pleroma/pleroma!1722
kaniini [Fri, 27 Sep 2019 03:46:02 +0000 (03:46 +0000)]
Merge branch 'refactor/common_api' into 'develop'
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
kaniini [Fri, 27 Sep 2019 03:42:30 +0000 (03:42 +0000)]
Merge branch 'refactor/timeline-controller' into 'develop'
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
rinpatch [Thu, 26 Sep 2019 22:17:20 +0000 (22:17 +0000)]
Merge branch 'chore/changelog-sync' into 'develop'
Sync changelogs between master and develop
See merge request pleroma/pleroma!1724
rinpatch [Thu, 26 Sep 2019 22:16:24 +0000 (01:16 +0300)]
Sync changelogs between master and develop
feld [Thu, 26 Sep 2019 16:44:53 +0000 (16:44 +0000)]
Merge branch 'feature/moderation-log-filters' into 'develop'
Moderation log filters
See merge request pleroma/pleroma!1607
Maxim Filippov [Thu, 26 Sep 2019 16:20:47 +0000 (19:20 +0300)]
Add docs
kPherox [Thu, 26 Sep 2019 16:10:34 +0000 (16:10 +0000)]
Fix code block for admin api document
Maxim Filippov [Thu, 26 Sep 2019 16:01:54 +0000 (19:01 +0300)]
Merge branch 'develop' into feature/moderation-log-filters
Egor Kislitsyn [Thu, 26 Sep 2019 03:53:42 +0000 (10:53 +0700)]
Extract timeline actions from `MastodonAPIController` into `TimelineController`
Egor Kislitsyn [Tue, 24 Sep 2019 08:56:20 +0000 (15:56 +0700)]
Cleanup CommonAPI
Egor Kislitsyn [Mon, 23 Sep 2019 11:52:41 +0000 (18:52 +0700)]
Add ActivityDraft.with_valid/2
Egor Kislitsyn [Tue, 24 Sep 2019 09:10:54 +0000 (16:10 +0700)]
Add CommonAPI.ActivityDraft
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
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
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
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
Hakaba Hitoyo [Thu, 26 Sep 2019 02:57:41 +0000 (02:57 +0000)]
Revert "add _discoverable_ keyword into ActivityPub @context"
This reverts commit
3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
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
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
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
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
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
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
Maksim [Wed, 25 Sep 2019 17:47:22 +0000 (17:47 +0000)]
Apply suggestion to test/tasks/instance_test.exs
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
rinpatch [Wed, 25 Sep 2019 13:38:45 +0000 (13:38 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
rinpatch [Wed, 25 Sep 2019 13:36:46 +0000 (16:36 +0300)]
Credo considered harmful
rinpatch [Wed, 25 Sep 2019 13:26:47 +0000 (16:26 +0300)]
Remove useless with clause
rinpatch [Wed, 25 Sep 2019 13:20:48 +0000 (13:20 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
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.
Ekaterina Vaartis [Tue, 24 Sep 2019 19:20:48 +0000 (22:20 +0300)]
Fix emoji tags for shareable packs to be "pack:{name}"
Ekaterina Vaartis [Tue, 24 Sep 2019 16:38:05 +0000 (19:38 +0300)]
Fix nodeinfo handling
Ekaterina Vaartis [Tue, 24 Sep 2019 16:18:07 +0000 (19:18 +0300)]
Add an API endpoint for listing remote packs
vaartis [Tue, 24 Sep 2019 12:15:52 +0000 (12:15 +0000)]
Credo fix (remove parens on function definition)
vaartis [Tue, 24 Sep 2019 12:11:25 +0000 (12:11 +0000)]
Move emoji_dir_path & cache_seconds_per_file
Ekaterina Vaartis [Tue, 24 Sep 2019 06:27:34 +0000 (09:27 +0300)]
When listing emoji packs, be sure to create the directory
Maksim Pechnikov [Wed, 25 Sep 2019 10:13:35 +0000 (13:13 +0300)]
clears `robot.txt` after tests
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
Egor Kislitsyn [Wed, 18 Sep 2019 14:54:31 +0000 (21:54 +0700)]
Replace `Pleroma.FlakeId` with `flake_id` hex package
Maksim Pechnikov [Wed, 25 Sep 2019 09:24:12 +0000 (12:24 +0300)]
Merge branch 'develop' into issue/1218
Maxim Filippov [Tue, 24 Sep 2019 22:25:42 +0000 (01:25 +0300)]
Allow activities pagination via limit/offset
Egor Kislitsyn [Tue, 24 Sep 2019 07:49:02 +0000 (14:49 +0700)]
Fix Credo warnings
Egor Kislitsyn [Tue, 24 Sep 2019 07:14:34 +0000 (14:14 +0700)]
Cleanup Pleroma.User
Egor Kislitsyn [Tue, 24 Sep 2019 12:50:07 +0000 (19:50 +0700)]
Add User.change_info/2 and User.update_info/2
Maxim Filippov [Tue, 24 Sep 2019 10:00:48 +0000 (13:00 +0300)]
Merge branch 'develop' into feature/return-link-for-password-reset
Egor Kislitsyn [Tue, 24 Sep 2019 08:16:44 +0000 (15:16 +0700)]
Extract notification actions from `MastodonAPIController` into `NotificationController`
Egor Kislitsyn [Tue, 24 Sep 2019 07:16:52 +0000 (14:16 +0700)]
Do not return tuple when unneeded
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
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
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
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
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
Steven Fuchs [Mon, 23 Sep 2019 22:33:59 +0000 (22:33 +0000)]
Clean up views
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
Ekaterina Vaartis [Mon, 23 Sep 2019 21:37:27 +0000 (00:37 +0300)]
Also pretty print pack.json
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
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.
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
Haelwenn (lanodan) Monnier [Mon, 23 Sep 2019 19:13:39 +0000 (21:13 +0200)]
Update AdminFE bundle
Maksim Pechnikov [Mon, 23 Sep 2019 18:32:50 +0000 (21:32 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
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
rinpatch [Mon, 23 Sep 2019 18:14:51 +0000 (21:14 +0300)]
Emoji API Controller: Follow phoenix directory structure
Maxim Filippov [Sun, 22 Sep 2019 20:14:18 +0000 (23:14 +0300)]
Better changelog wording
Maxim Filippov [Sun, 22 Sep 2019 20:13:48 +0000 (23:13 +0300)]
Format
Maxim Filippov [Sun, 22 Sep 2019 14:00:49 +0000 (17:00 +0300)]
Update CHANGELOG
Maxim Filippov [Sun, 22 Sep 2019 13:59:37 +0000 (16:59 +0300)]
I did not put these lines in CHANGELOG
Maxim Filippov [Sun, 22 Sep 2019 13:58:39 +0000 (16:58 +0300)]
Merge branch 'develop' into feature/return-link-for-password-reset
Maxim Filippov [Sun, 22 Sep 2019 13:45:38 +0000 (16:45 +0300)]
Update docs
Maxim Filippov [Sun, 22 Sep 2019 13:36:59 +0000 (16:36 +0300)]
Use router helper to generate reset password link
Maxim Filippov [Sun, 22 Sep 2019 13:08:07 +0000 (16:08 +0300)]
Admin API: Add ability to force user's password reset
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`)
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
feld [Fri, 20 Sep 2019 13:21:07 +0000 (13:21 +0000)]
Make it obvious how to support dual stack for MongooseIM
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
lain [Thu, 19 Sep 2019 19:01:05 +0000 (21:01 +0200)]
API Docs: Document conversation ids.
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
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
D Anzorge [Thu, 19 Sep 2019 14:09:24 +0000 (16:09 +0200)]
Add test for correct AP outbox pagination
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
D Anzorge [Thu, 19 Sep 2019 14:09:07 +0000 (16:09 +0200)]
Fix pagination in AP outbox.json
Egor Kislitsyn [Thu, 19 Sep 2019 07:53:34 +0000 (14:53 +0700)]
Update CHANGELOG
Egor Kislitsyn [Thu, 19 Sep 2019 07:39:52 +0000 (14:39 +0700)]
Add `rel="ugc"` to hashtags and mentions
Egor Kislitsyn [Thu, 19 Sep 2019 07:04:13 +0000 (14:04 +0700)]
Update "config/description.exs"
Egor Kislitsyn [Tue, 17 Sep 2019 08:22:46 +0000 (15:22 +0700)]
Add support for `rel="ugc"`
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`)
Maksim Pechnikov [Thu, 19 Sep 2019 04:35:34 +0000 (07:35 +0300)]
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
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
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
Ekaterina Vaartis [Wed, 18 Sep 2019 21:21:16 +0000 (00:21 +0300)]
Add :shared_pack_cache_seconds_per_file to description.exs
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/'
Haelwenn (lanodan) Monnier [Wed, 18 Sep 2019 21:17:15 +0000 (23:17 +0200)]
docs/clients.md: Update source code urls
Ekaterina Vaartis [Wed, 18 Sep 2019 16:48:25 +0000 (19:48 +0300)]
Get the nodeinfo address from the well-known
Ekaterina Vaartis [Wed, 18 Sep 2019 15:09:57 +0000 (18:09 +0300)]
Change path from nodeinfo to metadata->features
Ekaterina Vaartis [Fri, 13 Sep 2019 18:00:28 +0000 (21:00 +0300)]
Document emoji pack listing in the api docs
vaartis [Fri, 13 Sep 2019 12:32:40 +0000 (12:32 +0000)]
Apply 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
Ekaterina Vaartis [Thu, 12 Sep 2019 17:38:57 +0000 (20:38 +0300)]
Move emoji reloading to admin api
Ekaterina Vaartis [Wed, 11 Sep 2019 21:00:28 +0000 (00:00 +0300)]
Move emoji api to pleroma api dir
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
projects / akkoma / log