Haelwenn
49741961f2
Merge branch 'chore/external-emoji-example' into 'develop'
...
Stop external emoji example from leaking
See merge request pleroma/pleroma!3302
4 years ago
Mark Felder
887db076b5
Load an emoji.txt specific to the test env
4 years ago
Mark Felder
000d3365c3
Document admin actors not getting report notifications
4 years ago
Mark Felder
5bb5949048
Validate admin making report doesn't get their own report notification, but other admins do
4 years ago
Mark Felder
76f732766b
Exclude reporter from receiving notifications from their own reports.
...
Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them.
4 years ago
rinpatch
a7864a9429
Merge branch 'fix/openapi-relationship-nullable' into 'develop'
...
Account schema: specify that pleroma.relationship is nullable
See merge request pleroma/pleroma!3299
4 years ago
rinpatch
74ef1a044d
Account schema: specify that pleroma.relationship is nullable
4 years ago
rinpatch
d2acf3a92f
Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'
...
CI: Forgot $ in spec-deploy
See merge request pleroma/pleroma!3298
4 years ago
rinpatch
c47ca99592
CI: Forgot $ in spec-deploy
4 years ago
feld
859309e116
Merge branch 'fix/2412-filters' into 'develop'
...
Support for expires_in/expires_at in filters
Closes #2412
See merge request pleroma/pleroma!3279
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
rinpatch
5ee9cbf017
Merge branch 'fix/deploy-api-docs' into 'develop'
...
CI: Add job ref when calling api docs builder
See merge request pleroma/pleroma!3297
4 years ago
rinpatch
00268b4476
CI: Add job ref when calling api docs builder
...
Just grabbing the latest artifact for the branch does not work because
gitlab will only change the latest artifact when the whole pipeline
finishes
4 years ago
rinpatch
e2d7c4fd57
Merge branch 'feat/openapi-spec-export' into 'develop'
...
Improve OpenAPI spec and deploy it to api.pleroma.social
See merge request pleroma/pleroma!3296
4 years ago
rinpatch
9fcff7851f
Improve OpenAPI spec and deploy it to api.pleroma.social
...
Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information.
4 years ago
Haelwenn (lanodan) Monnier
fb25231fbe
Add test for Answer presence into an authenticated /outbox
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
feld
0888815000
Merge branch 'fix/2411-mutes-api' into 'develop'
...
Support for with_relationships parameter
Closes #2411
See merge request pleroma/pleroma!3290
4 years ago
Mark Felder
f852e8d2d2
Document we are disabling the extension fixup in Majic
4 years ago
Mark Felder
28d2917c3a
Merge branch 'develop' into fix/majic-nits
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
feld
b36891d1e6
Merge branch 'feature/2164-unify-api-arguments' into 'develop'
...
Unifying timelines api arguments
Closes #2164
See merge request pleroma/pleroma!3281
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
feld
2012800ed1
Merge branch 'fix/attachment-cleanup' into 'develop'
...
Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288
4 years ago
feld
69c560cfba
Merge branch 'active-user-count' into 'develop'
...
Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283
4 years ago
Alexander Strizhakov
aacd1c90b7
fix for test warnings
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
ba512cbea4
`/api/v1/accounts/:id/statuses` docs update
4 years ago
Alexander Strizhakov
77f0a0af7d
more tests and update for docs and changelog
4 years ago
Alexander Strizhakov
2cb6dc5a3a
list timeline filtration by params
4 years ago
Alexander Strizhakov
e21af1cfe4
only_media & only_remote docs and changelog
4 years ago
Alexander Strizhakov
b6a72680e2
added only_media flag to home timeline
4 years ago
Alexander Strizhakov
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
4 years ago
rinpatch
08a2cb750d
Merge branch 'update-frontend-2021-02-01' into 'develop'
...
Update frontend
Closes #2493
See merge request pleroma/pleroma!3293
4 years ago
Lain Soykaf
93e3b89350
Update frontend
4 years ago
Ivan Tashkinov
cf4765af40
[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
4 years ago
Ivan Tashkinov
10207f840c
[ #3213 ] ActivityPub: temporarily reverted to previous hashtags filtering implementation due to blank results issue.
4 years ago
Ivan Tashkinov
108e90b18e
[ #3213 ] Explicitly defined PKs in hashtags_objects and data_migration_failed_ids. Added "pleroma.database rollback" task to revert a single migration.
4 years ago