akkoma
5 years agoFix tests
Roman Chvanikov [Sun, 28 Apr 2019 20:44:04 +0000 (03:44 +0700)]
Fix tests

5 years agoMerge remote-tracking branch 'origin/develop' into conversations_three
lain [Wed, 1 May 2019 16:40:41 +0000 (18:40 +0200)]
Merge remote-tracking branch 'origin/develop' into conversations_three

5 years agoMerge branch 'support/oauth' into 'develop'
lambda [Wed, 1 May 2019 13:28:04 +0000 (13:28 +0000)]
Merge branch 'support/oauth' into 'develop'

Refactored Pleroma.Web.Auth.Authenticator

See merge request pleroma/pleroma!1108

5 years agoRefactored Pleroma.Web.Auth.Authenticator
Maksim [Wed, 1 May 2019 13:28:04 +0000 (13:28 +0000)]
Refactored Pleroma.Web.Auth.Authenticator

5 years agoMerge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'
rinpatch [Wed, 1 May 2019 11:02:08 +0000 (11:02 +0000)]
Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'

Remove redundant ensure_scrubbed_html

See merge request pleroma/pleroma!1114

5 years agoRemove redundant ensure_scrubbed_html
rinpatch [Wed, 1 May 2019 10:52:44 +0000 (13:52 +0300)]
Remove redundant ensure_scrubbed_html

It is never used as handling for fake and non-fake activities was merged
into one function above it

5 years agoMerge branch 'features/download-mastofe-build' into 'develop'
lambda [Wed, 1 May 2019 10:48:30 +0000 (10:48 +0000)]
Merge branch 'features/download-mastofe-build' into 'develop'

installation/download-mastofe-build.sh: Add mastofe CI-artifacts download

See merge request pleroma/pleroma!1052

5 years agoMerge branch 'bugfix/web-notification-special-char' into 'develop'
lambda [Wed, 1 May 2019 10:45:32 +0000 (10:45 +0000)]
Merge branch 'bugfix/web-notification-special-char' into 'develop'

fix the web push notification with special char for status created

See merge request pleroma/pleroma!1092

5 years agoMerge branch 'harmonize_return_types_in_user_module' into 'develop'
lambda [Wed, 1 May 2019 10:41:00 +0000 (10:41 +0000)]
Merge branch 'harmonize_return_types_in_user_module' into 'develop'

Harmonize return types in user module

Closes #718

See merge request pleroma/pleroma!1112

5 years agoMerge branch 'docs/fix-config.md' into 'develop'
rinpatch [Wed, 1 May 2019 09:16:25 +0000 (09:16 +0000)]
Merge branch 'docs/fix-config.md' into 'develop'

[docs/config.md]Fix syntax highlighting + clarify :frontend_configuration

See merge request pleroma/pleroma!1110

5 years agoMerge branch 'update_auto_linker' into 'develop'
rinpatch [Wed, 1 May 2019 09:14:10 +0000 (09:14 +0000)]
Merge branch 'update_auto_linker' into 'develop'

Update `auto_linker`

See merge request pleroma/pleroma!1111

5 years agotest fixes
Alex S [Wed, 1 May 2019 09:09:53 +0000 (16:09 +0700)]
test fixes

5 years agoUpdate `auto_linker`
Egor Kislitsyn [Wed, 1 May 2019 08:18:12 +0000 (15:18 +0700)]
Update `auto_linker`

5 years agoMerging with develop
Alex S [Wed, 1 May 2019 05:29:33 +0000 (12:29 +0700)]
Merging with develop

Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex

5 years agoFix syntax highlighting + clarify :frontend_configuration
xse [Tue, 30 Apr 2019 23:26:14 +0000 (01:26 +0200)]
Fix syntax highlighting + clarify :frontend_configuration

5 years agoadd scrubber for html special char
Sachin Joshi [Tue, 30 Apr 2019 19:52:17 +0000 (01:37 +0545)]
add scrubber for html special char

