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
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
Ivan Tashkinov
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-31 20:38:58 +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
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
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
Ivan Tashkinov
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-25 21:24:07 +03: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
Ivan Tashkinov
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
2021-01-22 10:05:28 +03: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
Ivan Tashkinov
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +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
Ivan Tashkinov
48b399cedb
[ #3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
2021-01-16 20:22:14 +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
Alex Gleason
b7b05a0748
Oopsie whoopsie fix changelog
2021-01-06 15:42:36 -06:00
Alex Gleason
1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-01-06 15:22:35 -06:00
lain
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
2021-01-05 12:42:30 +01:00
83d97ab98e
Document reports ordering change
2020-12-31 13:15:44 -06:00
Alex Gleason
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
2020-12-30 17:10:02 -06:00
Haelwenn
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
Haelwenn
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
2020-12-28 10:14:58 +00:00
Alexander Strizhakov
546da68a11
changelog entry
2020-12-27 21:53:30 +03:00
5b838accc0
Update Linkify to 0.4.1
...
Fixes false positive detection of IPv4 addresses
2020-12-23 09:07:01 -06:00
lain
ae934659d1
Align changelog
2020-12-23 14:56:57 +01:00
lain
5ada38499b
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
2020-12-23 11:40:34 +01:00
lain
322463e1bd
Update changelog
2020-12-23 11:39:19 +01:00
lain
463eec992a
Apply 1 suggestion(s) to 1 file(s)
2020-12-23 10:35:41 +00:00
lain
b988e9cc8b
Mix: Update version.
2020-12-22 22:11:02 +01:00
lain
a8ca282b4a
Update changelog
2020-12-22 21:54:31 +01:00
lain
d788b41c2e
Report fixes.
2020-12-22 21:32:11 +01:00
lain
0f527c9e02
Mix: Update linkify to 0.4.1
2020-12-22 21:22:48 +01:00
lain
66c75b0192
Update changelog
2020-12-22 21:05:12 +01:00
Mark Felder
42a386eb9f
Document fixing the pleroma.user delete_activities mix task
2020-12-22 20:51:24 +01:00
Mark Felder
93852f1b42
Document S3 and Elixir 1.11 compat fix
2020-12-22 20:48:56 +01:00
Haelwenn (lanodan) Monnier
aa848cbd75
pleroma.instance: Fix Exiftool module name
2020-12-22 20:48:19 +01:00
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
Alex Gleason
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-12-17 09:05:36 -06:00
Alexander Strizhakov
c37f78d1c8
changelog
2020-12-14 11:02:32 -06:00
Alexander Strizhakov
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
Mark Felder
dfde4af0fd
Fixed Rich Media Previews
2020-12-12 13:23:51 -06:00
lain
477c6c8e55
Merge branch 'auth-improvements' into 'develop'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
2020-12-09 15:55:45 +00:00
lain
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
2020-12-09 15:52:31 +00:00
Egor Kislitsyn
97068196a9
Update CHANGELOG
2020-12-09 19:40:40 +04:00
Ivan Tashkinov
36ce45a28c
[ #3112 ] Changelog entry.
2020-12-07 21:50:32 +03:00
Ivan Tashkinov
c8e7ace812
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
...
# Conflicts:
# CHANGELOG.md
2020-12-07 21:45:04 +03:00
lain
ed76323776
Merge branch 'feature/configdb-mix-tasks' into 'develop'
...
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
2020-12-07 18:06:06 +00:00
Ivan Tashkinov
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-12-06 13:59:35 +03:00
Mark Felder
24673b6ca3
Add entry announcing new ConfigDB mix tasks
2020-12-05 08:44:02 -06:00
lain
9feb678ec8
Docs, Changelog: Add info about regional indicators
2020-12-03 16:18:35 +01:00
lain
a0aece3223
Changelog: Update changelog
2020-12-02 16:52:44 +01:00
Ivan Tashkinov
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
lain
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-23 15:18:19 +01:00
Alex Gleason
4999efad3f
Update CHANGELOG.md: registration workflow
2020-11-21 10:24:45 -06:00
Alex Gleason
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-21 10:23:53 -06:00
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
2020-11-20 18:40:15 +00:00
lain
cc52f03566
Changelog: Add info about search changes
2020-11-20 16:28:00 +01:00
Ivan Tashkinov
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
2020-11-19 19:35:44 +03:00
lain
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-19 17:32:57 +01:00
Ivan Tashkinov
e164c37139
[ #2301 ] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.
2020-11-19 19:30:02 +03:00
Haelwenn
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
2020-11-19 16:22:14 +00:00
rinpatch
1eda5ab267
CHANGELOG.md: Move rum fix entry to patch section
...
Also includes minor cosmetical fixes.
2020-11-19 19:13:19 +03:00
lain
3b86ad0744
Changelog: Document breaking change.
2020-11-19 16:26:17 +01:00
lain
1bad91cba2
Changelog: Add info about the websearch option
2020-11-19 16:13:53 +01:00
lain
2ee0fc194a
Changelog: Add info about search fixes.
2020-11-19 13:23:58 +01:00
lain
21eaaf491c
Changelog: Add info about reset tokens
2020-11-19 12:29:41 +01:00
Alexander Strizhakov
44f3795b8e
changelog entries for fixes
2020-11-19 09:58:27 +03:00
minibikini
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
2020-11-18 20:22:40 +00:00
Mark Felder
1d03ba4ffb
Fixed emoji reactions not being filtered from blocked and muted accounts
2020-11-18 20:13:25 +00:00
a1056aace1
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
...
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
2020-11-18 18:57:47 +00:00
lain
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
2020-11-18 18:33:48 +00:00
lain
1b63aa0b4f
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 18:27:30 +00:00
lain
d7b63272b8
Changelog: Move api info to api heading.
2020-11-18 18:32:13 +01:00
Mark Felder
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
2020-11-17 20:21:48 +00:00
Mark Felder
56d95203b5
Document fixing the pleroma.user delete_activities mix task
2020-11-17 15:28:46 +00:00
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
lain
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
rinpatch
11d8fefa7b
CHANGELOG.md: Use a period after every bullet point for unreleased sections
...
It has been the de-facto style for a while now, however it is not
enforced, so there were some entries that didn't use it.
2020-11-17 15:21:46 +03:00
rinpatch
ba214f3f16
CHANGELOG.md: Add back an entry for S3 fix
2020-11-17 15:20:57 +03:00
rinpatch
77c239f309
Import stable commits into develop after releasing 2.2.0
...
Updates the frontend bundle and syncs the changelog.
2020-11-17 15:14:25 +03:00
Mark Felder
5cbaa76fd6
Document S3 and Elixir 1.11 compat fix
2020-11-16 19:54:02 +00:00
Alex Gleason
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-14 19:48:47 -06:00
Haelwenn
28da36975d
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
...
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
2020-11-14 21:43:07 +00:00
Haelwenn (lanodan) Monnier
e2f573d68b
pleroma.instance: Fix Exiftool module name
2020-11-14 22:31:01 +01:00
lain
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
Ilja
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
rinpatch
99edfba3da
Polish the changelog a bit and specify release date
2020-11-11 23:12:52 +03:00
lain
b0e4e0cf2a
Changelog: Add info about title injection
2020-11-11 17:19:09 +01:00
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
Egor Kislitsyn
af3f00292c
Fix formatting
2020-11-11 19:12:46 +04:00
lain
88f6b61a5e
Merge branch '2260-wrong-report-link' into 'develop'
...
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
2020-11-10 11:04:19 +00:00
rinpatch
6166ecdbc8
CHANGELOG.md: Add an entry for the spoofing fix
2020-11-05 16:33:51 +03:00
Haelwenn
4d693b5e54
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
2020-11-05 16:32:50 +03:00
48f7e12e6c
Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
...
OStatus / Static FE access control fixes
See merge request pleroma/pleroma!3053
2020-11-05 16:23:56 +03:00
86b4149a13
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
2020-11-05 16:22:35 +03:00
lain
5ddf0be208
Changelog: Add info about admin email user link changes.
2020-11-04 17:13:34 +01:00
lain
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
lain
bae48c98e3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-11-04 16:18:11 +01:00
lain
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
2020-11-04 15:00:52 +00:00
lain
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
2020-11-04 14:54:53 +00:00
lain
eb1e1e7494
Changelog: Add info about federation status endpoint
2020-11-04 15:39:32 +01:00
rinpatch
7058cac1c2
Merge branch '2257-self-chat' into 'develop'
...
Resolve "Can't message yourself in a chat (but can start it)"
Closes #2257
See merge request pleroma/pleroma!3099
2020-11-04 17:12:37 +03:00
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
lain
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
2020-11-04 13:23:18 +01:00
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
lain
f09bb814a9
Changelog: Add info about poll view changes
2020-11-04 10:14:48 +01:00
lain
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
2020-11-03 13:45:09 +01:00
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
2020-10-31 17:03:40 +00:00
eugenijm
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
5591dc0248
Add entry in changelog
2020-10-30 13:59:53 +01:00
minibikini
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
2020-10-29 21:06:15 +00:00
Egor Kislitsyn
75d131ba18
Add documentation and update CHANGELOG
2020-10-29 16:37:51 +04:00
Egor Kislitsyn
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
Egor Kislitsyn
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
Ivan Tashkinov
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
2020-10-28 19:03:40 +03:00
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
1204aaa2e3
Merge branch 'feature/autofollowing' into 'develop'
...
autofollowing_nicknames
See merge request pleroma/pleroma!3087
2020-10-27 22:55:31 +00:00
Haelwenn
d8d4bd15d0
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
2020-10-27 22:44:31 +00:00
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
minibikini
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
Mark Felder
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
2020-10-27 17:47:56 +00:00
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 17:42:24 +00:00
lain
04b7505c75
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-10-26 17:50:34 +01:00
lain
a999e8b0b7
Changelog: Add info about whitespace name remote users.
2020-10-23 13:55:08 +02:00
lain
3fdc2a0d1e
Changelog: Add information about self-chats
2020-10-22 12:23:07 +02:00
Maksim Pechnikov
add26817e3
update changelog
2020-10-22 11:54:32 +03:00
rinpatch
fb0e340363
Rip out fedsockets from the release branch
2020-10-21 21:14:58 +03:00
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
Egor Kislitsyn
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
2020-10-19 15:40:03 +04:00
Egor Kislitsyn
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
2020-10-19 15:31:56 +04:00
Ivan Tashkinov
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
2020-10-18 21:22:21 +03:00
d16336e7fb
Document autofollowing_nicknames
2020-10-17 16:54:05 +00:00
Mark Felder
cb3ee4d543
Fix duplicate Added sections in the changelog
2020-10-17 11:52:52 -05:00
Ivan Tashkinov
049ece1ef3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00
rinpatch
6c1bc9ca39
CHANGELOG.md: prepare 2.2.0 changelog
2020-10-15 21:43:46 +03:00
Egor Kislitsyn
a598d5baab
Update CHANGELOG
2020-10-15 18:37:45 +04:00
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
Alex Gleason
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-14 12:33:24 -05:00
Alex Gleason
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
2020-10-13 22:01:27 -05:00
Egor Kislitsyn
2b58b0dbce
Update CHANGELOG
2020-10-13 21:58:26 +04:00
Ivan Tashkinov
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-11 22:34:48 +03:00
Ivan Tashkinov
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
2020-10-11 22:34:28 +03:00
Alex Gleason
5c8d2c468c
Blocks: update CHANGELOG
2020-10-10 03:44:20 -05:00
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
Alex Gleason
a3964b373e
Aliases: move changelog entry
2020-10-08 15:46:03 -05:00
Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
Egor Kislitsyn
563801716a
Update changelog
2020-10-07 18:35:26 +04:00
Mark Felder
21a73ce9f2
Document the NSFW link preview change
2020-10-06 14:54:21 -05:00
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
rinpatch
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00:00
rinpatch
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
2020-09-29 21:52:16 +03:00
lain
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
Ivan Tashkinov
ae26284638
[ #3031 ] Adjusted changelog entry.
2020-09-29 17:34:49 +03:00
lain
a24f80badf
Apply 1 suggestion(s) to 1 file(s)
2020-09-29 14:30:18 +00:00
lain
9a56ec25cb
Changelog: Add info about relay unfollowing
2020-09-29 16:24:02 +02:00
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
Ivan Tashkinov
7cd662f18c
Added documentation on installation of ffmpeg and ImageMagick dependencies.
2020-09-24 18:02:50 +03:00
lain
defca4a8b1
Changelog: Add info about user search.
2020-09-24 15:56:17 +02:00
Alexander Strizhakov
3f201475e0
changelog entry
2020-09-24 09:54:10 +03:00
Alexander Strizhakov
958008cc14
changelog entry
2020-09-24 09:12:40 +03:00
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
Roman Chvanikov
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
lain
518c0f2962
Changelog: Add info about emoji zip import feature
2020-09-23 10:57:53 +02:00
lain
9d6415de15
Changelog: Info about email fix.
2020-09-23 10:54:24 +02:00
lain
df1eb5cf7e
Changelog: Add info about chat pagination fix.
2020-09-22 17:17:19 +02:00
Roman Chvanikov
b0bd81ef71
Update CHANGELOG
2020-09-20 20:58:32 +03:00
Maksim Pechnikov
ed3bc53fa1
Merge branch 'develop' into issue/2099
2020-09-18 22:13:05 +03:00
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
Maksim Pechnikov
2159daa9af
update changelog
2020-09-18 07:09:53 +03:00
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
rinpatch
065a4dddfd
Merge branch 'stable' into stable-sync/2.1.2
2020-09-17 22:19:49 +03:00
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
2020-09-17 22:07:54 +03:00
rinpatch
b751c5babc
CHANGELOG.md: Add 2.1.2 entry
2020-09-17 21:22:03 +03:00
Haelwenn
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
2020-09-17 17:59:38 +00:00
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
2020-09-17 16:54:53 +00:00
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
2020-09-17 19:48:33 +03:00
stwf
dfc621a529
add test and changelog entry
2020-09-17 12:18:07 -04:00
lain
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
2020-09-17 14:09:01 +00:00
stwf
f58262c673
add description to changelog
2020-09-17 09:48:17 -04:00
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
Ivan Tashkinov
a781f41f96
[ #2497 ] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring.
2020-09-16 22:30:42 +03:00
eugenijm
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user
2020-09-15 13:00:56 +03:00
Haelwenn
5c4ff5c73c
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
2020-09-15 08:25:10 +00:00
Mark Felder
0b66e806e3
Move changelog entry to next patch
2020-09-14 17:11:08 -05:00
Mark Felder
118bf6e92b
Fixed Welcome chats with MRF Simple applied locally
2020-09-14 12:08:32 -05:00
Mark Felder
25d1caf1dd
Merge duplicate Changed sections
2020-09-14 12:07:31 -05:00
rinpatch
0b5e72ecf0
Remove :managed_config option.
...
In practice, it was already removed half a year ago, but the description
and cheatsheet entries were still there.
The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
to ConfigDB.
Closes #2086
2020-09-14 18:04:16 +03:00
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
rinpatch
82b56cdb9b
CHANGELOG.md: clarify that the functionality is not removed, just the config options
2020-09-10 21:53:58 +03:00
rinpatch
a098e10fd6
Document ephemeral activity changes better
...
Also remove the example from the cheatsheet, there is no need for it
when the types are simple
2020-09-10 21:52:30 +03:00
Alexander Strizhakov
4954667fb2
changelog
2020-09-10 21:51:58 +03:00
Alexander Strizhakov
c6647c08e1
migration and changelog
2020-09-10 16:01:20 +03:00
Mark Felder
34d7e864db
New mix tasks for controlling user confirmation status and sending confirmation mails
2020-09-09 09:10:44 -05:00
rinpatch
5ef840ed9c
Merge branch 'stable' into stable-sync/2.1.1
2020-09-08 20:34:02 +03:00
Mark Felder
549c895d80
Document breaking change for metadata providers
2020-09-08 20:21:34 +03:00
Mark Felder
ff07014b26
Disable providers of user and status metadata when instance is private
2020-09-08 20:21:34 +03:00
rinpatch
7490b76bbf
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 19:45:44 +03:00
rinpatch
e430e98e7d
CHANGELOG.md: Add 2.1.1 entry
2020-09-08 19:45:44 +03:00
Mark Felder
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
2020-09-08 09:31:26 -05:00
rinpatch
0a05670b44
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 12:21:33 +00:00
5d814f739c
changelog: add ForceBotUnlistedPolicy
2020-09-08 11:35:34 +00:00
lain
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-08 13:56:42 +03:00
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-08 13:53:47 +03:00
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
rinpatch
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-08 12:53:02 +03:00
rinpatch
0f27211dd0
CHANGELOG.md: move the exiftool webp entry to a proper section
...
Also clarify how it was fixed
2020-09-08 12:30:01 +03:00
Mark Felder
fa347b9c2f
Fix uploading webp image files when Exiftool Upload Filter is enabled
2020-09-08 12:29:38 +03:00
rinpatch
d8a48f8386
CHANGELOG.md: Split settings renaming to 2 separate entries
2020-09-08 12:23:08 +03:00
