Commit graph

13028 commits

Author SHA1 Message Date
rinpatch
8babd796da Merge branch 'fix/reports-from-admins' into 'develop'
Suppress report notification for admin actors

See merge request 
2021-02-08 10:31:20 +00:00
rinpatch
6e68058b63 Merge branch 'feat/allow_alt_text_search_config' into 'develop'
allow user defined text search config in database

See merge request 
2021-02-06 09:42:20 +00:00
hyperion
8d4e0342e1 Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files 2021-02-06 09:42:17 +00:00
4dd28b4bd1 Merge branch 'varnish-large-files' into 'develop'
Improve Varnish VCL

See merge request 
2021-02-05 19:46:53 +00:00
1d8f1fe077 Add a default rule to not attempt to cache any files larger than 50MB
This fixes connection failures when trying to retrieve large files.
It is less common in typical Pleroma usage, but it's possible to encounter
this on a cloud instance with lower memory.
2021-02-05 13:35:51 -06:00
d047372291 Merge branch 'develop' into fix/reports-from-admins 2021-02-04 12:37:20 -06:00
d7262f7d22 Merge branch 'chore/fix-mix-env' into 'develop'
Standardize the way we capture and use Mix.env()

See merge request 
2021-02-04 16:27:05 +00:00
bf9cd4a0e2 Standardize the way we capture and use Mix.env() 2021-02-04 10:13:03 -06:00
7b67bf4e97 Merge branch 'fix/configdb-error' into 'develop'
Improve error message for ConfigDB

See merge request 
2021-02-04 14:33:59 +00:00
Haelwenn
ea5469961a Merge branch 'bugfix/notice-external-redirect' into 'develop'
Redirect non-local activities when /notice/:id is used

See merge request 
2021-02-04 14:26:03 +00:00
Haelwenn (lanodan) Monnier
ecff027418
Redirect non-local activities when /notice/:id is used
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
2021-02-04 15:17:40 +01:00
Haelwenn
49741961f2 Merge branch 'chore/external-emoji-example' into 'develop'
Stop external emoji example from leaking

See merge request 
2021-02-04 14:05:30 +00:00
887db076b5 Load an emoji.txt specific to the test env 2021-02-03 16:40:59 -06:00
000d3365c3 Document admin actors not getting report notifications 2021-02-03 14:52:49 -06:00
5bb5949048 Validate admin making report doesn't get their own report notification, but other admins do 2021-02-03 12:54:53 -06:00
76f732766b Exclude reporter from receiving notifications from their own reports.
Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them.
2021-02-03 12:32:44 -06:00
rinpatch
a7864a9429 Merge branch 'fix/openapi-relationship-nullable' into 'develop'
Account schema: specify that pleroma.relationship is nullable

See merge request 
2021-02-03 15:14:40 +00:00
rinpatch
74ef1a044d Account schema: specify that pleroma.relationship is nullable 2021-02-03 18:10:43 +03:00
rinpatch
d2acf3a92f Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'
CI: Forgot $ in spec-deploy

See merge request 
2021-02-03 15:01:08 +00:00
rinpatch
c47ca99592 CI: Forgot $ in spec-deploy 2021-02-03 18:00:04 +03:00
859309e116 Merge branch 'fix/2412-filters' into 'develop'
Support for expires_in/expires_at in filters

Closes 

See merge request 
2021-02-03 14:36:35 +00:00
008499f65a Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
#   CHANGELOG.md
2021-02-03 14:23:23 +00:00
c3dd860a02 Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
Fix for scheduled post with poll

Closes 

See merge request 
2021-02-03 14:22:23 +00:00
8d2ea95402 Merge branch 'feature/2438-users-posts-total-count' into 'develop'
Feature/2438 users/instances posts total count

Closes 

See merge request 
2021-02-03 14:21:57 +00:00
rinpatch
5ee9cbf017 Merge branch 'fix/deploy-api-docs' into 'develop'
CI: Add job ref when calling api docs builder

See merge request 
2021-02-03 14:03:24 +00:00
rinpatch
00268b4476 CI: Add job ref when calling api docs builder
Just grabbing the latest artifact for the branch does not work because
gitlab will only change the latest artifact when the whole pipeline
finishes
2021-02-03 17:02:06 +03:00
rinpatch
e2d7c4fd57 Merge branch 'feat/openapi-spec-export' into 'develop'
Improve OpenAPI spec and deploy it to api.pleroma.social

See merge request 
2021-02-03 13:21:19 +00:00
rinpatch
9fcff7851f Improve OpenAPI spec and deploy it to api.pleroma.social
Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information.
2021-02-03 16:07:44 +03:00
fd2477dfba Merge branch 'a1batross-develop-patch-62810' into 'develop'
mix: instance: ensure all needed folders are created before generating config

See merge request 
2021-02-02 18:37:20 +00:00
f1f773f2c7 Merge branch 'email-stub-in-verify-credentials' into 'develop'
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)

See merge request 
2021-02-02 18:35:08 +00:00
d0b4a49f16 Merge branch 'develop' into a1batross-develop-patch-62810 2021-02-02 12:18:03 -06:00
c118bdb8f0 Merge branch 'develop' into a1batross-develop-patch-62810 2021-02-02 12:16:49 -06:00
d0c2159b77 Mix pleroma.instance creates parent directories now 2021-02-02 12:16:01 -06:00
d37d4106c6 Merge branch 'fix/majic-nits' into 'develop'
Majic: don't fix extensions

See merge request 
2021-02-02 18:15:00 +00:00
92efdf9adc Document OAuth 2.0 provider fqn field addition 2021-02-02 12:12:37 -06:00
0888815000 Merge branch 'fix/2411-mutes-api' into 'develop'
Support for with_relationships parameter

Closes 

See merge request 
2021-02-02 18:08:46 +00:00
f852e8d2d2 Document we are disabling the extension fixup in Majic 2021-02-02 12:03:20 -06:00
28d2917c3a Merge branch 'develop' into fix/majic-nits 2021-02-02 12:01:48 -06:00
d289ad8579 Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
6a2d3fb9a3 Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
fix and delete purge activities duplicates

Closes 

See merge request 
2021-02-02 17:22:23 +00:00
b36891d1e6 Merge branch 'feature/2164-unify-api-arguments' into 'develop'
Unifying timelines api arguments

Closes 

See merge request 
2021-02-02 17:18:07 +00:00
22486fb4af Improve changelog description 2021-02-02 11:15:47 -06:00
cd5ff7a943 Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
#   CHANGELOG.md
2021-02-02 17:11:38 +00:00
2012800ed1 Merge branch 'fix/attachment-cleanup' into 'develop'
Only run attachment cleanup if enabled

See merge request 
2021-02-02 17:08:33 +00:00
69c560cfba Merge branch 'active-user-count' into 'develop'
Monthly Active Users

Closes 

See merge request 
2021-02-02 17:07:57 +00:00
Alexander Strizhakov
aacd1c90b7
fix for test warnings 2021-02-01 19:33:40 +03:00
Alexander Strizhakov
0dc68c157f
fix for scheduled post with poll 2021-02-01 18:22:26 +03:00
Alexander Strizhakov
fdf1dfed56
only_remote -> remote renaming 2021-02-01 14:11:12 +03:00
Alexander Strizhakov
ba512cbea4
/api/v1/accounts/:id/statuses docs update 2021-02-01 14:11:12 +03:00
Alexander Strizhakov
77f0a0af7d
more tests and update for docs and changelog 2021-02-01 14:11:12 +03:00