Commit graph

1048 commits

Author SHA1 Message Date
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
fd2477dfba Merge branch 'a1batross-develop-patch-62810' into 'develop'
mix: instance: ensure all needed folders are created before generating config

See merge request pleroma/pleroma!3284
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 pleroma/pleroma!3286
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 pleroma/pleroma!3287
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
f852e8d2d2 Document we are disabling the extension fixup in Majic 2021-02-02 12:03:20 -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 #2473

See merge request pleroma/pleroma!3285
2021-02-02 17:22:23 +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
Alexander Strizhakov
fdf1dfed56
only_remote -> remote renaming 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
Alexander Strizhakov
e21af1cfe4
only_media & only_remote docs and changelog 2021-02-01 14:11:11 +03:00
Alexander Strizhakov
c369d2b930
support for with_relationships parameter
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-29 08:41:21 +03:00
Alexander Strizhakov
dd1be13f75
changelog entry 2021-01-28 17:01:31 +03:00
Egor Kislitsyn
13a2ae8ce0
Update CHANGELOG 2021-01-27 18:23:46 +04:00
d7af0294e6 Merge branch 'service-worker-allowed-header' into 'develop'
Ability to set custom HTTP headers per each frontend

See merge request pleroma/pleroma!3247
2021-01-26 18:14:01 +00:00
lain
229acae6c3 Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
#   CHANGELOG.md
2021-01-26 14:24:32 +00:00
Haelwenn
250e202098 Merge branch 'fix/missing-own_votes' into 'develop'
Include own_votes in the poll data

See merge request pleroma/pleroma!3274
2021-01-26 00:55:05 +00:00
01fc7d809d Clarify the state of mediaproxy cache invalidation for Apache 2021-01-25 18:23:05 -06:00
0b19534475 Merge branch 'develop' into docs/apache-config 2021-01-25 17:00:26 -06:00
5e8da27e14 Provide pleroma.user mix task for both activate and deactivate 2021-01-25 10:36:51 -06:00
fe63b48c8f Document removal of toggle_activated 2021-01-25 10:05:38 -06:00
537ba1c5e0 Merge branch 'develop' into refactor/deactivated_user_field 2021-01-25 09:45:06 -06:00
6bfd497f4a Include own_votes in the poll data 2021-01-22 09:47:59 -06:00
80ccdb56f6 Make tag urls absolute 2021-01-21 16:49:19 -06:00
c29cf65ec7 Document improved Apache support 2021-01-21 14:53:38 -06:00
eugenijm
7fcaa188a0 Allow to define custom HTTP headers per each frontend 2021-01-21 21:55:23 +03:00
eugenijm
133644dfa2 Ability to set the Service-Worker-Allowed header 2021-01-21 21:55:11 +03:00
Alexander Strizhakov
5ade430e46
changed naming in changelog 2021-01-21 10:13:02 +03:00
1537a4f0ad
Document ConcurrentLimiter for RichMedia and MediaProxy 2021-01-21 09:47:22 +03:00
2926713fe5 Merge branch 'deprecate-public_endpoint' into 'develop'
Deprecate Uploaders.S3, :public_endpoint

See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
Egor Kislitsyn
695dabb5da
Add Reblog fix to CHANGELOG 2021-01-19 17:57:00 +04:00
rinpatch
79bc4bcc3c Merge branch 'stable' into mergeback/2.2.2 2021-01-19 12:59:24 +03:00
28581e03ad Merge branch 'develop' into refactor/deactivated_user_field 2021-01-18 14:58:21 -06:00
ab32ede102 Document new is_approved attribute 2021-01-18 12:07:37 -06:00
0ad6ea2057 Merge branch 'refactor/confirmation_pending_user_field' into 'develop'
Change user.confirmation_pending field to user.is_confirmed

See merge request pleroma/pleroma!3081
2021-01-18 17:54:42 +00:00
a9f9fb002c Document new is_confirmed attribute 2021-01-18 11:31:07 -06:00
096e61fe93 Keep *Breaking* at the top 2021-01-18 11:30:06 -06:00
Lain Soykaf
71166b30a4 Changelog: Add list fix. 2021-01-18 16:29:29 +01:00
rinpatch
605f389038 CHANGELOG.md: Finalize 2.2.2 changelog 2021-01-18 17:08:26 +03:00
lain
3dc04b9aca Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218
2021-01-18 15:28:19 +03:00
rinpatch
cbb1174cbd CHANGELOG.md: Remove wrong entries from Unreleased(patch)
Webpush changes are under 2.3.0 milestone and therefore should be
under Unreleased section

The emoji reaction change was introduced in 2.2.1
2021-01-17 15:55:33 +03:00
Mark Felder
7516660753 Remove toggle_activation 2021-01-15 11:25:32 -06:00
2b93351bd7 Document deprecation 2021-01-12 16:40:29 -06:00
lain
80167e62dd Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218
2021-01-08 13:10:49 +00:00
lain
f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases 2021-01-05 12:42:30 +01:00