akkoma
4 years agoMerge branch 'fix/ecto_ssl_option' into 'develop'
rinpatch [Sun, 22 Mar 2020 14:32:40 +0000 (14:32 +0000)]
Merge branch 'fix/ecto_ssl_option' into 'develop'

Fix ssl option on Ecto config breaking release

See merge request pleroma/pleroma!2307

4 years agoMerge branch 'relationship-remove-outdated-hack' into 'develop'
Haelwenn [Sun, 22 Mar 2020 14:25:11 +0000 (14:25 +0000)]
Merge branch 'relationship-remove-outdated-hack' into 'develop'

Mastodon API Account view: Remove an outdated hack

See merge request pleroma/pleroma!2321

4 years agoMastodon API Account view: Remove an outdated hack
rinpatch [Sun, 22 Mar 2020 14:10:37 +0000 (17:10 +0300)]
Mastodon API Account view: Remove an outdated hack

The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.

4 years agoMerge branch 'fix-feed-pagination' into 'develop'
lain [Fri, 20 Mar 2020 16:57:51 +0000 (16:57 +0000)]
Merge branch 'fix-feed-pagination' into 'develop'

Fix for feed page pagination

Closes #1605

See merge request pleroma/pleroma!2281

4 years agoMerge branch 'clear-config-test-improvements' into 'develop'
lain [Fri, 20 Mar 2020 16:54:55 +0000 (16:54 +0000)]
Merge branch 'clear-config-test-improvements' into 'develop'

Improved in-test config management

See merge request pleroma/pleroma!2312

