aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-31Revert "Merge branch 'spc-fix-3' into 'develop'"lambda
This reverts merge request !682
2019-01-31Merge branch 'spc-fix-3' into 'develop'kaniini
Spc fix 3 See merge request pleroma/pleroma!682
2019-01-31Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn
Features/glitch soc frontend See merge request pleroma/pleroma!192
2019-01-31Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'Haelwenn
[MastodonFE] Update Frontend (glitch) See merge request pleroma/pleroma!730
2019-01-31[MastodonFE] Update Frontend (glitch)Haelwenn (lanodan) Monnier
2019-01-30Merge branch 'add-wiki-reference-to-readme' into 'develop'kaniini
Add wiki reference to readme See merge request pleroma/pleroma!744
2019-01-30Reformat to make markdownlint happy and other little typographic thingsshibayashi
2019-01-30Add reference to Pleroma Wiki in the Readmeshibayashi
2019-01-30Merge branch 'multiple-hackney-pools' into 'develop'lambda
Fix 4aff4efa typos See merge request pleroma/pleroma!743
2019-01-30Merge branch '2019-1-30-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!742
2019-01-30Fix 4aff4efa typoshref
2019-01-30update frontendlain
2019-01-30Merge branch 'multiple-hackney-pools' into 'develop'kaniini
Use multiple hackney pools See merge request pleroma/pleroma!739
2019-01-30Merge branch 'better-following' into 'develop'kaniini
Use race condition free queries for following / unfollowing See merge request pleroma/pleroma!740
2019-01-30Fix specs.lain
2019-01-30Use race-condition free mass follow.lain
2019-01-30Use race-condition free following method.lain
2019-01-30Use multiple hackney poolshref
* federation (ap, salmon) * media (rich media, media proxy) * upload (uploader proxy) Each "part" will stop fighting others ones -- a huge federation outbound could before make the media proxy fail to checkout a connection in time. splitted media and uploaded media for the good reason than an upload pool will have all connections to the same host (the uploader upstream). it also has a longer default retention period for connections.
2019-01-30Merge branch 'docs/fix-frontend_config' into 'develop'Haelwenn
docs/config.md: Fix syntax, pleroma_fe isn’t an atom See merge request pleroma/pleroma!738
2019-01-30docs/config.md: Fix syntax, pleroma_fe isn’t an atomHaelwenn (lanodan) Monnier
2019-01-30Merge branch 'docs/fix-frontend_config' into 'develop'kaniini
docs/config.md: Fix typo, provide an example key with camelCase and where to find more See merge request pleroma/pleroma!737
2019-01-30docs/config.md: Fix typo, provide an example key with camelCase and where to ↵Haelwenn (lanodan) Monnier
find more [ci skip]
2019-01-29Merge branch 'docs/fix-pleroma-api-title' into 'develop'lambda
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it See merge request pleroma/pleroma!736
2019-01-29docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to itHaelwenn (lanodan) Monnier
[ci skip]
2019-01-29Merge branch 'bugfix/fix-rejects' into 'develop'kaniini
follow request fixups Closes #537 See merge request pleroma/pleroma!734
2019-01-29Merge branch 'hj-happiness-improvement' into 'develop'kaniini
New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700
2019-01-29activitypub: utils: update the state of *any* pending follow relationship ↵William Pitcock
that matches the actor and target
2019-01-29activitypub: transmogrifier: fix follow request rejectionsWilliam Pitcock
2019-01-29[#534] Made federation push sender be determined basing on content instead ↵Ivan Tashkinov
of `referer` header. Updated tests.
2019-01-29Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn
Rich Media support, part 2. See merge request pleroma/pleroma!719
2019-01-28rich media: oembed: return data in the same format as the other parsersWilliam Pitcock
2019-01-28rich media: kill some testsuite noiseWilliam Pitcock
2019-01-28rich media: parser: add some basic sanity checks on the returned data with ↵William Pitcock
pattern matching
2019-01-28rich media: parser: cache negativesWilliam Pitcock
2019-01-28rich media: parser: add copyright headerWilliam Pitcock
2019-01-28FormatMaxim Filippov
2019-01-28Split hide_network into hide_followers & hide_followingsMaxim Filippov
2019-01-28Merge branch 'app-list-changes' into 'develop'kaniini
App list changes: Separate into two categories, and drop Subway Tooter. See merge request pleroma/pleroma!731
2019-01-28App list changes: Separate into two categories, and drop Subway Tooter.scarlett
2019-01-28Put deprecation warnings undre Pleroma.Config.lain
2019-01-28[#534] Merged `upstream/develop`.Ivan Tashkinov
2019-01-28[#534] Various tweaks. Tests for Instances and Instance.Ivan Tashkinov
2019-01-28Return new-style config if old-style config is set to false.lain
This is in preparation for 1.0. We'll be able to switch the config to the new mechanism on PleromaFE then as well.
2019-01-28Update config.mdlain
2019-01-28Don't run warnings in a task.lain
2019-01-28Change default bg image in new config.lain
2019-01-28Merge branch 'safe-render-activities' into 'develop'Haelwenn
remove unnecessary filter (re !723) See merge request pleroma/pleroma!729
2019-01-28re f83bae7c: remove unnecessary filterhref
2019-01-28Add deprecation warning mechanism.lain
2019-01-28Merge branch 'oauth-login-failure-bug' into 'develop'href
Correctly handle invalid credentials on auth login. Closes #407 See merge request pleroma/pleroma!728
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 07:45:21 +0000