akkoma
5 years ago[#468] Formatting fix.
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:35 +0000 (14:07 +0300)]
[#468] Formatting fix.

5 years ago[#468] Merged `upstream/develop`, resolved conflicts.
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:04 +0000 (14:07 +0300)]
[#468] Merged `upstream/develop`, resolved conflicts.

5 years ago[#468] Refactored OAuth scopes' defaults & missing selection handling.
Ivan Tashkinov [Sun, 17 Feb 2019 10:49:14 +0000 (13:49 +0300)]
[#468] Refactored OAuth scopes' defaults & missing selection handling.

5 years agoSpeed up docker postgres.
lain [Sun, 17 Feb 2019 10:36:14 +0000 (11:36 +0100)]
Speed up docker postgres.

5 years agoFix recipient count in hellthread policy
rinpatch [Sun, 17 Feb 2019 10:46:40 +0000 (13:46 +0300)]
Fix recipient count in hellthread policy

5 years agoFix formating
rinpatch [Sun, 17 Feb 2019 09:07:49 +0000 (12:07 +0300)]
Fix formating

5 years agoAdd differences in MastoAPI responses to mix.exs extras
rinpatch [Sun, 17 Feb 2019 07:34:00 +0000 (10:34 +0300)]
Add differences in MastoAPI responses to mix.exs extras

5 years agoWeb.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 22:11:12 +0000 (23:11 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching

5 years ago[MastoAPI] Add switching of frontend flavours
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 11:31:12 +0000 (12:31 +0100)]
[MastoAPI] Add switching of frontend flavours

5 years agomix.exs: Add docs/Clients.md to docs.extras
Haelwenn (lanodan) Monnier [Sat, 16 Feb 2019 18:39:03 +0000 (19:39 +0100)]
mix.exs: Add docs/Clients.md to docs.extras

[ci skip]

5 years agoAdd a section on how to identify a pleroma instance, clarify that post upload limit...
rinpatch [Sat, 16 Feb 2019 18:14:07 +0000 (21:14 +0300)]
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too

5 years agoMerge branch 'welcome-message' into 'develop'
rinpatch [Sat, 16 Feb 2019 17:39:04 +0000 (17:39 +0000)]
Merge branch 'welcome-message' into 'develop'

Add optional welcome message.

See merge request pleroma/pleroma!832

5 years agoRemove a limit on attachments in Mastodon API and document the changes in responses...
rinpatch [Sat, 16 Feb 2019 17:38:25 +0000 (20:38 +0300)]
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon

5 years agoWelcomeMessage: specify that the user has to be local.
lain [Sat, 16 Feb 2019 16:25:06 +0000 (17:25 +0100)]
WelcomeMessage: specify that the user has to be local.

5 years agoWelcomeMessage: Get rid of Ecto reference.
lain [Sat, 16 Feb 2019 16:24:48 +0000 (17:24 +0100)]
WelcomeMessage: Get rid of Ecto reference.

5 years agoCheck that the welcome message is sent from the correct user.
lain [Sat, 16 Feb 2019 16:24:31 +0000 (17:24 +0100)]
Check that the welcome message is sent from the correct user.

5 years agoAdd option to return all friends in twitter api.
lain [Sat, 16 Feb 2019 16:01:15 +0000 (17:01 +0100)]
Add option to return all friends in twitter api.

Mainly useful for user export.

5 years agoAdd optional welcome message.
lain [Sat, 16 Feb 2019 15:42:34 +0000 (16:42 +0100)]
Add optional welcome message.

5 years ago[#468] Defined OAuth restrictions for all applicable routes.
Ivan Tashkinov [Fri, 15 Feb 2019 16:54:37 +0000 (19:54 +0300)]
[#468] Defined OAuth restrictions for all applicable routes.
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.

5 years agoMerge branch 'bugfix/oauth-token-padding' into 'develop'
lambda [Fri, 15 Feb 2019 14:58:13 +0000 (14:58 +0000)]
Merge branch 'bugfix/oauth-token-padding' into 'develop'

oauth: never use base64 padding when returning tokens to applications

See merge request pleroma/pleroma!825

5 years agoMerge branch 'hellthread-filter-fix' into 'develop'
rinpatch [Fri, 15 Feb 2019 13:18:35 +0000 (13:18 +0000)]
Merge branch 'hellthread-filter-fix' into 'develop'

Hellthread filter fix

Closes #634

See merge request pleroma/pleroma!831

5 years agoReadd threshold is not 0 check, optmization?
Karen Konou [Fri, 15 Feb 2019 13:05:20 +0000 (14:05 +0100)]
Readd threshold is not 0 check, optmization?

5 years agoRename test, add check for follower collection when delisting
Karen Konou [Fri, 15 Feb 2019 12:43:14 +0000 (13:43 +0100)]
Rename test, add check for follower collection when delisting

5 years agoMerge branch 'bugfix/actor-containment' into 'develop'
rinpatch [Fri, 15 Feb 2019 12:27:03 +0000 (12:27 +0000)]
Merge branch 'bugfix/actor-containment' into 'develop'

activitypub: correctly handle bare URIs in user lookup

Closes #645

See merge request pleroma/pleroma!829

5 years agoAdd tests, change default config values, fix a bug
Karen Konou [Fri, 15 Feb 2019 11:47:50 +0000 (12:47 +0100)]
Add tests, change default config values, fix a bug

5 years agoAdd logic for keeping follow_request_count up-to-date on the `follow`,
eugenijm [Sat, 9 Feb 2019 23:26:29 +0000 (02:26 +0300)]
Add logic for keeping follow_request_count up-to-date on the `follow`,

`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.

5 years agotest: user: add a test for whether user search returns a user or not
William Pitcock [Thu, 14 Feb 2019 19:59:12 +0000 (19:59 +0000)]
test: user: add a test for whether user search returns a user or not

5 years agouser: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
William Pitcock [Thu, 14 Feb 2019 19:58:24 +0000 (19:58 +0000)]
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()

get_or_fetch() handles the nickname verses URI differences transparently.

5 years agoMerge branch 'bugfix/activitypub-reserialization' into 'develop'
lambda [Thu, 14 Feb 2019 19:54:16 +0000 (19:54 +0000)]
Merge branch 'bugfix/activitypub-reserialization' into 'develop'

activitypub transmogrifier: fix reserialization edge cases

See merge request pleroma/pleroma!826

5 years agoactivitypub: clean up logging statements a little
William Pitcock [Thu, 14 Feb 2019 19:42:33 +0000 (19:42 +0000)]
activitypub: clean up logging statements a little

5 years agoMerge remote-tracking branch 'upstream/develop' into patch-image-description
Wim Vanderbauwhede [Thu, 14 Feb 2019 16:41:40 +0000 (16:41 +0000)]
Merge remote-tracking branch 'upstream/develop' into patch-image-description

5 years ago[#468] Refactored OAuth scopes parsing / defaults handling.
Ivan Tashkinov [Thu, 14 Feb 2019 14:03:19 +0000 (17:03 +0300)]
[#468] Refactored OAuth scopes parsing / defaults handling.

5 years ago[#468] OAuth scopes-related data migration simplification.
Ivan Tashkinov [Thu, 14 Feb 2019 11:28:26 +0000 (14:28 +0300)]
[#468] OAuth scopes-related data migration simplification.

5 years agoMerge branch 'fix/mediaproxy-s3' into 'develop'
href [Thu, 14 Feb 2019 10:10:13 +0000 (10:10 +0000)]
Merge branch 'fix/mediaproxy-s3' into 'develop'

Fix S3 links encoding in Mediaproxy

Closes #580

See merge request pleroma/pleroma!828

5 years agoFix queue name
Egor Kislitsyn [Thu, 14 Feb 2019 10:02:47 +0000 (17:02 +0700)]
Fix queue name

5 years agofix S3 links encoding in Mediaproxy
Egor Kislitsyn [Thu, 14 Feb 2019 08:55:21 +0000 (15:55 +0700)]
fix S3 links encoding in Mediaproxy

5 years agoMerge branch 'fix/credo-issues-test' into 'develop'
kaniini [Thu, 14 Feb 2019 03:55:26 +0000 (03:55 +0000)]
Merge branch 'fix/credo-issues-test' into 'develop'

Fix credo issues in ./test

See merge request pleroma/pleroma!808

5 years agoMerge branch 'bugfix/activitypub-totalitems-removal' into 'develop'
Haelwenn [Thu, 14 Feb 2019 03:40:33 +0000 (03:40 +0000)]
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'

activitypub: user inbox/outbox: `totalItems` removal

See merge request pleroma/pleroma!827

5 years agotests: update tests for totalItems leak fix
William Pitcock [Thu, 14 Feb 2019 03:22:54 +0000 (03:22 +0000)]
tests: update tests for totalItems leak fix

5 years agoactivitypub: user view: formatting
William Pitcock [Thu, 14 Feb 2019 03:13:07 +0000 (03:13 +0000)]
activitypub: user view: formatting

5 years agoactivitypub: user view: report totalItems=0 for follows/followers when hidden
William Pitcock [Thu, 14 Feb 2019 03:03:41 +0000 (03:03 +0000)]
activitypub: user view: report totalItems=0 for follows/followers when hidden

5 years agoactivitypub: user view: remove totalItems from user outbox
William Pitcock [Thu, 14 Feb 2019 03:02:45 +0000 (03:02 +0000)]
activitypub: user view: remove totalItems from user outbox

(this is based on a counter in User.Info, but the counter is not reliable.)

5 years agoactivitypub: user view: remove totalInbox from user inbox view
William Pitcock [Thu, 14 Feb 2019 03:01:39 +0000 (03:01 +0000)]
activitypub: user view: remove totalInbox from user inbox view

It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.

5 years agoMerge branch 'feature/activitypub-oauth-endpoints' into 'develop'
kaniini [Thu, 14 Feb 2019 02:50:06 +0000 (02:50 +0000)]
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'

ActivityPub C2S oauth endpoints

See merge request pleroma/pleroma!821

5 years agoactivitypub: user view: do not expose oAuth endpoints for instance users
William Pitcock [Thu, 14 Feb 2019 02:41:21 +0000 (02:41 +0000)]
activitypub: user view: do not expose oAuth endpoints for instance users

5 years agooauth: never use base64 padding when returning tokens to applications
William Pitcock [Thu, 14 Feb 2019 01:05:25 +0000 (01:05 +0000)]
oauth: never use base64 padding when returning tokens to applications

The normal Base64 alphabet uses the equals sign (=) as a padding character.  Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.

5 years agotests: add some reserialization tests based on IR differences
William Pitcock [Thu, 14 Feb 2019 00:59:18 +0000 (00:59 +0000)]
tests: add some reserialization tests based on IR differences

5 years agoactivitypub: transmogrifier: correctly handle nil inReplyTo value
William Pitcock [Thu, 14 Feb 2019 00:34:20 +0000 (00:34 +0000)]
activitypub: transmogrifier: correctly handle nil inReplyTo value

5 years agoactivitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
William Pitcock [Thu, 14 Feb 2019 00:27:35 +0000 (00:27 +0000)]
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects

5 years agoMerge branch 'feature/better-login-errors' into 'develop'
kaniini [Wed, 13 Feb 2019 23:42:11 +0000 (23:42 +0000)]
Merge branch 'feature/better-login-errors' into 'develop'

Improve login error for OAuth flow

See merge request pleroma/pleroma!824

5 years agoImprove login error for OAuth flow
Mark Felder [Wed, 13 Feb 2019 22:33:22 +0000 (22:33 +0000)]
Improve login error for OAuth flow

5 years ago[#468] User UI for OAuth permissions restriction. Standardized storage format for...
Ivan Tashkinov [Wed, 13 Feb 2019 21:29:29 +0000 (00:29 +0300)]
[#468] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.

5 years agotests: add tests for endpoints
William Pitcock [Wed, 13 Feb 2019 19:48:24 +0000 (19:48 +0000)]
tests: add tests for endpoints

5 years agoactivitypub: user view: use route helpers instead of hardcoded URIs
William Pitcock [Wed, 13 Feb 2019 19:20:41 +0000 (19:20 +0000)]
activitypub: user view: use route helpers instead of hardcoded URIs

5 years agoactivitypub: user view: add oauthRegistrationEndpoint to user profiles
William Pitcock [Tue, 12 Feb 2019 21:49:48 +0000 (21:49 +0000)]
activitypub: user view: add oauthRegistrationEndpoint to user profiles

5 years agoactivitypub: user view: fix up endpoints rendering
William Pitcock [Tue, 12 Feb 2019 21:42:32 +0000 (21:42 +0000)]
activitypub: user view: fix up endpoints rendering

5 years agolitepub schema: add oauthRegistrationEndpoint [ci skip]
William Pitcock [Tue, 12 Feb 2019 21:37:37 +0000 (21:37 +0000)]
litepub schema: add oauthRegistrationEndpoint [ci skip]

5 years agouser view: add AP C2S oauth endpoints to local user profiles
William Pitcock [Tue, 12 Feb 2019 21:28:11 +0000 (21:28 +0000)]
user view: add AP C2S oauth endpoints to local user profiles

5 years agorefactored code
Karen Konou [Wed, 13 Feb 2019 15:23:09 +0000 (16:23 +0100)]
refactored code

5 years agoMerge branch 'develop' into hellthread-filter-fix
Karen Konou [Tue, 12 Feb 2019 23:04:26 +0000 (00:04 +0100)]
Merge branch 'develop' into hellthread-filter-fix

5 years agoMerge branch 'mass-follow-fixes' into 'develop'
rinpatch [Wed, 13 Feb 2019 13:04:23 +0000 (13:04 +0000)]
Merge branch 'mass-follow-fixes' into 'develop'

User.follow_all: Respect blocks in both directions.

See merge request pleroma/pleroma!823

5 years agoUser.follow_all: Respect blocks in both directions.
lain [Wed, 13 Feb 2019 12:52:27 +0000 (13:52 +0100)]
User.follow_all: Respect blocks in both directions.

5 years agoUpdate token.ex
Maxim Filippov [Mon, 11 Feb 2019 09:48:24 +0000 (09:48 +0000)]
Update token.ex

5 years agoAdd revoke token
Maxim Filippov [Sun, 10 Feb 2019 21:49:56 +0000 (00:49 +0300)]
Add revoke token

5 years agoAdd OAuth tokens endpoint
Maxim Filippov [Sun, 10 Feb 2019 19:41:06 +0000 (22:41 +0300)]
Add OAuth tokens endpoint

5 years agoMerge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'
kaniini [Wed, 13 Feb 2019 07:51:14 +0000 (07:51 +0000)]
Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'

Mark streaming feature for desktop apps in Clients.md

See merge request pleroma/pleroma!818

5 years agoMark streaming feature for desktop apps in Clients.md
Hakaba Hitoyo [Wed, 13 Feb 2019 07:51:14 +0000 (07:51 +0000)]
Mark streaming feature for desktop apps in Clients.md

5 years agoMerge branch 'bugfix/mdii-uploader' into 'develop'
kaniini [Wed, 13 Feb 2019 07:32:56 +0000 (07:32 +0000)]
Merge branch 'bugfix/mdii-uploader' into 'develop'

Bugfix for MDII Uploader

See merge request pleroma/pleroma!822

5 years agobugfix mdii uploader
hakabahitoyo [Wed, 13 Feb 2019 06:46:42 +0000 (15:46 +0900)]
bugfix mdii uploader

5 years agoadded checks for public url and follower collections
Karen Konou [Tue, 12 Feb 2019 22:25:09 +0000 (23:25 +0100)]
added checks for public url and follower collections

5 years agoMerge branch 'feature/csp_mastofe-dev' into 'develop'
kaniini [Tue, 12 Feb 2019 22:41:46 +0000 (22:41 +0000)]
Merge branch 'feature/csp_mastofe-dev' into 'develop'

Add CSP for mastofe development, remove secure-cookies in MIX_ENV=dev

See merge request pleroma/pleroma!820

5 years agoPlugs.HTTPSecurityPlug: Add webpacker to connect-src
Haelwenn (lanodan) Monnier [Sat, 2 Feb 2019 18:06:26 +0000 (19:06 +0100)]
Plugs.HTTPSecurityPlug: Add webpacker to connect-src

5 years agoPlugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
Haelwenn (lanodan) Monnier [Fri, 1 Feb 2019 12:10:50 +0000 (13:10 +0100)]
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode

This is needed to run dev mode mastofe at the same time

5 years agoconfig/dev.exs: Don’t put secure cookies on dev
Haelwenn (lanodan) Monnier [Thu, 22 Nov 2018 06:12:13 +0000 (07:12 +0100)]
config/dev.exs: Don’t put secure cookies on dev

5 years agoMerge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'
Haelwenn [Tue, 12 Feb 2019 02:44:23 +0000 (02:44 +0000)]
Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'

Fix CSP check for 'upgrade-insecure-requests'

See merge request pleroma/pleroma!814

5 years agoMerge branch 'doc/mark-streaming-feature-for-apps' into 'develop'
Haelwenn [Tue, 12 Feb 2019 02:35:15 +0000 (02:35 +0000)]
Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'

Mark streaming feature for mobile/web apps in Clients.md

See merge request pleroma/pleroma!816

[ci skip]

5 years agoMark streaming feature for mobile/web apps in Clients.md
Hakaba Hitoyo [Tue, 12 Feb 2019 02:35:15 +0000 (02:35 +0000)]
Mark streaming feature for mobile/web apps in Clients.md

5 years agoFormatting
Mark Felder [Tue, 12 Feb 2019 00:37:22 +0000 (00:37 +0000)]
Formatting

5 years agoFix compile
Mark Felder [Tue, 12 Feb 2019 00:25:12 +0000 (00:25 +0000)]
Fix compile

5 years agoWIP: Fix Twitter Cards
Mark Felder [Mon, 11 Feb 2019 23:59:04 +0000 (23:59 +0000)]
WIP: Fix Twitter Cards

Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.

Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.

Profiles are now represented as Summary Cards

Posts with images are now represented as Summart with Large Image Cards

Posts with video and audio attachments are represented as Player Cards.

This now passes the Twitter Card Validator.

Validator and Docs are below

https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards

5 years agoUse url[:scheme] instead of protocol to determine if https is enabled
shibayashi [Mon, 11 Feb 2019 23:08:52 +0000 (00:08 +0100)]
Use url[:scheme] instead of protocol to determine if https is enabled

5 years agoMerge branch 'bugfix/keyword-policy-check-summary' into 'develop'
kaniini [Mon, 11 Feb 2019 18:45:15 +0000 (18:45 +0000)]
Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'

Filter summary field in KeywordPolicy

See merge request pleroma/pleroma!812

5 years agoFilter summary in keywordpolicy
rinpatch [Mon, 11 Feb 2019 18:35:40 +0000 (21:35 +0300)]
Filter summary in keywordpolicy

5 years agoMerge branch 'feature/thread-muting' into 'develop'
rinpatch [Mon, 11 Feb 2019 15:02:14 +0000 (15:02 +0000)]
Merge branch 'feature/thread-muting' into 'develop'

Feature/thread muting

See merge request pleroma/pleroma!796

5 years agoMerge branch 'feature/rich-media-limits' into 'develop'
lambda [Mon, 11 Feb 2019 12:33:58 +0000 (12:33 +0000)]
Merge branch 'feature/rich-media-limits' into 'develop'

rich media: tighten fetching timeouts and size limits

See merge request pleroma/pleroma!809

5 years agoMerge branch 'develop' into feature/thread-muting
Karen Konou [Mon, 11 Feb 2019 11:10:10 +0000 (12:10 +0100)]
Merge branch 'develop' into feature/thread-muting

5 years agoRefactor as per Rin's suggestions, add endpoint tests
Karen Konou [Mon, 11 Feb 2019 10:59:51 +0000 (11:59 +0100)]
Refactor as per Rin's suggestions, add endpoint tests

5 years agoMerge branch 'revert-e0de0fcf' into 'develop'
lambda [Mon, 11 Feb 2019 08:22:54 +0000 (08:22 +0000)]
Merge branch 'revert-e0de0fcf' into 'develop'

Revert "Merge branch 'object-creation' into 'develop'"

See merge request pleroma/pleroma!810

5 years agoRevert "Merge branch 'object-creation' into 'develop'"
lambda [Mon, 11 Feb 2019 08:07:39 +0000 (08:07 +0000)]
Revert "Merge branch 'object-creation' into 'develop'"

This reverts merge request !802

5 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
Egor Kislitsyn [Mon, 11 Feb 2019 06:54:21 +0000 (13:54 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex

5 years agotest: Change `lenght(…) == 0` to `Enum.empty?(…)`
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 23:08:48 +0000 (00:08 +0100)]
test: Change `lenght(…) == 0` to `Enum.empty?(…)`

5 years agotest: de-group alias/es
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 21:57:38 +0000 (22:57 +0100)]
test: de-group alias/es

5 years ago.credo.exs: Add test directory as well
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 21:56:47 +0000 (22:56 +0100)]
.credo.exs: Add test directory as well

5 years agorich media: tighten fetching timeouts and size limits
William Pitcock [Sun, 10 Feb 2019 21:37:51 +0000 (21:37 +0000)]
rich media: tighten fetching timeouts and size limits

5 years agoMerge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
kaniini [Sun, 10 Feb 2019 21:28:41 +0000 (21:28 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'

Update Mastodon Frontend to 2019-02-10 bundle

See merge request pleroma/pleroma!806

5 years agoMerge branch 'feather_mention' into 'develop'
kaniini [Sun, 10 Feb 2019 21:16:29 +0000 (21:16 +0000)]
Merge branch 'feather_mention' into 'develop'

Add Feather to the clients list

See merge request pleroma/pleroma!804

5 years agoMerge branch 'fix/credo-issues' into 'develop'
kaniini [Sun, 10 Feb 2019 20:54:21 +0000 (20:54 +0000)]
Merge branch 'fix/credo-issues' into 'develop'

Fix credo issues

See merge request pleroma/pleroma!786

5 years agoMerge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths...
kaniini [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'

Update service files of OpenRC and systemd to new recommended paths

See merge request pleroma/pleroma!798

5 years agoUpdate service files of OpenRC and systemd to new recommended paths
shibayashi [Sun, 10 Feb 2019 19:25:34 +0000 (19:25 +0000)]
Update service files of OpenRC and systemd to new recommended paths

5 years agoUpdate Mastodon Frontend to 2019-02-10 bundle
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 18:55:22 +0000 (19:55 +0100)]
Update Mastodon Frontend to 2019-02-10 bundle

See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10

[ci skip]