4 years agoImproved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
Ivan Tashkinov [Fri, 20 Mar 2020 15:33:00 +0000 (18:33 +0300)]
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
Ivan Tashkinov [Fri, 20 Mar 2020 15:08:23 +0000 (18:08 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements

# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs

4 years agoMerge branch 'feature/1206-restrict-unauthenticated' into 'develop'
lain [Fri, 20 Mar 2020 14:40:08 +0000 (14:40 +0000)]
Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'

restrict_unauthenticated setting

Closes #1206

See merge request pleroma/pleroma!2318

4 years agorestrict_unauthenticated setting
Alexander Strizhakov [Fri, 20 Mar 2020 10:04:37 +0000 (13:04 +0300)]
restrict_unauthenticated setting

4 years agoMerge branch 'feature/1635-notifications-include-types' into 'develop'
lain [Fri, 20 Mar 2020 13:27:29 +0000 (13:27 +0000)]
Merge branch 'feature/1635-notifications-include-types' into 'develop'

include_types parameter in /api/v1/notifications

Closes #1635

See merge request pleroma/pleroma!2311

4 years agoinclude_types parameter in /api/v1/notifications
Alexander Strizhakov [Wed, 18 Mar 2020 14:37:54 +0000 (17:37 +0300)]
include_types parameter in /api/v1/notifications

4 years agoMerge branch 'fix-testing' into 'develop'
lain [Thu, 19 Mar 2020 18:10:39 +0000 (18:10 +0000)]
Merge branch 'fix-testing' into 'develop'

Fix CI by temporarily removing federated testing

See merge request pleroma/pleroma!2314

4 years agoremove federated testing
stwf [Thu, 19 Mar 2020 16:25:36 +0000 (12:25 -0400)]
remove federated testing

4 years agoImproved in-test config management functions.
Ivan Tashkinov [Wed, 18 Mar 2020 17:30:31 +0000 (20:30 +0300)]
Improved in-test config management functions.

4 years agoMerge branch 'feature/1530-removing-with_move' into 'develop'
rinpatch [Wed, 18 Mar 2020 10:12:50 +0000 (10:12 +0000)]
Merge branch 'feature/1530-removing-with_move' into 'develop'

Feature/1530 removing with move

Closes #1530

See merge request pleroma/pleroma!2306

4 years agoFix ssl option on Ecto config breaking release
Cevado [Tue, 17 Mar 2020 01:02:01 +0000 (22:02 -0300)]
Fix ssl option on Ecto config breaking release

To use `:ssl` option on Ecto config it's required to include Erlang ssl
application, this prevents releases to start when `:ssl` option is set
to true.

4 years agoMerge branch 'docs/mrf_object_age' into 'develop'
Haelwenn [Mon, 16 Mar 2020 17:42:10 +0000 (17:42 +0000)]
Merge branch 'docs/mrf_object_age' into 'develop'

Improve documentation of mrf_object_age

See merge request pleroma/pleroma!2305

4 years agoremoving with_move parameter
Alexander Strizhakov [Mon, 16 Mar 2020 17:05:21 +0000 (20:05 +0300)]
removing with_move parameter

4 years agoImprove documentation of mrf_object_age
Mark Felder [Mon, 16 Mar 2020 16:44:53 +0000 (11:44 -0500)]
Improve documentation of mrf_object_age

4 years agoMerge branch 'feat/templates' into 'develop'
rinpatch [Mon, 16 Mar 2020 14:32:23 +0000 (14:32 +0000)]
Merge branch 'feat/templates' into 'develop'

gitlab: create templates for bug reports and release MRs

See merge request pleroma/pleroma!2304

4 years agogitlab: create templates for bug reports and release MRs
rinpatch [Mon, 16 Mar 2020 14:26:28 +0000 (17:26 +0300)]
gitlab: create templates for bug reports and release MRs

4 years agoMerge branch 'fix-warnings-in-tests' into 'develop'
rinpatch [Mon, 16 Mar 2020 11:27:10 +0000 (11:27 +0000)]
Merge branch 'fix-warnings-in-tests' into 'develop'

Warnings fix

See merge request pleroma/pleroma!2303

4 years agowarnings fix
Alexander Strizhakov [Mon, 16 Mar 2020 11:19:36 +0000 (14:19 +0300)]
warnings fix

4 years agoMerge branch 'removing-deprecated' into 'develop'
rinpatch [Mon, 16 Mar 2020 11:08:06 +0000 (11:08 +0000)]
Merge branch 'removing-deprecated' into 'develop'

Removing from descriptions.exs deprecated settings

See merge request pleroma/pleroma!2302

4 years agoremoving from descriptions.exs deprecated settings
Alexander Strizhakov [Mon, 16 Mar 2020 11:01:35 +0000 (14:01 +0300)]
removing from descriptions.exs deprecated settings

4 years agofix for content-type header for tag feed
Alexander Strizhakov [Fri, 13 Mar 2020 14:58:14 +0000 (17:58 +0300)]
fix for content-type header for tag feed

4 years agoadding rss for user feed
Alexander Strizhakov [Fri, 13 Mar 2020 14:41:26 +0000 (17:41 +0300)]
adding rss for user feed

4 years agofix for feed page pagination
Alexander Strizhakov [Tue, 10 Mar 2020 15:11:48 +0000 (18:11 +0300)]
fix for feed page pagination

4 years agoMerge branch 'bugfix/earmark_renderer_test' into 'develop'
rinpatch [Sun, 15 Mar 2020 20:04:31 +0000 (20:04 +0000)]
Merge branch 'bugfix/earmark_renderer_test' into 'develop'

test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex

See merge request pleroma/pleroma!2300

4 years agoMerge branch 'features/staticfe-sanitization' into 'develop'
rinpatch [Sun, 15 Mar 2020 19:53:52 +0000 (19:53 +0000)]
Merge branch 'features/staticfe-sanitization' into 'develop'

static_fe: Sanitize HTML

Closes #1614

See merge request pleroma/pleroma!2299

4 years agostatic_fe: Sanitize HTML in users
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 16:00:54 +0000 (17:00 +0100)]
static_fe: Sanitize HTML in users

4 years agomix.lock: [minor] last hash appended
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 14:58:26 +0000 (15:58 +0100)]
mix.lock: [minor] last hash appended

4 years agostatic_fe: Sanitize HTML in posts
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 14:45:57 +0000 (15:45 +0100)]
static_fe: Sanitize HTML in posts

Note: Seems to have different sanitization with TwitterCard generator giving
the following:

<meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">

4 years agoMerge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
lain [Sun, 15 Mar 2020 19:15:20 +0000 (19:15 +0000)]
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'