5 years agoMerge branch 'develop' into bugfix/web-notification-special-char
Sachin Joshi [Tue, 30 Apr 2019 18:36:30 +0000 (00:21 +0545)]
Merge branch 'develop' into bugfix/web-notification-special-char

5 years agoMerge branch 'fix/stream_out-normalize-only-creates' into 'develop'
rinpatch [Tue, 30 Apr 2019 17:31:48 +0000 (17:31 +0000)]
Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'

Do not normalize objects in stream_out unless the activity type is Create

See merge request pleroma/pleroma!1109

5 years agoDo not normalize objects in stream_out unless the activity type is
rinpatch [Tue, 30 Apr 2019 17:21:28 +0000 (20:21 +0300)]
Do not normalize objects in stream_out unless the activity type is
Create

Saves quite a bit of time with delete activities because they would
always query the db

5 years agoMerge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'
rinpatch [Mon, 29 Apr 2019 18:33:06 +0000 (18:33 +0000)]
Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into 'develop'

Fix MigrateOldBookmarks migration crashing on deleted activities

See merge request pleroma/pleroma!1106

5 years agoFix MigrateOldBookmarks migration crashing on deleted activities
rinpatch [Mon, 29 Apr 2019 18:25:30 +0000 (21:25 +0300)]
Fix MigrateOldBookmarks migration crashing on deleted activities

5 years agoMerge branch 'fix-webpush' into 'develop'
rinpatch [Mon, 29 Apr 2019 16:24:33 +0000 (16:24 +0000)]
Merge branch 'fix-webpush' into 'develop'

WebPush: Use Object.normalize, rewrite tests so they test reality.

See merge request pleroma/pleroma!1105

5 years agoWebPush: Use Object.normalize, rewrite tests so they test reality.
lain [Mon, 29 Apr 2019 16:15:30 +0000 (18:15 +0200)]
WebPush: Use Object.normalize, rewrite tests so they test reality.

5 years agoMerge branch 'fix/add-default-scope-mastoapi' into 'develop'
rinpatch [Mon, 29 Apr 2019 06:45:18 +0000 (06:45 +0000)]
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'

Add default_scope to /api/v1/update_credentials

See merge request pleroma/pleroma!1100

5 years agoMerge branch 'fix/uploads-folder-issues' into 'develop'
kaniini [Sun, 28 Apr 2019 23:05:50 +0000 (23:05 +0000)]
Merge branch 'fix/uploads-folder-issues' into 'develop'

fix issues with the uploads directory

See merge request pleroma/pleroma!1101

5 years agoMerge branch 'regression/rights-only-for-admin' into 'develop'
kaniini [Sun, 28 Apr 2019 23:05:14 +0000 (23:05 +0000)]
Merge branch 'regression/rights-only-for-admin' into 'develop'

Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators

See merge request pleroma/pleroma!1102

5 years agoFix `rights` in TwitterAPI's user entity being present only for
rinpatch [Sun, 28 Apr 2019 16:42:43 +0000 (19:42 +0300)]
Fix `rights` in TwitterAPI's user entity being present only for
Admins/Moderators

In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.

5 years agofix issues with the uploads directory
xse [Sun, 28 Apr 2019 04:43:00 +0000 (06:43 +0200)]
fix issues with the uploads directory

5 years agoMerge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'
kaniini [Sun, 28 Apr 2019 00:21:32 +0000 (00:21 +0000)]
Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'

Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL

See merge request pleroma/pleroma!1099

5 years agoAdd default_scope to /api/v1/update_credentials
rinpatch [Sat, 27 Apr 2019 20:55:54 +0000 (23:55 +0300)]
Add default_scope to /api/v1/update_credentials

5 years agoFix bookmarks depending on embeded object and move checking if the
rinpatch [Sat, 27 Apr 2019 20:06:46 +0000 (23:06 +0300)]
Fix bookmarks depending on embeded object and move checking if the
status is bookmarked to SQL

