Alexander Strizhakov
29a7bcd5bb
reverting pinned posts in filtering
4 years ago
Alexander Strizhakov
3ab83f837e
don't load pinned activities in due_expirations
4 years ago
feld
a94210c70b
Merge branch 'docs_improve_static_dir_documentation' into 'develop'
...
Improve static_dir documentation
See merge request pleroma/pleroma!2864
4 years ago
feld
3aa7969ff9
Update robots_txt.md
4 years ago
feld
dfc56de167
Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
...
Update :welcome settings in description.exs
Closes #2024
See merge request pleroma/pleroma!2843
4 years ago
Mark Felder
b89fc1f227
Add warning to the migration
4 years ago
Mark Felder
091da10832
Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria.
4 years ago
Mark Felder
98058bd06e
Merge branch 'develop' into fix/activity-expirations-again
4 years ago
lain
05ff666f99
AdminApiControllerTest: Add test that `deleted` users get deactivated.
4 years ago
Ivan Tashkinov
f50c653c8d
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
4 years ago
lain
2e347e8286
ActivityPub: Remove `reject`, move everything to the Pipeline.
4 years ago
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
4 years ago
Alexander Strizhakov
eec1ba232c
don't expire pinned posts
4 years ago
lain
62f7cca9a1
Transmogrifier Tests: Extract rejections.
4 years ago
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
4 years ago
Alexander Strizhakov
57b455de5a
leave expirations with Create and Note types
4 years ago
Maksim Pechnikov
644effc63b
update docs
4 years ago
rinpatch
86c18e4165
Merge branch 'issue/2036-job-monitor' into 'develop'
...
[#2036 ] fix job monitor
See merge request pleroma/pleroma!2877
4 years ago
Maksim Pechnikov
76462efbfa
fix job monitor
4 years ago
lain
500576dcb6
Linting fixes.
4 years ago
Mark Felder
724ed354f2
Ensure only Note objects are set to expire
4 years ago
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
4 years ago
Mark Felder
ff4e282aad
Ensure ap_id column in users table cannot be null
4 years ago
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
4 years ago
lain
9dda13bfa1
Transmogrifier Test: Remove mastodon hack test.
4 years ago
lain
3f6d50111e
Linter fixes.
4 years ago
lain
c66f6bd0ad
Merge branch 'set-approval-pending-default-to-false' into 'develop'
...
Set `users.approval_pending` default to `false`
See merge request pleroma/pleroma!2874
4 years ago
lain
da3f9b9988
Transmogrifier: Remove handling of orphaned accepts
...
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
4 years ago
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
4 years ago
Egor Kislitsyn
304ed35743
Set `users.approval_pending` default to `false`
4 years ago
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
4 years ago
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
4 years ago
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
4 years ago
lain
54a6855ddf
Transmogrifier Tests: Extract Accept handling
4 years ago
lain
686002164a
Merge branch '204-fix' into 'develop'
...
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
4 years ago
lain
9a9121805c
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago
lain
7e4932362b
SideEffects: Handle strange deletion case.
4 years ago
Maksim Pechnikov
345ac512e4
added paginate+search for admin/MediaProxy URLs
4 years ago
feld
78484fe0ef
Merge branch 'admin-active-filter' into 'develop'
...
Admin API: Filter out unapproved users when the `active` filter is on
Closes #2037
See merge request pleroma/pleroma!2872
4 years ago
Mark Felder
024b7ce0b7
Merge branch 'develop' into fix/activity-expirations-again
4 years ago
Egor Kislitsyn
249f21dcbb
Admin API: Filter out unapproved users when the `active` filter is on
4 years ago
lain
93fbf39954
Merge branch 'revert-a6d3bb5f' into 'develop'
...
Revert "Merge branch 'issue/1023' into 'develop'"
Closes #2033
See merge request pleroma/pleroma!2868
4 years ago
lain
353f3466d6
Merge branch 'remove-unreachable-code' into 'develop'
...
Transmogrifier: Remove duplicate code.
See merge request pleroma/pleroma!2871
4 years ago
lain
73af60d02f
Merge branch 'develop' into 'develop'
...
docs: add cmake to other installation guides
Closes #2039
See merge request pleroma/pleroma!2870
4 years ago
lain
517d42646a
Merge branch '2039-cmake' into 'develop'
...
Docs: Add cmake dependency
Closes #2039
See merge request pleroma/pleroma!2869
4 years ago
lain
11fc90744c
Transmogrifier: Remove duplicate code.
4 years ago
Alibek Omarov
a2f2ba3fbb
docs: add cmake to other installation guides
4 years ago
lain
4d76c0ec8b
Docs: Add cmake dependency
4 years ago