[#1560] Restricted AP- & OStatus-related routes for non-federating instances

Closes #1560

See merge request pleroma/pleroma!2235

4 years agoMerge branch 'f' into 'develop'
Haelwenn [Sun, 15 Mar 2020 16:14:54 +0000 (16:14 +0000)]
Merge branch 'f' into 'develop'

rip out fetch_initial_posts

Closes #1422 and #1595

See merge request pleroma/pleroma!2297

4 years agotest/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
Haelwenn (lanodan) Monnier [Sun, 15 Mar 2020 16:07:08 +0000 (17:07 +0100)]
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex

Wasn't in the test suite otherwise

4 years agoMerge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
Haelwenn [Sun, 15 Mar 2020 14:22:10 +0000 (14:22 +0000)]
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'

rate limiter: disable based on if remote ip was found, not on if the plug was enabled

Closes #1620

See merge request pleroma/pleroma!2296

4 years agorip out fetch_initial_posts
rinpatch [Sat, 14 Mar 2020 12:39:58 +0000 (15:39 +0300)]
rip out fetch_initial_posts

Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422

4 years agoMerge branch 'bugfix/pleroma_conversation_api' into 'develop'
rinpatch [Sun, 15 Mar 2020 12:47:39 +0000 (12:47 +0000)]
Merge branch 'bugfix/pleroma_conversation_api' into 'develop'

pleroma_api_controller.ex: Improve conversations error reporting

See merge request pleroma/pleroma!2264

4 years agopleroma_api_controller.ex: Improve conversations error reporting
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 03:23:29 +0000 (04:23 +0100)]
pleroma_api_controller.ex: Improve conversations error reporting

