aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-13Synchronize cache-control header for local media with the mediaproxyMark Felder
2020-03-13Remove test verifying we preserve cache-control headers; we don'tMark Felder
2020-03-13Fix test to use new cache-control settingsMark Felder
2020-03-13Set correct Cache-Control header for local mediaMark Felder
2020-03-13Update comment to reflect what the code is actually doingMark Felder
2020-03-13Do not strip Cache-Control headers from media. Trust the Pleroma backend.Mark Felder
2020-03-13Do not trust remote Cache-Control headers for mediaproxyMark Felder
2020-03-13Merge branch 'revert/cache-control' into 'develop'rinpatch
2020-03-13Fix hashtags WebSocket streamingEgor Kislitsyn
2020-03-13Formatting: Do not use \n and prefer <br> insteadHaelwenn (lanodan) Monnier
2020-03-12Merge branch 'exclude-posts-visible-to-admin' into 'develop'feld
2020-03-12Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
2020-03-11Merge branch 'docs/new_user' into 'develop'rinpatch
2020-03-11Merge branch 'fix/signup-without-email' into 'develop'feld
2020-03-11Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch
2020-03-11Merge branch 'relay-list-change' into 'develop'feld
2020-03-11Revert "Set better Cache-Control header for static content"rinpatch
2020-03-11using Pleroma.Config instead of etsAlexander Strizhakov
2020-03-11compile fixAlexander Strizhakov
2020-03-11merging release default config on app startAlexander Strizhakov
2020-03-11[#1560] Enforced authentication for non-federating instances in StaticFEContr...Ivan Tashkinov
2020-03-11Merge branch 'docs/debian-install' into 'develop'rinpatch
2020-03-11CLI_tasks: Use manpage formatting conventionsHaelwenn (lanodan) Monnier
2020-03-11CLI_tasks/user.md: Fix `pleroma.user new` documentationHaelwenn (lanodan) Monnier
2020-03-11Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'Haelwenn
2020-03-11Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
2020-03-11static-fe.css: Restore from before a65ee8eaHaelwenn (lanodan) Monnier
2020-03-10Merge branch 'fix/post-length-validation' into 'develop'lain
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-10installation/otp_en.md: Fix pleroma.nginx target [deb]Haelwenn (lanodan) Monnier
2020-03-09[#1560] Ensured authentication or enabled federation for federation-related r...Ivan Tashkinov
2020-03-09Merge branch 'patch-1' into 'develop'lain
2020-03-08Merge branch 'chore/mix-version-bump' into 'develop'rinpatch
2020-03-08mix.exs: bump version to development onerinpatch
2020-03-08Merge branch 'stable' into 'develop'rinpatch
2020-03-08Merge branch 'release/2.0.0' into 'stable'v2.0.0rinpatch
2020-03-07pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6afrinpatch
2020-03-07Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'rinpatch
2020-03-07moderation log: fix improperly migrated datarinpatch
2020-03-07wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
2020-03-06Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'rinpatch
2020-03-06Merge branch 'revert-67cc4dce' into 'develop'feld
2020-03-06Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"feld
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
2020-03-06Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain
2020-03-06Remove emoji support from AdminFEMark Felder
2020-03-06Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch