summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-13Fix linting.note-updatelain
2020-08-13UpdateValidator: Allow updating of your own objects.lain
2020-08-13Merge branch 'fix/users_ap_id_not_null' into 'develop'lain
Ensure ap_id column in users table cannot be null See merge request pleroma/pleroma!2875
2020-08-13Migrations: Fix Logger requirements.lain
2020-08-13Merge branch '1152-deletion' into 'develop'lain
User deletion issue exploration See merge request pleroma/pleroma!2879
2020-08-12Merge branch 'docs_improve_static_dir_documentation' into 'develop'feld
Improve static_dir documentation See merge request pleroma/pleroma!2864
2020-08-12Update robots_txt.mdfeld
2020-08-12Merge branch 'feature/update-welcome-setting-in-description' into 'develop'feld
Update :welcome settings in description.exs Closes #2024 See merge request pleroma/pleroma!2843
2020-08-12Add warning to the migrationMark Felder
2020-08-12AdminApiControllerTest: Add test that `deleted` users get deactivated.lain
2020-08-12Merge branch 'issue/2036-job-monitor' into 'develop'rinpatch
[#2036] fix job monitor See merge request pleroma/pleroma!2877
2020-08-11fix job monitorMaksim Pechnikov
2020-08-11Ensure ap_id column in users table cannot be nullMark Felder
2020-08-11Merge branch 'set-approval-pending-default-to-false' into 'develop'lain
Set `users.approval_pending` default to `false` See merge request pleroma/pleroma!2874
2020-08-11Set `users.approval_pending` default to `false`Egor Kislitsyn
2020-08-11Merge branch '204-fix' into 'develop'lain
Fix 500 errors when returning :no_content, fixes #2029 Closes #2029 See merge request pleroma/pleroma!2856
2020-08-11Apply 1 suggestion(s) to 1 file(s)lain
2020-08-10Merge branch 'admin-active-filter' into 'develop'feld
Admin API: Filter out unapproved users when the `active` filter is on Closes #2037 See merge request pleroma/pleroma!2872
2020-08-10Admin API: Filter out unapproved users when the `active` filter is onEgor Kislitsyn
2020-08-10Merge branch 'revert-a6d3bb5f' into 'develop'lain
Revert "Merge branch 'issue/1023' into 'develop'" Closes #2033 See merge request pleroma/pleroma!2868
2020-08-10Merge branch 'remove-unreachable-code' into 'develop'lain
Transmogrifier: Remove duplicate code. See merge request pleroma/pleroma!2871
2020-08-10Merge branch 'develop' into 'develop'lain
docs: add cmake to other installation guides Closes #2039 See merge request pleroma/pleroma!2870
2020-08-10Merge branch '2039-cmake' into 'develop'lain
Docs: Add cmake dependency Closes #2039 See merge request pleroma/pleroma!2869
2020-08-10Transmogrifier: Remove duplicate code.lain
2020-08-10docs: add cmake to other installation guidesAlibek Omarov
2020-08-10Docs: Add cmake dependencylain
2020-08-10Revert "Merge branch 'issue/1023' into 'develop'"lain
This reverts merge request !2763
2020-08-10Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-10Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-10Merge branch 'fix/flaky-migration-episode-666' into 'develop'rinpatch
20200802170532_fix_legacy_tags: Select only fields the migration needs See merge request pleroma/pleroma!2863
2020-08-10Merge branch '2038-old-update-info' into 'develop'rinpatch
AccountController: Build the correct update activity. Closes #2038 See merge request pleroma/pleroma!2867
2020-08-1020200802170532_fix_legacy_tags: chunk the user queryrinpatch
2020-08-1020200802170532_fix_legacy_tags: Select only fields the migration needsrinpatch
Selecting the full struct will break as soon as a new field is added.
2020-08-10AccountController: Build the correct update activity.lain
Will fix federation issues.
2020-08-09Merge branch 'feat/floki-fast-html-2' into 'develop'lain
Update to fast_html 2 and use it for Floki parsing See merge request pleroma/pleroma!2861
2020-08-09Merge branch 'security-policy' into 'develop'lain
Add security policy for Pleroma backend Closes #1848 See merge request pleroma/pleroma!2862
2020-08-09Merge branch 'develop' into 'feat/floki-fast-html-2'lain
# Conflicts: # config/config.exs
2020-08-08Merge branch 'ensure-expiration-mix-task' into 'develop'lain
Add mix task to add expiration to all local statuses Closes #2020 See merge request pleroma/pleroma!2865
2020-08-08Add mix task to add expiration to all local statusesEgor Kislitsyn
2020-08-08Improve static_dir documentationIlja
* It was still written for From Source installs. Now it's both OTP and From Source * I linked to the cheatsheet where it was about configuration * I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it * i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option * I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers * The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.) * Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.
2020-08-07Merge branch 'fix/ldap-auth-issues' into 'develop'lain
Fix LDAP auth issues Closes #1646 See merge request pleroma/pleroma!2852
2020-08-07Merge branch 'develop' into fix/ldap-auth-issuesMark Felder
2020-08-07Make a new function instead of overloading register_changeset/3Mark Felder
2020-08-07Add security policy for Pleroma backendrinpatch
Closes #1848
2020-08-07Merge branch 'feature/update-welcome-setting-in-description' of ↵Angelina Filippova
git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
2020-08-07Add new `image` type to settings whose values are image urlsAngelina Filippova
2020-08-07Force 204 responses to be empty, fixes #2029Alex Gleason
2020-08-07Merge branch 'authenticator-docs' into 'develop'rinpatch
Docs: Remove wrong / confusing auth docs. Closes #2028 See merge request pleroma/pleroma!2860
2020-08-07Docs: Remove wrong / confusing auth docs.lain
2020-08-07CI: install cmake since fast_html now requires itrinpatch
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-03 16:33:36 +0000