rinpatch [Sat, 29 Feb 2020 16:31:31 +0000 (16:31 +0000)]
Merge branch 'mastofe/bundle-2020-01-20' into 'develop'
MastoFE: Bundle 2020-01-20
See merge request pleroma/pleroma!2257
Haelwenn [Sat, 29 Feb 2020 11:29:45 +0000 (11:29 +0000)]
Merge branch 'descriptions-changes' into 'develop'
Adding streamer group & Oban crontab child to descriptions.exs
Closes #1592
See merge request pleroma/pleroma!2258
Alexander Strizhakov [Sat, 29 Feb 2020 08:24:30 +0000 (11:24 +0300)]
streamer group & Oban crontab child
Haelwenn (lanodan) Monnier [Sat, 29 Feb 2020 05:41:13 +0000 (06:41 +0100)]
MastoFE: Bundle 2020-01-20
feld [Fri, 28 Feb 2020 23:28:58 +0000 (23:28 +0000)]
Merge branch 'update/pleroma-fe-
20200228' into 'develop'
Update PleromaFE bundle for the 2.0 release
See merge request pleroma/pleroma!2255
Mark Felder [Fri, 28 Feb 2020 22:18:09 +0000 (16:18 -0600)]
Merge branch 'develop' into update/pleroma-fe-
20200228
Mark Felder [Fri, 28 Feb 2020 22:15:12 +0000 (16:15 -0600)]
Update PleromaFE bundle for the 2.0 release
feld [Fri, 28 Feb 2020 18:40:22 +0000 (18:40 +0000)]
Merge branch 'update/admin-fe-
20200228' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2254
Mark Felder [Fri, 28 Feb 2020 18:32:44 +0000 (12:32 -0600)]
Update AdminFE build
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
Haelwenn [Fri, 28 Feb 2020 04:27:50 +0000 (04:27 +0000)]
Merge branch 'filtered-params' into 'develop'
add confirm field to filtered params
See merge request pleroma/pleroma!2251
Steven Fuchs [Fri, 28 Feb 2020 04:27:50 +0000 (04:27 +0000)]
add confirm field to filtered params
feld [Thu, 27 Feb 2020 18:11:26 +0000 (18:11 +0000)]
Merge branch 'descriptions-changes' into 'develop'
Removing unnecessary groups from descriptions.exs
See merge request pleroma/pleroma!2247
feld [Thu, 27 Feb 2020 18:11:04 +0000 (18:11 +0000)]
Merge branch 'admin-status-list' into 'develop'
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
feld [Thu, 27 Feb 2020 18:09:19 +0000 (18:09 +0000)]
Merge branch 'exclude-boosts-admin-api' into 'develop'
Admin API: filter out boosts from recent statuses
Closes #1589
See merge request pleroma/pleroma!2248
eugenijm [Wed, 26 Feb 2020 11:47:19 +0000 (14:47 +0300)]
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
eugenijm [Mon, 10 Feb 2020 11:32:38 +0000 (14:32 +0300)]
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
Alexander Strizhakov [Wed, 26 Feb 2020 16:50:07 +0000 (19:50 +0300)]
unnecessary groups
lain [Wed, 26 Feb 2020 08:26:16 +0000 (08:26 +0000)]
Merge branch 'feat/instance-gen-improvements' into 'develop'
small instance.gen task improvements
See merge request pleroma/pleroma!2245
rinpatch [Tue, 25 Feb 2020 21:32:34 +0000 (00:32 +0300)]
instance.gen task: make example instance name less confusing
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
rinpatch [Tue, 25 Feb 2020 19:13:08 +0000 (22:13 +0300)]
instance.gen task: remind to transfer the config to the database after
migrations
rinpatch [Tue, 25 Feb 2020 18:59:37 +0000 (21:59 +0300)]
instance.gen task: make instance name default to the domain
rinpatch [Tue, 25 Feb 2020 18:56:37 +0000 (18:56 +0000)]
Merge branch 'fix/dialyzer-warnings' into 'develop'
Fix Dialyzer warnings
See merge request pleroma/pleroma!2242
feld [Tue, 25 Feb 2020 17:14:54 +0000 (17:14 +0000)]
Merge branch 'merge/admin-fe-
20200225' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2244
Mark Felder [Tue, 25 Feb 2020 17:08:35 +0000 (11:08 -0600)]
Update AdminFE build
feld [Tue, 25 Feb 2020 16:06:06 +0000 (16:06 +0000)]
Merge branch 'token-web-push-test' into 'develop'
Add a test to ensure OAuth tokens are tied to Push subscriptions
Closes #1551
See merge request pleroma/pleroma!2241
Egor Kislitsyn [Tue, 25 Feb 2020 14:34:56 +0000 (18:34 +0400)]
Fix Dialyzer warnings
Egor Kislitsyn [Tue, 25 Feb 2020 14:04:28 +0000 (18:04 +0400)]
Add a test to ensure OAuth tokens are tied to Push subscriptions
lain [Tue, 25 Feb 2020 12:26:39 +0000 (12:26 +0000)]
Merge branch 'test-fix' into 'develop'
Compile fix in tests
See merge request pleroma/pleroma!2239
Alexander Strizhakov [Tue, 25 Feb 2020 12:19:52 +0000 (15:19 +0300)]
compile fix
rinpatch [Mon, 24 Feb 2020 20:52:10 +0000 (20:52 +0000)]
Merge branch 'fix/instance-gen-custom-static' into 'develop'
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
rinpatch [Mon, 24 Feb 2020 19:52:38 +0000 (22:52 +0300)]
instance.gen task: fix crash when using custom static directory
Closes #1082
Haelwenn [Mon, 24 Feb 2020 19:21:29 +0000 (19:21 +0000)]
Merge branch 'status-visibility-count-stats' into 'develop'
Status count by visibility scope (`GET /api/pleroma/admin/stats` )
See merge request pleroma/pleroma!2097
eugenijm [Thu, 9 Jan 2020 19:18:55 +0000 (22:18 +0300)]
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
lain [Mon, 24 Feb 2020 17:48:18 +0000 (17:48 +0000)]
Merge branch 'theming_your_instance' into 'develop'
DOCS Theming your instance
See merge request pleroma/pleroma!2232
Ilja [Mon, 24 Feb 2020 17:48:18 +0000 (17:48 +0000)]
DOCS Theming your instance
I added a new file to explain
* where a custom theme can be created
* where themes can be downloaded
* where to add the theme on the server
* how to make the theme available on the instance
* how to set the theme as default on the instance
lain [Mon, 24 Feb 2020 14:54:22 +0000 (14:54 +0000)]
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
Haelwenn [Mon, 24 Feb 2020 07:28:35 +0000 (07:28 +0000)]
Merge branch '1505-threads-federation' into 'develop'
[#1505] Threads / replies federation
Closes #1505
See merge request pleroma/pleroma!2129
Haelwenn (lanodan) Monnier [Mon, 24 Feb 2020 01:41:48 +0000 (02:41 +0100)]
Captcha: return invalid when answer_data is nil
Haelwenn (lanodan) Monnier [Mon, 24 Feb 2020 00:27:16 +0000 (01:27 +0100)]
captcha_test.exs: Use the same testing logic in Kocaptcha and native
feld [Sat, 22 Feb 2020 15:35:33 +0000 (15:35 +0000)]
Merge branch 'fix/missing-config-settings' into 'develop'
Add missing invites_enabled and account_activation_required settings
See merge request pleroma/pleroma!2234
Mark Felder [Sat, 22 Feb 2020 15:29:05 +0000 (09:29 -0600)]
Add missing invites_enabled and account_activation_required settings
Ivan Tashkinov [Sat, 22 Feb 2020 06:31:43 +0000 (09:31 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# CHANGELOG.md
# config/config.exs
lain [Fri, 21 Feb 2020 19:34:45 +0000 (19:34 +0000)]
Merge branch 'patch-1' into 'develop'
added why doing a vacuum after restoring a backup is so important
See merge request pleroma/pleroma!2230
Igeljäger [Fri, 21 Feb 2020 15:30:52 +0000 (15:30 +0000)]
added why doing a vacuum after restoring a backup is so important
Haelwenn [Thu, 20 Feb 2020 23:53:52 +0000 (23:53 +0000)]
Merge branch 'migration-fixes-20' into 'develop'
Migrations: Make them not fail for old databases
See merge request pleroma/pleroma!2227
Haelwenn [Thu, 20 Feb 2020 23:52:45 +0000 (23:52 +0000)]
Merge branch 'fix/gin-fuzzy' into 'develop'
Improve GIN full text search performance
See merge request pleroma/pleroma!2228
Haelwenn [Thu, 20 Feb 2020 23:50:40 +0000 (23:50 +0000)]
Merge branch 'single_emoji_reaction' into 'develop'
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
Mark Felder [Thu, 20 Feb 2020 21:34:10 +0000 (15:34 -0600)]
Apply database session parameter to improve GIN full text search
lain [Thu, 20 Feb 2020 15:44:31 +0000 (16:44 +0100)]
Migrations: Make them not fail for old databases
Ivan Tashkinov [Thu, 20 Feb 2020 12:18:28 +0000 (15:18 +0300)]
[#1505] Typo fix.
lain [Thu, 20 Feb 2020 12:13:21 +0000 (12:13 +0000)]
Merge branch 'require-signature' into 'develop'
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
lain [Thu, 20 Feb 2020 12:04:29 +0000 (12:04 +0000)]
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
lain [Thu, 20 Feb 2020 12:03:21 +0000 (12:03 +0000)]
Merge branch 'docs_updating' into 'develop'
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
Ivan Tashkinov [Thu, 20 Feb 2020 12:00:48 +0000 (15:00 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# config/config.exs
lain [Thu, 20 Feb 2020 11:58:37 +0000 (11:58 +0000)]
Merge branch 'feature/new-registrations-digest' into 'develop'
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
Ivan Tashkinov [Thu, 20 Feb 2020 11:48:46 +0000 (14:48 +0300)]
[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3
lain [Thu, 20 Feb 2020 11:36:48 +0000 (11:36 +0000)]
Merge branch 'tests-clear-config-tweaks' into 'develop'
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
lain [Wed, 19 Feb 2020 16:17:05 +0000 (17:17 +0100)]
Emoji Reactions: Add documentation
lain [Wed, 19 Feb 2020 16:16:45 +0000 (17:16 +0100)]
Pleroma API: Add endpoint to get reaction information on a single emoji
feld [Tue, 18 Feb 2020 21:03:01 +0000 (21:03 +0000)]
Merge branch 'fix/mrf-sample-doc' into 'develop'
Update MRF docs, make sample code actually compile
See merge request pleroma/pleroma!2210
feld [Tue, 18 Feb 2020 20:58:15 +0000 (20:58 +0000)]
Merge branch 'develop' into 'fix/mrf-sample-doc'
# Conflicts:
# docs/configuration/mrf.md
feld [Tue, 18 Feb 2020 20:57:23 +0000 (20:57 +0000)]
Merge branch 'fix/mrf-docs' into 'develop'
Fix MRF documentation
See merge request pleroma/pleroma!2187
feld [Tue, 18 Feb 2020 20:45:31 +0000 (20:45 +0000)]
Merge branch 'chore/config-descriptions' into 'develop'
Additional config description improvements
See merge request pleroma/pleroma!2207
lain [Tue, 18 Feb 2020 14:56:59 +0000 (14:56 +0000)]
Merge branch 'fix/status-view/expires_at' into 'develop'
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
Ivan Tashkinov [Tue, 18 Feb 2020 14:52:31 +0000 (17:52 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
Ivan Tashkinov [Tue, 18 Feb 2020 14:46:09 +0000 (17:46 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
lain [Tue, 18 Feb 2020 14:36:10 +0000 (14:36 +0000)]
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
lain [Tue, 18 Feb 2020 14:32:03 +0000 (14:32 +0000)]
Merge branch 'need-reboot-flag' into 'develop'
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
Egor Kislitsyn [Tue, 18 Feb 2020 13:09:50 +0000 (17:09 +0400)]
Add a test
lain [Tue, 18 Feb 2020 13:09:37 +0000 (13:09 +0000)]
Merge branch 'chore/floki-update' into 'develop'
Update floki to 0.25
See merge request pleroma/pleroma!2217
Egor Kislitsyn [Tue, 18 Feb 2020 10:52:11 +0000 (14:52 +0400)]
Fix `status.expires_at` type
feld [Mon, 17 Feb 2020 22:22:53 +0000 (22:22 +0000)]
Merge branch 'update/admin-fe-
20200217' into 'develop'
Update adminFE build
See merge request pleroma/pleroma!2221
Mark Felder [Mon, 17 Feb 2020 21:50:45 +0000 (15:50 -0600)]
Update adminFE build
Mark Felder [Mon, 17 Feb 2020 20:13:05 +0000 (14:13 -0600)]
Merge branch 'develop' into chore/floki-update
rinpatch [Mon, 17 Feb 2020 11:13:37 +0000 (11:13 +0000)]
Merge branch 'upgrade_crypto' into 'develop'
Update plug_crypto
See merge request pleroma/pleroma!2219
lain [Mon, 17 Feb 2020 10:41:14 +0000 (11:41 +0100)]
Update plug_crypto
rinpatch [Mon, 17 Feb 2020 10:34:32 +0000 (10:34 +0000)]
Merge branch 'feat/git-attributes-elixir' into 'develop'
.gitattributes: use native support for elixir definitions
See merge request pleroma/pleroma!2218
rinpatch [Mon, 17 Feb 2020 10:19:04 +0000 (13:19 +0300)]
.gitattributes: use native support for elixir definitions
see https://github.com/elixir-lang/elixir/pull/9823
rinpatch [Sat, 15 Feb 2020 22:55:26 +0000 (01:55 +0300)]
Use floki's new APIs for parsing fragments
Ivan Tashkinov [Sat, 15 Feb 2020 17:41:38 +0000 (20:41 +0300)]
[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
lain [Sat, 15 Feb 2020 12:56:32 +0000 (12:56 +0000)]
Merge branch 'bugfix/link-preview-site_name' into 'develop'
MastodonAPI.StatusView: Do not use site_name
See merge request pleroma/pleroma!2216
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 23:35:46 +0000 (00:35 +0100)]
MastodonAPI.StatusView: Do not use site_name
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
rinpatch [Fri, 14 Feb 2020 18:25:54 +0000 (18:25 +0000)]
Merge branch 'chores/deps-to-hexpm' into 'develop'
Move ex_syslogger & recon to hexpm, update dependencies
See merge request pleroma/pleroma!2213
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 18:15:59 +0000 (19:15 +0100)]
Update all dependencies
Upgraded:
db_connection 2.2.0 => 2.2.1
earmark 1.4.2 => 1.4.3
ecto 3.3.1 => 3.3.3
ecto_sql 3.3.2 => 3.3.4
esshd 0.1.0 => 0.1.1
ex_doc 0.21.2 => 0.21.3
excoveralls 0.12.1 => 0.12.2
gettext 0.17.1 => 0.17.4
html_entities 0.5.0 => 0.5.1
httpoison 1.6.1 => 1.6.2
joken 2.1.0 => 2.2.0
jose 1.9.0 => 1.10.1
nimble_parsec 0.5.1 => 0.5.3
phoenix 1.4.10 => 1.4.13
phoenix_ecto 4.0.0 => 4.1.0
phoenix_html 2.13.3 => 2.14.0
plug_cowboy 2.1.0 => 2.1.2
plug_crypto 1.1.0 => 1.1.1
prometheus 4.4.1 => 4.5.0
tesla 1.3.0 => 1.3.2
Haelwenn (lanodan) Monnier [Fri, 14 Feb 2020 18:08:37 +0000 (19:08 +0100)]
mix.exs: Move ex_syslogger and recon to hexpm
Haelwenn [Fri, 14 Feb 2020 17:58:26 +0000 (17:58 +0000)]
Merge branch 'update/ferd/recon' into 'develop'
Update ferd/recon
See merge request pleroma/pleroma!2211
Mark Felder [Fri, 14 Feb 2020 17:06:04 +0000 (11:06 -0600)]
Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
Mark Felder [Fri, 14 Feb 2020 17:04:27 +0000 (11:04 -0600)]
Fix MRF docs further. I don't think anyone has actually tested with the old docs.
Mark Felder [Fri, 14 Feb 2020 17:02:24 +0000 (11:02 -0600)]
Standardize @behaviour usage in MRFs
feld [Fri, 14 Feb 2020 16:55:52 +0000 (16:55 +0000)]
Apply suggestion to docs/configuration/mrf.md
Mark Felder [Fri, 14 Feb 2020 16:55:18 +0000 (10:55 -0600)]
Update suggested path for location of your custom MRF
Mark Felder [Fri, 14 Feb 2020 16:16:12 +0000 (10:16 -0600)]
Update ferd/recon, requested by @tk to support an AMPQ library he's
integrating with an MRF.
Upstream changelog:
2.5.0
- Optional formatting of records in traces (thanks to @bartekgorny)
- Basic support for OTP-22 in recon_alloc (base handling of foreign_blocks type)
Mark Felder [Thu, 13 Feb 2020 21:19:01 +0000 (15:19 -0600)]
Make the sample code actually compile
Ivan Tashkinov [Thu, 13 Feb 2020 18:55:47 +0000 (21:55 +0300)]
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
Mark Felder [Thu, 13 Feb 2020 18:09:11 +0000 (12:09 -0600)]
Formatting got me again
rinpatch [Thu, 13 Feb 2020 18:08:43 +0000 (18:08 +0000)]
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
Mark Felder [Thu, 13 Feb 2020 18:01:13 +0000 (12:01 -0600)]
Even more description improvements
Mark Felder [Thu, 13 Feb 2020 17:49:19 +0000 (11:49 -0600)]
Add missing Oban job for attachments_cleanup
Mark Felder [Thu, 13 Feb 2020 17:45:58 +0000 (11:45 -0600)]
More description cleanup work
Mark Felder [Thu, 13 Feb 2020 17:31:02 +0000 (11:31 -0600)]
More description cleanups
projects / akkoma / log