5 years agoMerge branch 'feature/bbcode' into 'develop'
kaniini [Sat, 27 Apr 2019 07:44:24 +0000 (07:44 +0000)]
Merge branch 'feature/bbcode' into 'develop'

BBCode support (backend)

See merge request pleroma/pleroma!1097

5 years agoMerge branch 'update/pleroma-fe-20190426' into 'develop'
kaniini [Sat, 27 Apr 2019 07:42:01 +0000 (07:42 +0000)]
Merge branch 'update/pleroma-fe-20190426' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!1098

5 years agoupdate pleroma frontend
William Pitcock [Sat, 27 Apr 2019 07:34:59 +0000 (07:34 +0000)]
update pleroma frontend

5 years agotests: fix up for changed bbcode library output and verify html is properly escaped
William Pitcock [Fri, 26 Apr 2019 22:38:56 +0000 (22:38 +0000)]
tests: fix up for changed bbcode library output and verify html is properly escaped

5 years agoadd support for bbcode
William Pitcock [Fri, 26 Apr 2019 10:17:57 +0000 (10:17 +0000)]
add support for bbcode

5 years agomix: add bbcode dependency
William Pitcock [Fri, 26 Apr 2019 09:22:26 +0000 (09:22 +0000)]
mix: add bbcode dependency

5 years agoMerge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
lambda [Fri, 26 Apr 2019 11:59:47 +0000 (11:59 +0000)]
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'

Feature/807 bookmark endpoint extension

Closes #807

See merge request pleroma/pleroma!1059

5 years agoMerge branch 'feature/mastoapi-new-config' into 'develop'
kaniini [Fri, 26 Apr 2019 02:41:35 +0000 (02:41 +0000)]
Merge branch 'feature/mastoapi-new-config' into 'develop'

Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API

This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)

Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs

See merge request pleroma/pleroma!1093

5 years agoMerge branch 'chore/update-changelog' into 'develop'
kaniini [Thu, 25 Apr 2019 23:35:13 +0000 (23:35 +0000)]
Merge branch 'chore/update-changelog' into 'develop'

update Changelog

See merge request pleroma/pleroma!1096

5 years agoupdate Changelog
William Pitcock [Thu, 25 Apr 2019 23:27:38 +0000 (23:27 +0000)]
update Changelog

5 years agoMerge branch 'feature/mediaproxy-whitelist' into 'develop'
kaniini [Thu, 25 Apr 2019 23:23:27 +0000 (23:23 +0000)]
Merge branch 'feature/mediaproxy-whitelist' into 'develop'

Add mediaproxy whitelist capability

Closes #837

See merge request pleroma/pleroma!1095

5 years agoAdd mediaproxy whitelist capability
Mark Felder [Thu, 25 Apr 2019 23:11:47 +0000 (18:11 -0500)]
Add mediaproxy whitelist capability

5 years agoMerge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'
Haelwenn [Thu, 25 Apr 2019 09:47:42 +0000 (09:47 +0000)]
Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'

activitypub: transmogrifier: send reject follow if following does not succeed

See merge request pleroma/pleroma!1094

5 years agoMove settings to Source subentity
rinpatch [Thu, 25 Apr 2019 06:14:35 +0000 (09:14 +0300)]
Move settings to Source subentity

5 years agotest fixes
Alex S [Thu, 25 Apr 2019 07:09:57 +0000 (14:09 +0700)]
test fixes

5 years agofixes for tests
Alex S [Mon, 22 Apr 2019 09:16:19 +0000 (16:16 +0700)]
fixes for tests

5 years agomigration without using old field name
Alex S [Mon, 22 Apr 2019 05:45:45 +0000 (12:45 +0700)]
migration without using old field name

removing old field from db, after bookmarks migration

5 years agounused
Alex S [Sat, 20 Apr 2019 07:41:42 +0000 (14:41 +0700)]
unused

5 years agoremoving useless transaction
Alex S [Wed, 17 Apr 2019 07:24:11 +0000 (14:24 +0700)]
removing useless transaction

