aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-15Remove User.restrict_deactivated/1Mark Felder
Everything else is in User.Query, no need for this odd kludge.
2021-01-15Change user.deactivated field to user.is_activeMark Felder
2021-01-15Further simplify changeset logicMark Felder
2021-01-15Change user.approval_pending field to user.is_approvedMark Felder
2021-01-15Merge branch 'optimize-command_available' into 'develop'Haelwenn
Optimize Pleroma.Utils.command_available?/1 See merge request pleroma/pleroma!3254
2021-01-14Hack to fix tests not passing. Unclear why the filters are being set to nil.Mark Felder
Both of these changes are needed or it doesn't work.
2021-01-14Just validate command is in PATH; forking a shell is wastefulMark Felder
2021-01-14LintMark Felder
2021-01-14Bump Copyright yearMark Felder
2021-01-14Add ConfigDB migrationMark Felder
2021-01-14[#3213] Refactoring of HashtagsTableMigrator.Ivan Tashkinov
2021-01-14BackupTest: Fix s3 test.Lain Soykaf
2021-01-14Merge branch 'pleroma-password' into 'develop'rinpatch
Add password module See merge request pleroma/pleroma!3253
2021-01-14Linting.Lain Soykaf
2021-01-14Pbkdf2: Use it everywhere.Lain Soykaf
2021-01-14Password -> Password.Pbkdf2Lain Soykaf
2021-01-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
feature/object-hashtags-rework
2021-01-13[#3213] Prototype of data migrations functionality / HashtagsTableMigrator.Ivan Tashkinov
2021-01-13Unnecessary duplication hereMark Felder
2021-01-13Consistent styleMark Felder
2021-01-13Not needed in test.exsMark Felder
2021-01-13truncated_namespace should default to nilMark Felder
2021-01-13LintingLain Soykaf
2021-01-13Password: Replace Pbkdf2 with Password.lain
2021-01-13Password: Add password modulelain
Replaces Pbkdf2.
2021-01-13Merge branch 'chores/bump-copyright' into 'develop'Haelwenn
Bump Copyright to 2021 See merge request pleroma/pleroma!3252
2021-01-13COPYING: Bump copyright to 2021Haelwenn (lanodan) Monnier
2021-01-13Bump Copyright to 2021Haelwenn (lanodan) Monnier
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
2021-01-12Switch another test to Upload.base_url/0Mark Felder
2021-01-12Document deprecationMark Felder
2021-01-12Fix tests relying on old behavior. Use the Upload.base_url, Luke.Mark Felder
2021-01-12Provide a non-nil fallback for Upload.base_url/0 for tests using ↵Mark Felder
TestUploaderSuccess as the uploader
2021-01-12Fix another ad-hoc construction of the upload base_urlMark Felder
2021-01-12Deprecate Pleroma.Uploaders.S3, :public_endpointMark Felder
2021-01-12Merge branch 'fix/backup-url-on-s3' into 'develop'feld
Standardize base url for uploads See merge request pleroma/pleroma!3246
2021-01-12Merge branch 'chat-message-pagination' into 'develop'rinpatch
ChatMessages: Fix pagination headers. See merge request pleroma/pleroma!3250
2021-01-12Pagination: Don't be dos'd by random parameters.lain
2021-01-11Simplify. We will always have a result from Upload.base_url/0, so just add ↵Mark Felder
it to the list
2021-01-11Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to ↵Mark Felder
whitelisted domains
2021-01-11ChatMessages: Fix pagination headers.lain
They used to contain the path parameter `id` as query param, which would break the link.
2021-01-10FormattingMark Felder
2021-01-10[#3213] transfer_hashtags mix task refactoring.Ivan Tashkinov
2021-01-10Merge branch 'feat/format-optional-migrations' into 'develop'rinpatch
.formatter.exs: Format optional migrations See merge request pleroma/pleroma!3249
2021-01-10.formatter.exs: Format optional migrationsrinpatch
(There are no changes to optional migrations since they were manually formatted in https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3207)
2021-01-10Merge branch ↵rinpatch
'add_some_information_about_setting_up_a_development_environment' into 'develop' Add some information about setting up a development environment Closes #1904 See merge request pleroma/pleroma!3207
2021-01-10Add development sectionIlja
* I cretaed a folder 'development' * I split up the file dev.md into three parts and moved it to this folder * index.md * authentication_authorization.md * mrf.md * I also moved ap_extensions.md * I created a new file setting_up_pleroma_dev.md
2021-01-10Apply 4 suggestion(s) to 2 file(s)feld
2021-01-08Move construction of S3 base URL with optional namespace and bucket to ↵Mark Felder
Upload.base_url/0 Now we should have a correct base URL for S3 hosted objects throughout the codebase.
2021-01-08More places we should be using Upload.base_urlMark Felder
2021-01-08Avoid duplicate Config callsMark Felder