lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
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
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
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
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
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
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
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
4 years ago
rinpatch
00a4980c61
Merge branch 'fix/flaky-migration-episode-666' into 'develop'
...
20200802170532_fix_legacy_tags: Select only fields the migration needs
See merge request pleroma/pleroma!2863
4 years ago
rinpatch
21dfcafeb1
Merge branch '2038-old-update-info' into 'develop'
...
AccountController: Build the correct update activity.
Closes #2038
See merge request pleroma/pleroma!2867
4 years ago
rinpatch
15fa3b6bd8
20200802170532_fix_legacy_tags: chunk the user query
4 years ago
rinpatch
a818587467
20200802170532_fix_legacy_tags: Select only fields the migration needs
...
Selecting the full struct will break as soon as a new field is added.
4 years ago
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
lain
0149dd0146
Merge branch 'feat/floki-fast-html-2' into 'develop'
...
Update to fast_html 2 and use it for Floki parsing
See merge request pleroma/pleroma!2861
4 years ago
lain
7625e50950
Merge branch 'security-policy' into 'develop'
...
Add security policy for Pleroma backend
Closes #1848
See merge request pleroma/pleroma!2862
4 years ago
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
4 years ago
lain
ad29a4f2cf
Merge branch 'ensure-expiration-mix-task' into 'develop'
...
Add mix task to add expiration to all local statuses
Closes #2020
See merge request pleroma/pleroma!2865
4 years ago
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
4 years ago
lain
47698fc322
Merge branch 'fix/ldap-auth-issues' into 'develop'
...
Fix LDAP auth issues
Closes #1646
See merge request pleroma/pleroma!2852
4 years ago
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Mark Felder
474147a67a
Make a new function instead of overloading register_changeset/3
4 years ago
rinpatch
881fdb3a97
Add security policy for Pleroma backend
...
Closes #1848
4 years ago
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
4 years ago
rinpatch
39ca4a23c6
Merge branch 'authenticator-docs' into 'develop'
...
Docs: Remove wrong / confusing auth docs.
Closes #2028
See merge request pleroma/pleroma!2860
4 years ago
lain
60fe0a08f0
Docs: Remove wrong / confusing auth docs.
4 years ago
rinpatch
cb376c4c4c
CI: install cmake since fast_html now requires it
4 years ago
lain
9cebdf30a4
Merge branch 'spoopy-user' into 'develop'
...
restricted_nicknames: Add names from MastoAPI endpoints
See merge request pleroma/pleroma!2857
4 years ago
Mark Felder
6ddea8ebe8
Add a note about the proper value for uid
4 years ago
rinpatch
568ded5aa4
Merge branch 'object-age-changelog' into 'develop'
...
Changelog: Add information about the object age policy
See merge request pleroma/pleroma!2859
4 years ago
lain
ebb30128af
Changelog: Add information about the object age policy
4 years ago
rinpatch
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
4 years ago