lain
62f7cca9a1
Transmogrifier Tests: Extract rejections.
2020-08-12 13:39:54 +02:00
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
rinpatch
86c18e4165
Merge branch 'issue/2036-job-monitor' into 'develop'
...
[#2036 ] fix job monitor
See merge request pleroma/pleroma!2877
2020-08-12 03:30:01 +00:00
Maksim Pechnikov
76462efbfa
fix job monitor
2020-08-11 22:06:33 +03:00
lain
500576dcb6
Linting fixes.
2020-08-11 19:22:14 +02:00
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11 17:43:16 +02:00
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
2020-08-11 17:26:01 +02:00
lain
9dda13bfa1
Transmogrifier Test: Remove mastodon hack test.
2020-08-11 16:22:15 +02:00
lain
3f6d50111e
Linter fixes.
2020-08-11 16:07:42 +02:00
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
2020-08-11 13:59:17 +00:00
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.
2020-08-11 15:41:19 +02:00
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
2020-08-11 15:32:52 +02:00
Egor Kislitsyn
304ed35743
Set users.approval_pending default to false
2020-08-11 17:21:17 +04:00
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
2020-08-11 15:13:07 +02:00
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
2020-08-11 14:02:09 +02:00
lain
54a6855ddf
Transmogrifier Tests: Extract Accept handling
2020-08-11 14:01:45 +02:00
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
2020-08-11 09:18:56 +00:00
lain
9a9121805c
Apply 1 suggestion(s) to 1 file(s)
2020-08-11 09:08:27 +00:00
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
2020-08-10 17:16:38 +00:00
Egor Kislitsyn
249f21dcbb
Admin API: Filter out unapproved users when the active filter is on
2020-08-10 18:27:39 +04:00
lain
93fbf39954
Merge branch 'revert-a6d3bb5f' into 'develop'
...
Revert "Merge branch 'issue/1023' into 'develop'"
Closes #2033
See merge request pleroma/pleroma!2868
2020-08-10 13:59:38 +00:00
lain
353f3466d6
Merge branch 'remove-unreachable-code' into 'develop'
...
Transmogrifier: Remove duplicate code.
See merge request pleroma/pleroma!2871
2020-08-10 13:47:20 +00:00
lain
73af60d02f
Merge branch 'develop' into 'develop'
...
docs: add cmake to other installation guides
Closes #2039
See merge request pleroma/pleroma!2870
2020-08-10 13:47:02 +00:00
lain
517d42646a
Merge branch '2039-cmake' into 'develop'
...
Docs: Add cmake dependency
Closes #2039
See merge request pleroma/pleroma!2869
2020-08-10 13:46:52 +00:00
lain
11fc90744c
Transmogrifier: Remove duplicate code.
2020-08-10 15:31:36 +02:00
Alibek Omarov
a2f2ba3fbb
docs: add cmake to other installation guides
2020-08-10 16:24:45 +03:00
lain
4d76c0ec8b
Docs: Add cmake dependency
2020-08-10 15:12:45 +02:00
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
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
2020-08-10 09:17:08 +00:00
rinpatch
21dfcafeb1
Merge branch '2038-old-update-info' into 'develop'
...
AccountController: Build the correct update activity.
Closes #2038
See merge request pleroma/pleroma!2867
2020-08-10 09:04:16 +00:00
rinpatch
15fa3b6bd8
20200802170532_fix_legacy_tags: chunk the user query
2020-08-10 11:56:37 +03:00
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.
2020-08-10 11:55:58 +03:00
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
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
2020-08-09 11:18:00 +00:00
lain
7625e50950
Merge branch 'security-policy' into 'develop'
...
Add security policy for Pleroma backend
Closes #1848
See merge request pleroma/pleroma!2862
2020-08-09 11:06:54 +00:00
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
2020-08-09 10:53:58 +00:00
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
2020-08-08 15:16:55 +00:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
lain
47698fc322
Merge branch 'fix/ldap-auth-issues' into 'develop'
...
Fix LDAP auth issues
Closes #1646
See merge request pleroma/pleroma!2852
2020-08-07 20:59:44 +00:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
Mark Felder
474147a67a
Make a new function instead of overloading register_changeset/3
2020-08-07 14:54:14 -05:00
rinpatch
881fdb3a97
Add security policy for Pleroma backend
...
Closes #1848
2020-08-07 21:27:15 +03:00
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
rinpatch
39ca4a23c6
Merge branch 'authenticator-docs' into 'develop'
...
Docs: Remove wrong / confusing auth docs.
Closes #2028
See merge request pleroma/pleroma!2860
2020-08-07 17:51:48 +00:00
lain
60fe0a08f0
Docs: Remove wrong / confusing auth docs.
2020-08-07 17:59:55 +02:00
rinpatch
cb376c4c4c
CI: install cmake since fast_html now requires it
2020-08-07 18:06:54 +03:00
lain
9cebdf30a4
Merge branch 'spoopy-user' into 'develop'
...
restricted_nicknames: Add names from MastoAPI endpoints
See merge request pleroma/pleroma!2857
2020-08-07 14:51:26 +00:00
Mark Felder
6ddea8ebe8
Add a note about the proper value for uid
2020-08-07 09:42:10 -05:00
rinpatch
568ded5aa4
Merge branch 'object-age-changelog' into 'develop'
...
Changelog: Add information about the object age policy
See merge request pleroma/pleroma!2859
2020-08-07 14:21:28 +00:00
lain
ebb30128af
Changelog: Add information about the object age policy
2020-08-07 16:20:13 +02:00
