aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-13AP Controller test: Add test for issue #22982298-weird-follow-issuelain
2020-11-13Merge branch 'fix/oban-in-database-config' into 'develop'rinpatch
remove PurgeExpiredActivity from Oban db config See merge request pleroma/pleroma!3137
2020-11-13remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-11-12Merge branch 'majic-dep' into 'develop'feld
Install file-dev in Dockerfile build stage See merge request pleroma/pleroma!3135
2020-11-12Install file-dev in Dockerfile build stageMichael Walker
This is required by the majic, added in #2534.
2020-11-12Fix object spoofing vulnerability in attachmentsrinpatch
Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948
2020-11-12Merge branch 'title-injection-change' into 'develop'Haelwenn
Title injection change See merge request pleroma/pleroma!3132
2020-11-11Merge branch 'feature/ingest-blurhash' into 'develop'feld
Ingest blurhash for attachments if they were federated Closes #2294 See merge request pleroma/pleroma!3133
2020-11-11Fix tests for other attachment typesMark Felder
2020-11-11Ingest blurhash field during transmogrificationMark Felder
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-11Ingest blurhash for attachments if they were federatedMark Felder
2020-11-11Changelog: Add info about title injectionlain
2020-11-11Bundled FE: Remove title taglain
2020-11-11Merge branch 'mrf-config-descriptions' into 'develop'feld
little changes for MRF config descriptions See merge request pleroma/pleroma!3131
2020-11-11RedirectController: Don't replace title, but inject into the metalain
2020-11-11little changes for MRF config descriptionsAlexander Strizhakov
- log level reduction, if policy doesn't implement config_description method - docs in dev.md
2020-11-11Merge branch 'feature/2222-config-descriptions-for-custom-modules' into ↵feld
'develop' Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128
2020-11-11making credo happy and test fixAlexander Strizhakov
2020-11-11fix for adminFEAlexander Strizhakov
- revert UserAllowPolicy description - MRF descriptions order
2020-11-10config descriptions for custom MRF policiesAlexander Strizhakov
2020-11-10Merge branch '2260-wrong-report-link' into 'develop'lain
Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121
2020-11-10Merge branch 'fix/html-title-load' into 'develop'lain
Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125
2020-11-10Merge branch 'fix/2291-atom-feed-escape' into 'develop'lain
Escaping in xml templates Closes #2291 See merge request pleroma/pleroma!3126
2020-11-10escaping summary and other fields in xml templatesAlexander Strizhakov
2020-11-09Merge branch 'remove/release-env' into 'develop'Haelwenn
Remove release_env See merge request pleroma/pleroma!3124
2020-11-08Fix title on load of Pleroma HTMLSean King
2020-11-08Remove release_envrinpatch
While taking a final look at instance.gen before releasing I noticed that the release_env task outputs messages in broken english. Upon further inspection it seems to have even more severe issues which, in my opinion, warrant it's at least temporary removal: - We do not explain what it actually does, anywhere. Neither the task docs nor instance.gen, nor installation instructions. - It does not respect FHS on OTP releases (uses /opt/pleroma/config even though we store the config in /etc/pleroma/config.exs). - It doesn't work on OTP releases, which is the main reason it exists. Neither systemd nor openrc service files for OTP include it. - It is not mentioned in install guides other than the ones for Debian and OTP releases.
2020-11-05Merge branch 'feature/expire-mutes' into 'develop'lain
Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971
2020-11-05Docs: Add info about expiring mutes.lain
2020-11-04Merge branch 'stats-genserver-fix' into 'develop'lain
don't run Stats GenServer updates in tests See merge request pleroma/pleroma!2976
2020-11-04Changelog: Add info about admin email user link changes.lain
2020-11-04AdminEmail: Use AP id as user url.lain
2020-11-04Merge branch 'default-mrf' into 'develop'lain
Add TagPolicy as default MRF See merge request pleroma/pleroma!2834
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
stats-genserver-fix
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'ejabberd-pleroma-auth' into 'develop'lain
Add ejabberd auth document See merge request pleroma/pleroma!3074
2020-11-04Merge branch 'features/federation-status' into 'develop'lain
Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
View a remote server's timeline See merge request pleroma/pleroma!2713
2020-11-04Merge branch '2284-voters-count' into 'develop'Haelwenn
Always return voters_count in polls See merge request pleroma/pleroma!3120
2020-11-04Changelog: Add info about federation status endpointlain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/federation-status
2020-11-04TopicsTest: Small addition.lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-restrict-domain
2020-11-04Merge branch 'hide-muted-chats' into 'develop'lain
Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116
2020-11-04Add `with_muted` param to ChatController.index/2Egor Kislitsyn
2020-11-04Poll Schema: Update and fix.lain
2020-11-04Changelog: Add info about poll view changeslain
2020-11-04Poll View: Always return `voters_count`.lain
2020-11-03Merge branch 'chores/pleroma-favicon-logo' into 'develop'lain
favicon: Use images/pleroma_logo_vector_bg_32.png from pleroma.social Closes #2270 See merge request pleroma/pleroma!3115
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-21 14:00:45 +0000