5 years agomigration optimization
Alex S [Mon, 15 Apr 2019 04:43:02 +0000 (11:43 +0700)]
migration optimization

changelog wording

5 years agochangelog file update
Alex S [Sun, 14 Apr 2019 14:54:49 +0000 (21:54 +0700)]
changelog file update

5 years agofavourites add bookmark display
Alex S [Sun, 14 Apr 2019 14:42:18 +0000 (21:42 +0700)]
favourites add bookmark display

5 years agomigrate user.bookmarks to separate table
Alex S [Sun, 14 Apr 2019 14:37:05 +0000 (21:37 +0700)]
migrate user.bookmarks to separate table

5 years agobookmarks in separate table
Alex S [Sun, 14 Apr 2019 12:45:56 +0000 (19:45 +0700)]
bookmarks in separate table

5 years agoactivitypub: transmogrifier: send reject follow if following does not succeed
William Pitcock [Wed, 24 Apr 2019 23:52:33 +0000 (23:52 +0000)]
activitypub: transmogrifier: send reject follow if following does not succeed

5 years agoFix leaking private configuration parameters in Mastodon and Twitter APIs, and add...
rinpatch [Wed, 24 Apr 2019 17:01:42 +0000 (20:01 +0300)]
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API

This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674)

Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs

5 years agofix the status notification with special char
Sachin Joshi [Wed, 24 Apr 2019 01:21:17 +0000 (07:06 +0545)]
fix the status notification with special char

5 years agoMerge branch 'security/fix-html-class-scrubbing' into 'develop'
kaniini [Tue, 23 Apr 2019 23:07:56 +0000 (23:07 +0000)]
Merge branch 'security/fix-html-class-scrubbing' into 'develop'

html: lock down allowed class attributes to only those related to microformats

See merge request pleroma/pleroma!1090

5 years agohtml: lock down allowed class attributes to only those related to microformats
William Pitcock [Tue, 23 Apr 2019 22:55:21 +0000 (22:55 +0000)]
html: lock down allowed class attributes to only those related to microformats

5 years agoMerge branch 'feature/users-favourites-timeline-endpoint' into 'develop'
kaniini [Tue, 23 Apr 2019 02:47:43 +0000 (02:47 +0000)]
Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop'

Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)

Closes #789

See merge request pleroma/pleroma!1056

5 years agoExtend Mastodon API with public endpoint for getting Favorites timeline of any user...
Sergey Suprunenko [Tue, 23 Apr 2019 02:47:43 +0000 (02:47 +0000)]
Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)

5 years agoMerge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
kaniini [Tue, 23 Apr 2019 02:43:53 +0000 (02:43 +0000)]
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'

Add `in_reply_to_account_acct` to MastoAPI status entity

See merge request pleroma/pleroma!1086

5 years agoMerge branch 'fix/normalize-activities' into 'develop'
kaniini [Tue, 23 Apr 2019 02:43:26 +0000 (02:43 +0000)]
Merge branch 'fix/normalize-activities' into 'develop'

Normalize acitvities instead of objects inside them

See merge request pleroma/pleroma!1085

5 years agoMerge branch 'develop' into 'develop'
kaniini [Tue, 23 Apr 2019 02:41:21 +0000 (02:41 +0000)]
Merge branch 'develop' into 'develop'

Add shortcode_globs setting to documentation

See merge request pleroma/pleroma!1087

5 years agoMerge branch 'add-healthcheck-setting-to-config' into 'develop'
kaniini [Mon, 22 Apr 2019 18:31:01 +0000 (18:31 +0000)]
Merge branch 'add-healthcheck-setting-to-config' into 'develop'

added healthcheck setting to instance config

See merge request pleroma/pleroma!1088

5 years agoAdd :emoji settings to config.md
ilja [Mon, 22 Apr 2019 17:42:02 +0000 (19:42 +0200)]
Add :emoji settings to config.md

5 years agoadded healthcheck setting to instance config
Alex S [Mon, 22 Apr 2019 10:00:06 +0000 (17:00 +0700)]
added healthcheck setting to instance config

