summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-01use Mix.Project.Config for some Application functionsLuna
2019-02-01Merge branch 'feature/split-hide-network' into 'develop'kaniini
Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma!733
2019-02-01Merge branch 'serve-sw-pleroma.js' into 'develop'lambda
Serve sw-pleroma.js properly See merge request pleroma/pleroma!754
2019-02-01Serve sw-pleroma.js properlyhref
2019-02-01Merge branch 'fix-rich-media-toggle' into 'develop'lambda
Remove default value for rich media. See merge request pleroma/pleroma!751
2019-02-01Merge remote-tracking branch 'origin/develop' into fix-rich-media-togglelain
2019-02-01Merge branch '534_federation_targets_reachability' into 'develop'href
[#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703
2019-02-01mix format passLuna
2019-02-01use nodeinfo 2.1, add repository fieldLuna
that is the only change from nodeinfo 2.0 to 2.1 also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
2019-01-31Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn
docs/Pleroma-API.md: Add missing token field documentation See merge request pleroma/pleroma!752
2019-01-31docs/Pleroma-API.md: Add missing token field documentationHaelwenn (lanodan) Monnier
[ci skip]
2019-01-31Remove default value for rich media.lain
Setting it to true will actually override a 'false' set before.
2019-01-31Merge branch 'user-follow-all-unique' into 'develop'kaniini
User.follow_all: ensure the following array stays unique See merge request pleroma/pleroma!750
2019-01-31User.follow_all: ensure its stays uniquehref
2019-01-31Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda
rich media non-unicode bugfix See merge request pleroma/pleroma!749
2019-01-31test: http mocks: formattingWilliam Pitcock
2019-01-31Merge branch 'develop' into 'develop'kaniini
Clarify the description of the `logo_mask` configuration key. See merge request pleroma/pleroma!747
2019-01-31Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini
Make rich media support toggleable See merge request pleroma/pleroma!748
2019-01-31test: rich media: parser: add malformed data regression testWilliam Pitcock
2019-01-31rich media: parser: only try to validate strings, not numbers (OEmbed)William Pitcock
2019-01-31test: add malformed OGP data fixtureWilliam Pitcock
2019-01-31rich media: parser: reject OGP fields we cannot safely processWilliam Pitcock
2019-01-31Make rich media support toggleablerinpatch
2019-01-31Clarify the description of the `logo_mask` configuration key.Alice
2019-01-31Merge branch 'revert-4d3655c4' into 'develop'lambda
Revert "Merge branch 'spc-fix-3' into 'develop'" See merge request pleroma/pleroma!745
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 10:40:32 +0000