Mark Felder
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
359ded086c
Merge branch 'simplepolicy-announce-leak' into 'develop'
...
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
2021-05-28 19:05:13 +00:00
cd4352a86f
Missing entry for pinned posts federation from MR !3312
2021-05-27 12:20:21 -05:00
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
2d7f6ce6fb
Clarify AttachmentMetadata changes
2021-05-18 16:46:51 -05:00
c64cbee26c
Fixed checking for Upload Filter required commands
2021-05-18 16:28:21 -05:00
9b6b5ac196
Rename upload filter to AnalyzeMetadata
2021-05-18 15:33:33 -05:00
Alex Gleason
5a57b025c7
Changelog: attachment meta
2021-05-12 20:15:33 -05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-05-07 12:40:45 -05:00
Alex Gleason
b15c4629ff
CHANGELOG: notice routes
2021-05-05 14:51:29 -05:00
745375bdcf
Merge branch 'dont-crash-email-settings' into 'develop'
...
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
2021-05-04 13:30:00 +00:00
Alex Gleason
90770e0841
CHANGELOG: don't crash so hard when email settings are invalid
2021-05-03 14:43:34 -05:00
Alex Gleason
dca87c5e7b
CHANGELOG: markdown
2021-05-01 11:28:06 -05:00
Alex Gleason
20878c7f99
CHANGELOG: SimplePolicy embedded objects are now checked
2021-04-30 14:22:02 -05:00
Alex Gleason
8c1d6e8839
CHANGELOG: Return OAuth token id
2021-04-29 12:20:46 -05:00
Alex Gleason
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
d7a71a275a
Fixed pleroma.user delete_activities mix task.
2021-04-22 10:15:50 -05:00
Sean King
2780cdd4e7
Add CHANGELOG entry
2021-04-19 16:06:19 -06:00
Sean King
a787fed8f7
Move changelog around
2021-04-16 15:50:17 -06:00
Sean King
bf9c4f5289
Add note about Mastodon FE being removed from Pleroma in changelog
2021-04-15 23:39:33 -06:00
0a7c2a32ba
Merge branch 'develop' into 'fix/notifsettings-breaking-login'
...
# Conflicts:
# CHANGELOG.md
2021-04-15 14:59:26 +00:00
861f192852
Document fixed ability to save ConcurrentLimiter settings in ConfigDB
2021-04-13 14:39:44 -05:00
9fbcdc15b1
Validate custom instance thumbnail set via AdminAPI produces correct URL
2021-04-13 10:52:53 -05:00
31ce8a3730
Fix CHANGELOG entry meant for next release
2021-04-01 10:15:01 -05:00
765f0907df
Document user login failure fix for NULL notification_settings
2021-04-01 10:07:57 -05:00
7eab98d5c8
Document new FollowBot MRF
2021-03-30 11:10:44 -05:00
Alexander Strizhakov
ad907254fb
changelog entry
2021-03-23 12:40:49 -05:00
rinpatch
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
Haelwenn (lanodan) Monnier
a22c53810b
Remove deprecated /api/qvitter/statuses/notifications/read
2021-03-15 06:47:07 +01:00
Ivan Tashkinov
946e0aab49
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-10 07:48:50 +03:00
Haelwenn
7f413139fb
Merge branch 'openapi/admin/user' into 'develop'
...
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
2021-03-10 03:24:40 +00:00
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
lain
10f402af6d
Changelog: Re-add application support
2021-03-03 15:35:25 +01:00
lain
c5352e90be
Changelog, mix: merge in stable
2021-03-03 13:56:40 +01:00
Egor Kislitsyn
3aae5231b2
Add OpenAPI spec for AdminAPI.UserController
2021-03-02 20:49:17 +04:00
lain
7d790bb27b
Changelog: Remove application support line.
2021-03-02 14:42:11 +01:00
Ivan Tashkinov
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
lain
9f71b63c2d
Update changelog
2021-03-01 21:12:26 +01:00
808e15b264
Document user agent leak fix
2021-03-01 21:05:58 +01:00
8a563efdd8
Update CHANGELOG.md
2021-02-28 18:46:03 +00:00
lain
6a71aa535b
Merge branch 'admin-api-versioning' into 'develop'
...
Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335
2021-02-28 16:22:22 +00:00
lain
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
2021-02-28 16:17:34 +00:00
Haelwenn (lanodan) Monnier
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
Ivan Tashkinov
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
eugenijm
c1d63bbd9a
Reroute /api/pleroma to /api/v1/pleroma
2021-02-21 13:26:23 +03:00
e31274f51d
Revert changelog entry that leaked from another branch.
2021-02-20 17:07:12 -06:00
1cb417bce6
Document HeifToJpeg and its requirement of libheif's heic-convert tool
2021-02-20 14:32:14 -06:00
Alexander Strizhakov
1e6c27181e
expires_in in scheduled status params
2021-02-18 14:59:22 +03:00
rinpatch
6d66fadea7
Remove :auth, :enforce_oauth_admin_scope_usage
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
2021-02-17 20:47:38 +03:00
Haelwenn
e7b1f0f5f4
Merge branch 'feat/chat-list-pagination' into 'develop'
...
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325
2021-02-17 15:36:59 +00:00
rinpatch
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
2021-02-17 15:14:27 +00:00
rinpatch
d7ad288c84
Chats: Introduce /api/v2/pleroma/chats which implements pagination
...
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
2021-02-17 16:03:24 +03:00
Egor Kislitsyn
cf6d3db58f
Add API endpoint to remove a conversation
2021-02-15 21:48:13 +04:00
Shpuld Shpuldson
0c73935de1
update changelog to mention change of avatar
2021-02-15 15:52:36 +02:00
Ivan Tashkinov
349b8b0f4f
[ #3213 ] rescue
around potentially-raising Repo.insert_all/_
calls. Misc. improvements (docs etc.).
2021-02-13 22:01:11 +03:00
4b979538bc
Document the application metadata is now retained as part of the post.
2021-02-11 15:10:53 -06:00
Ivan Tashkinov
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
6e90b79d63
Lint
2021-02-08 16:40:27 -06:00
593c0851d9
Merge branch 'develop' into 'new-user-emails'
2021-02-08 16:01:50 -06:00
Haelwenn
a5bee1bf35
Merge branch 'feat/mrf-noemptypolicy' into 'develop'
...
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309
2021-02-08 21:49:20 +00:00
55a13fc360
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
...
Helps prevent accidental button mashes from submitting incomplete posts
2021-02-08 15:32:47 -06:00
85cb122986
Merge branch 'develop' into 'docs/improve-mailer-settings-desc'
...
# Conflicts:
# CHANGELOG.md
2021-02-08 16:43:04 +00:00
4dbb08a19f
Improved Mailer descriptions
2021-02-08 10:08:33 -06:00
2a863987bc
Added: New user registration mail
2021-02-04 16:14:37 -06:00
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
000d3365c3
Document admin actors not getting report notifications
2021-02-03 14:52:49 -06: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 #2449
See merge request pleroma/pleroma!3294
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 #2438
See merge request pleroma/pleroma!3270
2021-02-03 14:21:57 +00:00
Ivan Tashkinov
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +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 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
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