aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Expand)Author
2020-03-13Merge branch 'static-accept-missing' into 'develop'rinpatch
2020-03-13rate limiter: disable based on if remote ip was found, not on if the plug was...rinpatch
2020-03-13Merge branch 'bugfix/br-vs-newline' into 'develop'rinpatch
2020-03-13Merge branch 'develop' into fix/cache-control-headersMark Felder
2020-03-13LintMark Felder
2020-03-13Synchronize cache-control header for local media with the mediaproxyMark 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 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-13more clean upAlexander Strizhakov
2020-03-12Merge branch 'exclude-posts-visible-to-admin' into 'develop'feld
2020-03-12Merge branch 'develop' into gunAlexander Strizhakov
2020-03-12clean upAlexander Strizhakov
2020-03-12Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
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-11Add support for funkwhale Audio activityHaelwenn (lanodan) Monnier
2020-03-11[#1560] Enforced authentication for non-federating instances in StaticFEContr...Ivan Tashkinov
2020-03-11Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-10add verify tls_opts only when we open connectionAlexander Strizhakov
2020-03-10tesla adapter can't be changed in adminFEAlexander Strizhakov
2020-03-09[#1560] Ensured authentication or enabled federation for federation-related r...Ivan Tashkinov
2020-03-09Merge branch 'develop' into gunAlexander Strizhakov
2020-03-07moderation log: fix improperly migrated datarinpatch
2020-03-07wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-07Merge branch 'develop' into gunAlexander Strizhakov
2020-03-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
2020-03-07start gun upload pool, if proxy_remote is enabledAlexander Strizhakov
2020-03-06little polishingAlexander Strizhakov
2020-03-06little refactorAlexander Strizhakov
2020-03-06Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federatin...Ivan Tashkinov
2020-03-05[#1560] Misc. improvements in ActivityPubController federation state restrict...Ivan Tashkinov
2020-03-05returning, not neededAlexander Strizhakov
2020-03-05removing try block in tesla requestAlexander Strizhakov
2020-03-05Exclude private and direct statuses visible to the admin when using godmodeeugenijm
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
2020-03-05removing try block in getting gun infoAlexander Strizhakov
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
2020-03-04MastodonController: Return 404 errors correctly.lain