5 years agoAdd shortcode_globs setting to documentation
ilja [Mon, 22 Apr 2019 09:17:53 +0000 (11:17 +0200)]
Add shortcode_globs setting to documentation

5 years agoAdd a changelog entry for `pleroma.in_reply_to_account_acct`
rinpatch [Mon, 22 Apr 2019 09:02:41 +0000 (12:02 +0300)]
Add a changelog entry for `pleroma.in_reply_to_account_acct`

5 years agoAdd `pleroma.in_reply_to_account_acct` to MastoAPI status entity
rinpatch [Mon, 22 Apr 2019 08:53:37 +0000 (11:53 +0300)]
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity

5 years agoReplace Object.normalize(activity.data[object] with Object.normalize(acitivty) to...
rinpatch [Mon, 22 Apr 2019 08:27:29 +0000 (11:27 +0300)]
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading

5 years agoMerge branch 'fix/emoji-task-docs' into 'develop'
rinpatch [Mon, 22 Apr 2019 08:09:08 +0000 (08:09 +0000)]
Merge branch 'fix/emoji-task-docs' into 'develop'

Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs

See merge request pleroma/pleroma!1084

5 years agoFix unclosed ` and put synopsis into a code block in pleroma.emoji mix
rinpatch [Mon, 22 Apr 2019 08:02:31 +0000 (11:02 +0300)]
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
task docs

5 years agoMerge branch 'get-cached-everywhere' into 'develop'
kaniini [Mon, 22 Apr 2019 07:20:43 +0000 (07:20 +0000)]
Merge branch 'get-cached-everywhere' into 'develop'

Use `User.get_cached*` everywhere

See merge request pleroma/pleroma!1021

5 years agoUse `User.get_cached*` everywhere
Egor [Mon, 22 Apr 2019 07:20:43 +0000 (07:20 +0000)]
Use `User.get_cached*` everywhere

5 years agoMerge branch 'feature/826-healthcheck-endpoint' into 'develop'
kaniini [Mon, 22 Apr 2019 07:19:53 +0000 (07:19 +0000)]
Merge branch 'feature/826-healthcheck-endpoint' into 'develop'

Feature/826 healthcheck endpoint

Closes #826

See merge request pleroma/pleroma!1083

5 years agoFeature/826 healthcheck endpoint
Alexander Strizhakov [Mon, 22 Apr 2019 07:19:53 +0000 (07:19 +0000)]
Feature/826 healthcheck endpoint

5 years agoMerge branch 'rework-emoji-management' into 'develop'
kaniini [Mon, 22 Apr 2019 02:07:19 +0000 (02:07 +0000)]
Merge branch 'rework-emoji-management' into 'develop'

Remove finmoji and add a way to download emojis in packs

Closes #817 and #821

See merge request pleroma/pleroma!1073

5 years agoFix emoji.txt / custom_emoji.txt / shortcode_globs handling
Ekaterina Vaartis [Sun, 21 Apr 2019 19:46:55 +0000 (22:46 +0300)]
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling

5 years agoMerge branch 'docs/posting_formatted' into 'develop'
rinpatch [Sun, 21 Apr 2019 19:57:52 +0000 (19:57 +0000)]
Merge branch 'docs/posting_formatted' into 'develop'

differences_in_mastoapi_responses.md: `content_type` parameter of post submission

See merge request pleroma/pleroma!1081

5 years agoFormatting
Ekaterina Vaartis [Sun, 21 Apr 2019 19:33:54 +0000 (22:33 +0300)]
Formatting

5 years agoChange the default manifest to pleroma's namespace
Ekaterina Vaartis [Sun, 21 Apr 2019 19:32:34 +0000 (22:32 +0300)]
Change the default manifest to pleroma's namespace

5 years agoReplace MD5 with SHA256 for emoji pack verification
Ekaterina Vaartis [Sun, 21 Apr 2019 19:19:19 +0000 (22:19 +0300)]
Replace MD5 with SHA256 for emoji pack verification

5 years agoWrap the docstrings to 70 characters
Ekaterina Vaartis [Sun, 21 Apr 2019 19:16:46 +0000 (22:16 +0300)]
Wrap the docstrings to 70 characters

5 years agoFix Credo warning
Roman Chvanikov [Sun, 21 Apr 2019 16:24:33 +0000 (23:24 +0700)]
Fix Credo warning

5 years agoFix Credo warning
Roman Chvanikov [Sun, 21 Apr 2019 16:19:36 +0000 (23:19 +0700)]
Fix Credo warning

5 years agoRefactor conversation function in MastodonAPIController to use a View
Roman Chvanikov [Sun, 21 Apr 2019 16:14:27 +0000 (23:14 +0700)]
Refactor conversation function in MastodonAPIController to use a View

5 years agoMerge branch '923_oauth_controller_refactoring_p2' into 'develop'
lambda [Sun, 21 Apr 2019 13:52:06 +0000 (13:52 +0000)]
Merge branch '923_oauth_controller_refactoring_p2' into 'develop'

[#923] Refactored OAuthController#authorize

See merge request pleroma/pleroma!1080

5 years agoAdd accounts and last_status to conversation read response
Roman Chvanikov [Sun, 21 Apr 2019 13:26:13 +0000 (20:26 +0700)]
Add accounts and last_status to conversation read response

5 years agodifferences_in_mastoapi_responses.md: `content_type` parameter of post submission
Haelwenn (lanodan) Monnier [Sun, 21 Apr 2019 10:48:40 +0000 (12:48 +0200)]
differences_in_mastoapi_responses.md: `content_type` parameter of post submission

5 years ago[#923] Refactored OAuthController#authorize definitions, added test.
Ivan Tashkinov [Sun, 21 Apr 2019 07:51:32 +0000 (10:51 +0300)]
[#923] Refactored OAuthController#authorize definitions, added test.

5 years agoMerge branch 'fix/mastoapi-status-view' into 'develop'
kaniini [Sun, 21 Apr 2019 04:22:56 +0000 (04:22 +0000)]
Merge branch 'fix/mastoapi-status-view' into 'develop'

MastoAPI reblog status view

See merge request pleroma/pleroma!1065

5 years agoSet correct values in the MastoAPI reblog status view
eugenijm [Mon, 15 Apr 2019 17:32:14 +0000 (20:32 +0300)]
Set correct values in the MastoAPI reblog status view

5 years agoMerge branch 'fix/follow-with-reblogs' into 'develop'
kaniini [Sun, 21 Apr 2019 00:41:16 +0000 (00:41 +0000)]
Merge branch 'fix/follow-with-reblogs' into 'develop'

Handle `reblogs` on the first follow request

See merge request pleroma/pleroma!1076

5 years agoMerge branch 'patch-1' into 'develop'
kaniini [Sun, 21 Apr 2019 00:40:29 +0000 (00:40 +0000)]
Merge branch 'patch-1' into 'develop'

Mention Mastodon 2.8+ follow import fix in changelog

See merge request pleroma/pleroma!1079

5 years agoMention Mastodon 2.8+ follow import fix in changelog
Francis Dinh [Sat, 20 Apr 2019 18:28:08 +0000 (18:28 +0000)]
Mention Mastodon 2.8+ follow import fix in changelog

5 years agoRefactor query to return only 1 message instead of 20
Roman Chvanikov [Sat, 20 Apr 2019 17:40:41 +0000 (00:40 +0700)]
Refactor query to return only 1 message instead of 20

5 years agoRemove most finmoji mentions where appropriate
Ekaterina Vaartis [Sat, 20 Apr 2019 12:34:45 +0000 (15:34 +0300)]
Remove most finmoji mentions where appropriate

5 years agoAdd the emoji packs & finmoji removal to the changelog
Ekaterina Vaartis [Sat, 20 Apr 2019 12:17:21 +0000 (15:17 +0300)]
Add the emoji packs & finmoji removal to the changelog