aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2021-01-08Apply Upload.base_url for S3Mark Felder
2021-01-08Fix URL generated for backup files, try to create a source of truth we can ↵Mark Felder
reuse throughout the codebase
2021-01-08Merge branch 'guppe-example' into 'develop'lain
ActivtityPub Test: Add example for guppe actor See merge request pleroma/pleroma!3243
2021-01-08Merge branch 'confirm-users' into 'develop'lain
Automatically confirm logged-in users See merge request pleroma/pleroma!3234
2021-01-08Merge remote-tracking branch 'upstream/develop' into confirm-usersAlex Gleason
2021-01-08Remove ConfirmUserPlugAlex Gleason
2021-01-08Merge branch 'fix/missing_emoji_steal_dir' into 'develop'lain
Create dir for EmojiStealPolicy automatically See merge request pleroma/pleroma!3218
2021-01-07Merge branch 'backup-ids' into 'develop'lain
Backups: render ID in API See merge request pleroma/pleroma!3245
2021-01-07Backups: render ID in APIAlex Gleason
2021-01-07Merge branch 'cleanup/unused-proxy-opts' into 'develop'lain
Cleanup Pleroma.Upload proxy opts See merge request pleroma/pleroma!3236
2021-01-07ActivtityPub Test: Add example for guppe actorlain
2021-01-07Merge branch 'object-normalize-refactor' into 'develop'lain
Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229
2021-01-07Merge branch 'adminapi-user-email' into 'develop'lain
AdminAPI: return user email See merge request pleroma/pleroma!3240
2021-01-07Merge branch 'upstream/remote-emoji-support' into 'develop'lain
Upstream external emoji support See merge request pleroma/pleroma!3238
2021-01-07[#3213] Removed PK from hashtags_objects table. Improved hashtags_transfer ↵Ivan Tashkinov
mix task (logging of failed ids).
2021-01-06Call ConfirmUserPlug from Router, not EndpointAlex Gleason
2021-01-06Add AdminAPI.AccountViewTestAlex Gleason
2021-01-06AdminAPI: return user emailAlex Gleason
2021-01-06allow external emojiRoger Braun
2021-01-05Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'feld
Fix proxy and mediaproxy description.exs See merge request pleroma/pleroma!3219
2021-01-05Remove configurability of upload proxy opts, simplifyMark Felder
2021-01-05Merge branch 'fix/emoji-encoding' into 'develop'lain
URI.encode custom emojis Closes #2381 See merge request pleroma/pleroma!3235
2021-01-05Add test to validate URLs to custom emojis are properly encodedMark Felder