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
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
