aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-28Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9lain
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/remote-follow-userpage-redirect
2020-01-28Merge branch 'linkify-test-expansion' into 'develop'lain
Formatter: Add a test for domain / username clashes See merge request pleroma/pleroma!2151
2020-01-28Merge branch 'features/task-test-email' into 'develop'lain
Create pleroma.email mix task Closes #1061 See merge request pleroma/pleroma!2118
2020-01-28Merge branch 'fix/1524-link_preview' into 'develop'lain
Meta tags parser respects first title tag Closes #1524 See merge request pleroma/pleroma!2157
2020-01-28meta tag parser respect first title headerAlexander Strizhakov
2020-01-28Merge branch 'feature/tag_feed' into 'develop'lain
[#1452] Atom feeds for hashtags See merge request pleroma/pleroma!2040
2020-01-28Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/tag_feed
2020-01-28Merge branch 'whole-db-removal' into 'develop'Haelwenn
Remove `whole_db` parameter everywhere, it's not used anymore See merge request pleroma/pleroma!2152
2020-01-28Create pleroma.email mix taskHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28Update streamer_test.exslain
2020-01-28Streamer: Correctly handle reblog muteslain
2020-01-28Warn if HTTPSecurityPlug is disabledEgor Kislitsyn
2020-01-28filename and test fixesAlexander Strizhakov
2020-01-28Merge branch 'fix/attachments-cleanup' into 'develop'feld
Fix attachments cleanup with custom base_url See merge request pleroma/pleroma!2154
2020-01-28Merge branch 'fix-elixir-v1.10' into 'develop'lain
Fix compatibility with Elixir v1.10 See merge request pleroma/pleroma!2153
2020-01-28Fix compatibility with Elixir v1.10Egor Kislitsyn
2020-01-28Add test for custom base_url when deleting an attachmentRoman Chvanikov
2020-01-28Fix base_url string trimmingRoman Chvanikov
2020-01-28Add loggingRoman Chvanikov
2020-01-28Remove `whole_db` parameter everywhere, it's not used anymorelain
2020-01-28Apply suggestion to lib/pleroma/web/feed/tag_controller.exlain
2020-01-28Fix __MODULE__ usageRoman Chvanikov
2020-01-28path fixAlexander Strizhakov
2020-01-28Apply suggestion to mix.lockAlexander Strizhakov
2020-01-28Apply suggestion to mix.exsAlexander Strizhakov
2020-01-28Merge branch 'translation/errors-french' into 'develop'lain
Translation/errors french See merge request pleroma/pleroma!1457
2020-01-28Merge branch 'docs_introduction' into 'develop'lain
DOCS General update for the "Introduction to Pleroma" section See merge request pleroma/pleroma!2101
2020-01-28DOCS General update for the "Introduction to Pleroma" sectionIlja
* Put url's between angle brackets. docs-develop doesn't list the url's as links, I assume these will fix that (but don't know if I can check) * Added a third space before the "sub"bulletpoints. docs-develop doesn't show them as subpoints with only two spaces. I hope three will fix it (but don't know if I can check) * Added a newline above the bulletpoints because otherwise they are broken on docs-develop * Remove the :smile: thingies because neither of the docs (docs.pleroma.social and docs-develop.social) show them as emojis * Add a link to fediverse.network * Update to add new stuff and fix things that aren't correct (any more)
2020-01-28Merge branch 'support/update_ecto' into 'develop'lain
updated ecto and fixed warning See merge request pleroma/pleroma!2150
2020-01-28like thisAlexander Strizhakov
2020-01-28Merge branch 'fix/attachments-cleanup' into 'develop'lain
Fix/attachments cleanup See merge request pleroma/pleroma!2148
2020-01-28Formatter: Add a test for domain / username clasheslain
2020-01-28moving restarter application into pleroma repoAlexander Strizhakov
2020-01-28update ectoMaksim Pechnikov
2020-01-28Remove unused varRoman Chvanikov
2020-01-28explicitly describe perform op in AttachmentsClenupWorkerRoman Chvanikov
2020-01-27fix testMaksim Pechnikov
2020-01-27Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-27docs updateAlexander Strizhakov
2020-01-27Merge branch 'remove/suggestions-third-party-engine' into 'develop'Haelwenn
Remove user recommendation by third party engine See merge request pleroma/pleroma!2141
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27Merge branch 'descriptions-fixes' into 'develop'Haelwenn
Little fixes for descriptions.exs See merge request pleroma/pleroma!2147
2020-01-27little fixesAlexander Strizhakov
2020-01-27Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-27Fix typoRoman Chvanikov
2020-01-26Merge branch 'fix/runtime-config' into 'develop'feld
Fixes for runtime config See merge request pleroma/pleroma!2143
2020-01-26Merge branch 'issue/1280' into 'develop'feld
[#1280] updated error messages for authentication process Closes #1280 See merge request pleroma/pleroma!2111
2020-01-26Merge branch 'develop' into issue/1280Mark Felder
2020-01-26Merge branch 'fix/descriptions' into 'develop'feld
Fixes for descriptions.exs Closes admin-fe#68 See merge request pleroma/pleroma!2145
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:13:02 +0000