Ivan Tashkinov
|
349b8b0f4f
|
[#3213] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).
|
4 years ago |
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
|
4 years ago |
Mark Felder
|
6e90b79d63
|
Lint
|
4 years ago |
feld
|
593c0851d9
|
Merge branch 'develop' into 'new-user-emails'
|
4 years ago |
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
|
4 years ago |
Mark Felder
|
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
|
4 years ago |
feld
|
85cb122986
|
Merge branch 'develop' into 'docs/improve-mailer-settings-desc'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Mark Felder
|
4dbb08a19f
|
Improved Mailer descriptions
|
4 years ago |
Mark Felder
|
2a863987bc
|
Added: New user registration mail
|
4 years ago |
Mark Felder
|
d047372291
|
Merge branch 'develop' into fix/reports-from-admins
|
4 years ago |
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
|
4 years ago |
Haelwenn (lanodan) Monnier
|
ecff027418
|
Redirect non-local activities when /notice/:id is used
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
|
4 years ago |
Mark Felder
|
000d3365c3
|
Document admin actors not getting report notifications
|
4 years ago |
feld
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
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
|
4 years ago |
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
|
4 years ago |
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
|
4 years ago |
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
|
4 years ago |
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
|
4 years ago |
Mark Felder
|
d0b4a49f16
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
4 years ago |
Mark Felder
|
c118bdb8f0
|
Merge branch 'develop' into a1batross-develop-patch-62810
|
4 years ago |
Mark Felder
|
d0c2159b77
|
Mix pleroma.instance creates parent directories now
|
4 years ago |
feld
|
d37d4106c6
|
Merge branch 'fix/majic-nits' into 'develop'
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
|
4 years ago |
Mark Felder
|
92efdf9adc
|
Document OAuth 2.0 provider fqn field addition
|
4 years ago |
Mark Felder
|
f852e8d2d2
|
Document we are disabling the extension fixup in Majic
|
4 years ago |
feld
|
d289ad8579
|
Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
|
4 years ago |
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
|
4 years ago |
Mark Felder
|
22486fb4af
|
Improve changelog description
|
4 years ago |
feld
|
cd5ff7a943
|
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Alexander Strizhakov
|
0dc68c157f
|
fix for scheduled post with poll
|
4 years ago |
Alexander Strizhakov
|
fdf1dfed56
|
only_remote -> remote renaming
|
4 years ago |
Alexander Strizhakov
|
77f0a0af7d
|
more tests and update for docs and changelog
|
4 years ago |
Alexander Strizhakov
|
e21af1cfe4
|
only_media & only_remote docs and changelog
|
4 years ago |
Ivan Tashkinov
|
1b49b8efe5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Alexander Strizhakov
|
c369d2b930
|
support for with_relationships parameter
in /api/v1/mutes and /api/v1/accounts/:id endpoints
|
4 years ago |
Alexander Strizhakov
|
dd1be13f75
|
changelog entry
|
4 years ago |
Egor Kislitsyn
|
13a2ae8ce0
|
Update CHANGELOG
|
4 years ago |
Alexander Strizhakov
|
d4158e8bf0
|
added total
to the instance adminAPI endpoint
|
4 years ago |
Alexander Strizhakov
|
6806c03e85
|
added total
to the user statuses adminAPI endpoint
|
4 years ago |
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
|
4 years ago |
lain
|
229acae6c3
|
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
4 years ago |
Haelwenn
|
250e202098
|
Merge branch 'fix/missing-own_votes' into 'develop'
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
|
4 years ago |
Mark Felder
|
01fc7d809d
|
Clarify the state of mediaproxy cache invalidation for Apache
|
4 years ago |
Mark Felder
|
0b19534475
|
Merge branch 'develop' into docs/apache-config
|
4 years ago |
Ivan Tashkinov
|
694d98be55
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
4 years ago |
Mark Felder
|
5e8da27e14
|
Provide pleroma.user mix task for both activate and deactivate
|
4 years ago |
Mark Felder
|
fe63b48c8f
|
Document removal of toggle_activated
|
4 years ago |
Mark Felder
|
537ba1c5e0
|
Merge branch 'develop' into refactor/deactivated_user_field
|
4 years ago |
Mark Felder
|
6bfd497f4a
|
Include own_votes in the poll data
|
4 years ago |