Related: https://git.pleroma.social/pleroma/pleroma/issues/1594

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
Ivan Tashkinov [Sat, 14 Mar 2020 12:37:02 +0000 (15:37 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions

# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex

4 years agoMerge branch 'update/admin-fe-20200312' into 'develop'
rinpatch [Sat, 14 Mar 2020 11:25:17 +0000 (11:25 +0000)]
Merge branch 'update/admin-fe-20200312' into 'develop'

Update AdminFE

See merge request pleroma/pleroma!2292

4 years agoMerge branch 'fix/cache-control-headers' into 'develop'
rinpatch [Sat, 14 Mar 2020 11:19:42 +0000 (11:19 +0000)]
Merge branch 'fix/cache-control-headers' into 'develop'

Fix Cache Control headers on media

See merge request pleroma/pleroma!2295

4 years agouploaded media plug: do not inject compile-time params on every request
rinpatch [Fri, 13 Mar 2020 19:12:33 +0000 (22:12 +0300)]
uploaded media plug: do not inject compile-time params on every request

4 years agoMerge branch 'feature/mastofe-admin-scope' into 'develop'
rinpatch [Fri, 13 Mar 2020 18:58:52 +0000 (18:58 +0000)]
Merge branch 'feature/mastofe-admin-scope' into 'develop'

auth_controller.ex: Add admin scope to MastoFE

See merge request pleroma/pleroma!2256

4 years agoMerge branch 'docs/direct_conversation_id' into 'develop'
rinpatch [Fri, 13 Mar 2020 18:58:22 +0000 (18:58 +0000)]
Merge branch 'docs/direct_conversation_id' into 'develop'

pleroma_api.md: direct_conversation_id vs. conversation_id

See merge request pleroma/pleroma!2263

4 years agoUpdate AdminFE
Mark Felder [Thu, 12 Mar 2020 20:12:29 +0000 (15:12 -0500)]
Update AdminFE

4 years agoMerge branch 'fix/hashtags-streaming' into 'develop'
rinpatch [Fri, 13 Mar 2020 18:50:17 +0000 (18:50 +0000)]
Merge branch 'fix/hashtags-streaming' into 'develop'

Fix hashtags WebSocket streaming

Closes #1593

See merge request pleroma/pleroma!2294

4 years agoMerge branch 'static-accept-missing' into 'develop'
rinpatch [Fri, 13 Mar 2020 18:46:54 +0000 (18:46 +0000)]
Merge branch 'static-accept-missing' into 'develop'

Fix static FE plug to handle missing Accept header.

See merge request pleroma/pleroma!2260

4 years agorate limiter: disable based on if remote ip was found, not on if the plug was enabled
rinpatch [Fri, 13 Mar 2020 18:15:42 +0000 (21:15 +0300)]
rate limiter: disable based on if remote ip was found, not on if the plug was enabled

The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable  when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.

Also closes #1620

4 years agoMerge branch 'bugfix/br-vs-newline' into 'develop'
rinpatch [Fri, 13 Mar 2020 18:22:55 +0000 (18:22 +0000)]
Merge branch 'bugfix/br-vs-newline' into 'develop'

Formatting: Do not use \n and prefer <br> instead

Closes #1374 and #1375

See merge request pleroma/pleroma!2204

4 years agoMerge branch 'develop' into fix/cache-control-headers
Mark Felder [Fri, 13 Mar 2020 17:54:06 +0000 (12:54 -0500)]
Merge branch 'develop' into fix/cache-control-headers

4 years agoLint
Mark Felder [Fri, 13 Mar 2020 17:42:06 +0000 (12:42 -0500)]
Lint

4 years agoSynchronize cache-control header for local media with the mediaproxy
Mark Felder [Fri, 13 Mar 2020 17:27:50 +0000 (12:27 -0500)]
Synchronize cache-control header for local media with the mediaproxy

4 years agoRemove test verifying we preserve cache-control headers; we don't
Mark Felder [Fri, 13 Mar 2020 17:23:14 +0000 (12:23 -0500)]
Remove test verifying we preserve cache-control headers; we don't

4 years agoFix test to use new cache-control settings
Mark Felder [Fri, 13 Mar 2020 17:20:33 +0000 (12:20 -0500)]
Fix test to use new cache-control settings

4 years agoSet correct Cache-Control header for local media
Mark Felder [Fri, 13 Mar 2020 17:02:58 +0000 (12:02 -0500)]
Set correct Cache-Control header for local media

4 years agoUpdate comment to reflect what the code is actually doing
Mark Felder [Fri, 13 Mar 2020 16:46:40 +0000 (11:46 -0500)]
Update comment to reflect what the code is actually doing

4 years agoDo not strip Cache-Control headers from media. Trust the Pleroma backend.
Mark Felder [Fri, 13 Mar 2020 16:31:55 +0000 (11:31 -0500)]
Do not strip Cache-Control headers from media. Trust the Pleroma backend.

4 years agoDo not trust remote Cache-Control headers for mediaproxy
Mark Felder [Fri, 13 Mar 2020 16:30:27 +0000 (11:30 -0500)]
Do not trust remote Cache-Control headers for mediaproxy

4 years agoMerge branch 'revert/cache-control' into 'develop'
rinpatch [Fri, 13 Mar 2020 16:25:10 +0000 (16:25 +0000)]
Merge branch 'revert/cache-control' into 'develop'

Revert "Set better Cache-Control header for static content"

Closes #1613

See merge request pleroma/pleroma!2290

4 years agoFix hashtags WebSocket streaming
Egor Kislitsyn [Fri, 13 Mar 2020 15:30:42 +0000 (19:30 +0400)]
Fix hashtags WebSocket streaming

4 years agoFormatting: Do not use \n and prefer <br> instead
Haelwenn (lanodan) Monnier [Thu, 13 Feb 2020 02:39:47 +0000 (03:39 +0100)]
Formatting: Do not use \n and prefer <br> instead

It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
4 years agoMerge branch 'exclude-posts-visible-to-admin' into 'develop'
feld [Thu, 12 Mar 2020 20:29:51 +0000 (20:29 +0000)]
Merge branch 'exclude-posts-visible-to-admin' into 'develop'

Exclude private and direct statuses visible to the admin when using godmode

Closes #1599

See merge request pleroma/pleroma!2272

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
Ivan Tashkinov [Thu, 12 Mar 2020 09:07:07 +0000 (12:07 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions

# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs

4 years agoMerge branch 'docs/new_user' into 'develop'
rinpatch [Wed, 11 Mar 2020 20:26:50 +0000 (20:26 +0000)]
Merge branch 'docs/new_user' into 'develop'

CLI_tasks/user.md: Fix `pleroma.user new` documentation

Closes #1621

See merge request pleroma/pleroma!2286

4 years agoMerge branch 'fix/signup-without-email' into 'develop'
feld [Wed, 11 Mar 2020 16:53:05 +0000 (16:53 +0000)]
Merge branch 'fix/signup-without-email' into 'develop'

Allow account registration without an email

See merge request pleroma/pleroma!2246

4 years agoMerge branch 'fix/1610-release-compilation-config-fix' into 'develop'
rinpatch [Wed, 11 Mar 2020 15:16:18 +0000 (15:16 +0000)]
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'

Merging default release config on app start

Closes #1610

See merge request pleroma/pleroma!2288

4 years agoMerge branch 'relay-list-change' into 'develop'
feld [Wed, 11 Mar 2020 15:10:09 +0000 (15:10 +0000)]
Merge branch 'relay-list-change' into 'develop'

Relay list shows hosts without accepted follow

See merge request pleroma/pleroma!2240

4 years agoRevert "Set better Cache-Control header for static content"
rinpatch [Wed, 11 Mar 2020 14:58:25 +0000 (17:58 +0300)]
Revert "Set better Cache-Control header for static content"

On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.

Closes #1613

4 years agousing Pleroma.Config instead of ets
Alexander Strizhakov [Wed, 11 Mar 2020 14:22:50 +0000 (17:22 +0300)]
using Pleroma.Config instead of ets

4 years agocompile fix
Alexander Strizhakov [Wed, 11 Mar 2020 13:43:58 +0000 (16:43 +0300)]
compile fix

4 years agomerging release default config on app start
Alexander Strizhakov [Wed, 11 Mar 2020 13:25:53 +0000 (16:25 +0300)]
merging release default config on app start

4 years ago[#1560] Enforced authentication for non-federating instances in StaticFEController.
Ivan Tashkinov [Wed, 11 Mar 2020 11:05:56 +0000 (14:05 +0300)]
[#1560] Enforced authentication for non-federating instances in StaticFEController.

4 years agoMerge branch 'docs/debian-install' into 'develop'
rinpatch [Wed, 11 Mar 2020 10:39:06 +0000 (10:39 +0000)]
Merge branch 'docs/debian-install' into 'develop'

installation/otp_en.md: Fix pleroma.nginx target [deb]

See merge request pleroma/pleroma!2280

4 years agoCLI_tasks: Use manpage formatting conventions
Haelwenn (lanodan) Monnier [Wed, 11 Mar 2020 07:46:57 +0000 (08:46 +0100)]
CLI_tasks: Use manpage formatting conventions

- [] for options
- <> for mandatory arguments
- foo ... when foo can be repeated

[ci skip]

4 years agoCLI_tasks/user.md: Fix `pleroma.user new` documentation
Haelwenn (lanodan) Monnier [Wed, 11 Mar 2020 07:35:46 +0000 (08:35 +0100)]
CLI_tasks/user.md: Fix `pleroma.user new` documentation

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621
[ci skip]

4 years agoMerge branch 'bugfix/bad-pleromafe-bundle' into 'develop'
Haelwenn [Wed, 11 Mar 2020 07:25:35 +0000 (07:25 +0000)]
Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'

static-fe.css: Restore from before a65ee8ea

See merge request pleroma/pleroma!2284

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
Ivan Tashkinov [Wed, 11 Mar 2020 06:15:55 +0000 (09:15 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions

4 years agostatic-fe.css: Restore from before a65ee8ea
Haelwenn (lanodan) Monnier [Wed, 11 Mar 2020 05:35:18 +0000 (06:35 +0100)]
static-fe.css: Restore from before a65ee8ea

Related: https://git.pleroma.social/pleroma/pleroma/issues/1616

4 years agoMerge branch 'fix/post-length-validation' into 'develop'
lain [Tue, 10 Mar 2020 18:16:10 +0000 (18:16 +0000)]
Merge branch 'fix/post-length-validation' into 'develop'

Fix enforcement of character limits

Closes #1618

See merge request pleroma/pleroma!2283

4 years agoFix enforcement of character limits
Mark Felder [Tue, 10 Mar 2020 18:08:00 +0000 (13:08 -0500)]
Fix enforcement of character limits

4 years agoinstallation/otp_en.md: Fix pleroma.nginx target [deb]
Haelwenn (lanodan) Monnier [Tue, 10 Mar 2020 10:49:02 +0000 (11:49 +0100)]
installation/otp_en.md: Fix pleroma.nginx target [deb]

Needs to be backported to stable.

Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29

4 years ago[#1560] Ensured authentication or enabled federation for federation-related routes...
Ivan Tashkinov [Mon, 9 Mar 2020 17:51:44 +0000 (20:51 +0300)]
[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.

4 years agoMerge branch 'patch-1' into 'develop'
lain [Mon, 9 Mar 2020 13:36:21 +0000 (13:36 +0000)]
Merge branch 'patch-1' into 'develop'

Better advice for vacuuming after restoring.

See merge request pleroma/pleroma!2233

4 years agoMerge branch 'chore/mix-version-bump' into 'develop'
rinpatch [Sun, 8 Mar 2020 20:31:54 +0000 (20:31 +0000)]
Merge branch 'chore/mix-version-bump' into 'develop'

mix.exs: bump version to development one

See merge request pleroma/pleroma!2279

4 years agomix.exs: bump version to development one
rinpatch [Sun, 8 Mar 2020 20:24:30 +0000 (23:24 +0300)]
mix.exs: bump version to development one

4 years agoMerge branch 'stable' into 'develop'
rinpatch [Sun, 8 Mar 2020 13:42:15 +0000 (13:42 +0000)]
Merge branch 'stable' into 'develop'

Sync develop with stable

Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606

See merge request pleroma/pleroma!2278

4 years agoMerge branch 'release/2.0.0' into 'stable'
rinpatch [Sun, 8 Mar 2020 10:38:35 +0000 (10:38 +0000)]
Merge branch 'release/2.0.0' into 'stable'

Release/2.0.0

See merge request pleroma/pleroma!2273

4 years agopleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
rinpatch [Sat, 7 Mar 2020 15:18:43 +0000 (18:18 +0300)]
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af

4 years agoMerge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
rinpatch [Sat, 7 Mar 2020 14:45:00 +0000 (14:45 +0000)]
Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'

moderation log: fix improperly migrated data

See merge request pleroma/pleroma!2277

4 years agomoderation log: fix improperly migrated data
rinpatch [Sat, 7 Mar 2020 10:51:28 +0000 (13:51 +0300)]
moderation log: fix improperly migrated data

Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.

Closes #1606

4 years agowait in mix task while pleroma is rebooted
Alexander Strizhakov [Tue, 18 Feb 2020 15:10:39 +0000 (18:10 +0300)]
wait in mix task while pleroma is rebooted

4 years agoMerge branch 'restart-fix-for-mix-tasks' into 'develop'
rinpatch [Sat, 7 Mar 2020 09:32:29 +0000 (09:32 +0000)]
Merge branch 'restart-fix-for-mix-tasks' into 'develop'

Wait in mix task while pleroma is rebooted

See merge request pleroma/pleroma!2225

4 years agoMerge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
rinpatch [Fri, 6 Mar 2020 20:23:39 +0000 (20:23 +0000)]
Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'

Remove EmojiPacks from AdminFE build

See merge request pleroma/pleroma!2275

4 years agoMerge branch 'revert-67cc4dce' into 'develop'
feld [Fri, 6 Mar 2020 16:03:24 +0000 (16:03 +0000)]
Merge branch 'revert-67cc4dce' into 'develop'

Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"

See merge request pleroma/pleroma!2276

4 years agoRevert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
feld [Fri, 6 Mar 2020 15:56:41 +0000 (15:56 +0000)]
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"

This reverts merge request !2274

4 years agoRemove EmojiPacks from AdminFE build
Mark Felder [Fri, 6 Mar 2020 15:54:38 +0000 (09:54 -0600)]
Remove EmojiPacks from AdminFE build

Once more, with feeling

4 years agoMerge branch 'update/admin-fe-without-emojipack' into 'develop'
lain [Fri, 6 Mar 2020 15:14:10 +0000 (15:14 +0000)]
Merge branch 'update/admin-fe-without-emojipack' into 'develop'

Remove emoji support from AdminFE

See merge request pleroma/pleroma!2274

4 years agoRemove emoji support from AdminFE
Mark Felder [Fri, 6 Mar 2020 13:53:33 +0000 (07:53 -0600)]
Remove emoji support from AdminFE