akkoma
5 years agoUpdate admin_api.md
Maxim Filippov [Sat, 28 Sep 2019 21:01:35 +0000 (00:01 +0300)]
Update admin_api.md

5 years agoMerge branch 'tests/mastodon_api_controller.ex' into 'develop'
Haelwenn [Sat, 28 Sep 2019 19:02:05 +0000 (19:02 +0000)]
Merge branch 'tests/mastodon_api_controller.ex' into 'develop'

tests for mastodon_api_controller.ex

See merge request pleroma/pleroma!1639

5 years agoMerge branch 'develop' into tests/mastodon_api_controller.ex
Maksim Pechnikov [Sat, 28 Sep 2019 07:32:03 +0000 (10:32 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex

5 years agoMerge branch 'bugfix/post-empty-status' into 'develop'
Haelwenn [Sat, 28 Sep 2019 00:03:24 +0000 (00:03 +0000)]
Merge branch 'bugfix/post-empty-status' into 'develop'

status_controller.ex: Posting media status without content defined

See merge request pleroma/pleroma!1735

5 years agostatus_controller.ex: Posting media status without content defined
Haelwenn (lanodan) Monnier [Fri, 27 Sep 2019 23:21:28 +0000 (01:21 +0200)]
status_controller.ex: Posting media status without content defined

5 years agoMerge branch 'fix/empty-attachment-statuses' into 'develop'
rinpatch [Fri, 27 Sep 2019 23:09:07 +0000 (23:09 +0000)]
Merge branch 'fix/empty-attachment-statuses' into 'develop'

Fix not being able to post empty statuses with attachments

See merge request pleroma/pleroma!1734

5 years agoFix not being able to post empty statuses with attachments
rinpatch [Fri, 27 Sep 2019 22:56:20 +0000 (01:56 +0300)]
Fix not being able to post empty statuses with attachments

Attachment field was filled in after the empty status check

5 years agoMerge branch 'remote-ip' into 'develop'
Haelwenn [Fri, 27 Sep 2019 21:59:23 +0000 (21:59 +0000)]
Merge branch 'remote-ip' into 'develop'

Add `remote_ip` plug

See merge request pleroma/pleroma!1608

5 years agoAdd `remote_ip` plug
minibikini [Fri, 27 Sep 2019 21:59:23 +0000 (21:59 +0000)]
Add `remote_ip` plug

5 years agoMerge branch 'split-masto-api/follow-requests' into 'develop'
kaniini [Fri, 27 Sep 2019 07:54:54 +0000 (07:54 +0000)]
Merge branch 'split-masto-api/follow-requests' into 'develop'

Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

See merge request pleroma/pleroma!1730

5 years agoMerge branch 'split-masto-api/domain-blocks' into 'develop'
kaniini [Fri, 27 Sep 2019 07:54:08 +0000 (07:54 +0000)]
Merge branch 'split-masto-api/domain-blocks' into 'develop'

Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

See merge request pleroma/pleroma!1729

5 years agoMerge branch 'split-masto-api/scheduled-statuses' into 'develop'
kaniini [Fri, 27 Sep 2019 07:53:22 +0000 (07:53 +0000)]
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'

Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`

See merge request pleroma/pleroma!1728

5 years agoMerge branch 'split-masto-api/filters' into 'develop'
kaniini [Fri, 27 Sep 2019 07:52:27 +0000 (07:52 +0000)]
Merge branch 'split-masto-api/filters' into 'develop'

Extract filter actions from `MastodonAPIController` to `FilterController`

See merge request pleroma/pleroma!1725

5 years agoExtract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
Egor Kislitsyn [Fri, 27 Sep 2019 07:28:05 +0000 (14:28 +0700)]
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`

5 years agoExtract follow requests actions from `MastodonAPIController` to `FollowRequestController`
Egor Kislitsyn [Fri, 27 Sep 2019 07:25:17 +0000 (14:25 +0700)]
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

5 years agoCleanup ScheduledActivityView
Egor Kislitsyn [Fri, 27 Sep 2019 04:46:20 +0000 (11:46 +0700)]
Cleanup ScheduledActivityView

5 years agoExtract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivity...
Egor Kislitsyn [Fri, 27 Sep 2019 06:35:45 +0000 (13:35 +0700)]
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`

5 years agoMerge branch 'fix/subscription-notification-view' into 'develop'
kaniini [Fri, 27 Sep 2019 06:17:40 +0000 (06:17 +0000)]
Merge branch 'fix/subscription-notification-view' into 'develop'

Fix SubscriptionNotificationView

See merge request pleroma/pleroma!1727

5 years agoExtract filter actions from `MastodonAPIController` to `FilterController`
Egor Kislitsyn [Fri, 27 Sep 2019 06:06:25 +0000 (13:06 +0700)]
Extract filter actions from `MastodonAPIController` to `FilterController`

5 years agoFix SubscriptionNotificationView
Egor Kislitsyn [Fri, 27 Sep 2019 04:55:47 +0000 (11:55 +0700)]
Fix SubscriptionNotificationView

5 years agoMerge branch 'refactor/status-controller' into 'develop'
kaniini [Fri, 27 Sep 2019 04:37:48 +0000 (04:37 +0000)]
Merge branch 'refactor/status-controller' into 'develop'

Extract status actions from `MastodonAPIController` to `StatusController`

See merge request pleroma/pleroma!1719

5 years agoMove view logic from StatusController.context to StatusView and add a test
Egor Kislitsyn [Thu, 26 Sep 2019 07:28:35 +0000 (14:28 +0700)]
Move view logic from StatusController.context to StatusView and add a test

5 years agoMove StatusController tests from MastodonAPIControllerTest to StatusControllerTest
Egor Kislitsyn [Thu, 26 Sep 2019 06:38:45 +0000 (13:38 +0700)]
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest

5 years agoMerge branch 'refactor/subscription' into 'develop'
kaniini [Fri, 27 Sep 2019 03:51:24 +0000 (03:51 +0000)]
Merge branch 'refactor/subscription' into 'develop'

Refactor subscription functionality

Closes #1130

See merge request pleroma/pleroma!1664

5 years agoExtract status actions from `MastodonAPIController` into `StatusController`
Egor Kislitsyn [Mon, 9 Sep 2019 14:49:02 +0000 (21:49 +0700)]
Extract status actions from `MastodonAPIController` into `StatusController`

5 years agoMerge branch 'patch-2' into 'develop'
kaniini [Fri, 27 Sep 2019 03:50:36 +0000 (03:50 +0000)]
Merge branch 'patch-2' into 'develop'

Minor corrections and clarification for Alpine standard v.3.10

See merge request pleroma/pleroma!1594

5 years agoMerge branch 'update/docs-jp' into 'develop'
kaniini [Fri, 27 Sep 2019 03:49:00 +0000 (03:49 +0000)]
Merge branch 'update/docs-jp' into 'develop'

Update Japanese document to follow English document

See merge request pleroma/pleroma!1615

5 years agoMerge branch 'list-packs-docs' into 'develop'
kaniini [Fri, 27 Sep 2019 03:46:53 +0000 (03:46 +0000)]
Merge branch 'list-packs-docs' into 'develop'

Add list_from endpoint to the pleroma_api docs

See merge request pleroma/pleroma!1720

5 years agoMerge branch 'patch-1' into 'develop'
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

5 years agoMerge branch 'refactor/common_api' into 'develop'
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

5 years agoMerge branch 'refactor/timeline-controller' into 'develop'
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

5 years agoMerge branch 'chore/changelog-sync' into 'develop'
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

5 years agoSync changelogs between master and develop
rinpatch [Thu, 26 Sep 2019 22:16:24 +0000 (01:16 +0300)]
Sync changelogs between master and develop

5 years agoadd deprecated tag
Maksim Pechnikov [Thu, 26 Sep 2019 18:08:04 +0000 (21:08 +0300)]
add deprecated tag

5 years agoMerge branch 'develop' into tests/mastodon_api_controller.ex
Maksim Pechnikov [Thu, 26 Sep 2019 17:56:59 +0000 (20:56 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex

5 years agoMerge branch 'feature/moderation-log-filters' into '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

5 years agoAdd docs
Maxim Filippov [Thu, 26 Sep 2019 16:20:47 +0000 (19:20 +0300)]
Add docs

5 years agoFix code block for admin api document
kPherox [Thu, 26 Sep 2019 16:10:34 +0000 (16:10 +0000)]
Fix code block for admin api document

5 years agoMerge branch 'develop' into feature/moderation-log-filters
Maxim Filippov [Thu, 26 Sep 2019 16:01:54 +0000 (19:01 +0300)]
Merge branch 'develop' into feature/moderation-log-filters

5 years agoMerge branch 'develop' into tests/mastodon_api_controller.ex
Maksim Pechnikov [Thu, 26 Sep 2019 13:13:07 +0000 (16:13 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex

5 years agoUpdate CHANGELOG
Roman Chvanikov [Thu, 26 Sep 2019 12:17:36 +0000 (15:17 +0300)]
Update CHANGELOG

5 years agoAdd list_from endpoint to the pleroma_api docs
Ekaterina Vaartis [Thu, 26 Sep 2019 06:52:11 +0000 (09:52 +0300)]
Add list_from endpoint to the pleroma_api docs

5 years agoMerge develop
Roman Chvanikov [Thu, 26 Sep 2019 07:38:54 +0000 (10:38 +0300)]
Merge develop

5 years agoExtract timeline actions from `MastodonAPIController` into `TimelineController`
Egor Kislitsyn [Thu, 26 Sep 2019 03:53:42 +0000 (10:53 +0700)]
Extract timeline actions from `MastodonAPIController` into `TimelineController`

5 years agoCleanup CommonAPI
Egor Kislitsyn [Tue, 24 Sep 2019 08:56:20 +0000 (15:56 +0700)]
Cleanup CommonAPI

5 years agoAdd ActivityDraft.with_valid/2
Egor Kislitsyn [Mon, 23 Sep 2019 11:52:41 +0000 (18:52 +0700)]
Add ActivityDraft.with_valid/2

5 years agoAdd CommonAPI.ActivityDraft
Egor Kislitsyn [Tue, 24 Sep 2019 09:10:54 +0000 (16:10 +0700)]
Add CommonAPI.ActivityDraft

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 'develop' into tests/mastodon_api_controller.ex
Maksim Pechnikov [Tue, 24 Sep 2019 05:06:04 +0000 (08:06 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex

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 agoupdated tests
Maksim Pechnikov [Mon, 23 Sep 2019 19:37:30 +0000 (22:37 +0300)]
updated tests

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 tests/mastodon_api_controller.ex
Maksim Pechnikov [Mon, 23 Sep 2019 18:41:57 +0000 (21:41 +0300)]
Merge branch 'develop' into tests/mastodon_api_controller.ex

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