Mark Felder
|
d047372291
|
Merge branch 'develop' into fix/reports-from-admins
|
2021-02-04 12:37:20 -06:00 |
Haelwenn
|
ea5469961a
|
Merge branch 'bugfix/notice-external-redirect' into 'develop'
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
|
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 |
Mark Felder
|
000d3365c3
|
Document admin actors not getting report notifications
|
2021-02-03 14:52:49 -06:00 |
feld
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
2021-02-03 14:23:23 +00:00 |
feld
|
c3dd860a02
|
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
|
2021-02-03 14:22:23 +00:00 |
feld
|
8d2ea95402
|
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
|
2021-02-03 14:21:57 +00:00 |
feld
|
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 |
feld
|
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 |
Mark Felder
|
d0b4a49f16
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
2021-02-02 12:18:03 -06:00 |
Mark Felder
|
c118bdb8f0
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
2021-02-02 12:16:49 -06:00 |
Mark Felder
|
d0c2159b77
|
Mix pleroma.instance creates parent directories now
|
2021-02-02 12:16:01 -06:00 |
feld
|
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 |
Mark Felder
|
92efdf9adc
|
Document OAuth 2.0 provider fqn field addition
|
2021-02-02 12:12:37 -06:00 |
Mark Felder
|
f852e8d2d2
|
Document we are disabling the extension fixup in Majic
|
2021-02-02 12:03:20 -06:00 |
feld
|
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 |
feld
|
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 |
Mark Felder
|
22486fb4af
|
Improve changelog description
|
2021-02-02 11:15:47 -06:00 |
feld
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
|
2021-02-02 17:11:38 +00: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
|
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 |
Alexander Strizhakov
|
d4158e8bf0
|
added total
to the instance adminAPI endpoint
|
2021-01-27 07:45:06 +03:00 |
Alexander Strizhakov
|
6806c03e85
|
added total
to the user statuses adminAPI endpoint
|
2021-01-27 07:45:02 +03:00 |
feld
|
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 |
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
2021-01-26 08:27:45 +03: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 |
Mark Felder
|
01fc7d809d
|
Clarify the state of mediaproxy cache invalidation for Apache
|
2021-01-25 18:23:05 -06:00 |
Mark Felder
|
0b19534475
|
Merge branch 'develop' into docs/apache-config
|
2021-01-25 17:00:26 -06:00 |
Mark Felder
|
5e8da27e14
|
Provide pleroma.user mix task for both activate and deactivate
|
2021-01-25 10:36:51 -06:00 |
Mark Felder
|
fe63b48c8f
|
Document removal of toggle_activated
|
2021-01-25 10:05:38 -06:00 |
Mark Felder
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-25 09:45:06 -06:00 |
Mark Felder
|
6bfd497f4a
|
Include own_votes in the poll data
|
2021-01-22 09:47:59 -06:00 |
Mark Felder
|
80ccdb56f6
|
Make tag urls absolute
|
2021-01-21 16:49:19 -06:00 |
Mark Felder
|
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 |
Mark Felder
|
1537a4f0ad
|
Document ConcurrentLimiter for RichMedia and MediaProxy
|
2021-01-21 09:47:22 +03:00 |
feld
|
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 |
Mark Felder
|
28581e03ad
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-18 14:58:21 -06:00 |
Mark Felder
|
ab32ede102
|
Document new is_approved attribute
|
2021-01-18 12:07:37 -06:00 |
feld
|
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 |