summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
# Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex
2019-02-10Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'kaniini
Update Mastodon Frontend to 2019-02-10 bundle See merge request pleroma/pleroma!806
2019-02-10Merge branch 'feather_mention' into 'develop'kaniini
Add Feather to the clients list See merge request pleroma/pleroma!804
2019-02-10Merge branch 'fix/credo-issues' into 'develop'kaniini
Fix credo issues See merge request pleroma/pleroma!786
2019-02-10Merge branch ↵kaniini
'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop' Update service files of OpenRC and systemd to new recommended paths See merge request pleroma/pleroma!798
2019-02-10Update service files of OpenRC and systemd to new recommended pathsshibayashi
2019-02-10Update Mastodon Frontend to 2019-02-10 bundleHaelwenn (lanodan) Monnier
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10 [ci skip]
2019-02-10add feather to webclientssuccfemboi
2019-02-10Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'lambda
Recommend the acme-challenge path that is used in the installation guides See merge request pleroma/pleroma!803
2019-02-10Merge branch 'docs/pleroma-clients' into 'develop'lambda
docs/Clients.md: Add documentation about clients supporting pleroma See merge request pleroma/pleroma!726
2019-02-10docs/Clients.md: Add NekoniumHaelwenn (lanodan) Monnier
[ci skip]
2019-02-10docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabeticallyHaelwenn (lanodan) Monnier
[ci skip]
2019-02-10docs/Clients.md: Add Social (GNOME)Haelwenn (lanodan) Monnier
[ci skip]
2019-02-10docs/Clients.md: Add per-type sectionsHaelwenn (lanodan) Monnier
helps differenciate between Electrons and others like Brutaldon. [ci skip]
2019-02-10docs/Clients.md: Add Brutaldon, Sengi, Halcyon, PinaforeHaelwenn (lanodan) Monnier
2019-02-10WIP: docs/Clients.md: Add documentation about clients supporting pleromaHaelwenn (lanodan) Monnier
[ci skip]
2019-02-10Merge branch 'object-creation' into 'develop'rinpatch
Do object insertion through Cachex See merge request pleroma/pleroma!802
2019-02-09Recommend the acme-challenge path that is used in the installation guidesshibayashi
2019-02-09Merge branch 'follow-enhancements' into 'develop'kaniini
Respect blocks in mass follow. See merge request pleroma/pleroma!797
2019-02-09Do object insertion through Cachexlain
So we don't flood our postgres logs with errors. Should also make things slightly faster.
2019-02-09Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)Haelwenn (lanodan) Monnier
2019-02-09de-group import/sHaelwenn (lanodan) Monnier
2019-02-09de-group alias/esHaelwenn (lanodan) Monnier
2019-02-09HTML.Scrubber.Default: ConsistencyHaelwenn (lanodan) Monnier
2019-02-09StashHaelwenn (lanodan) Monnier
2019-02-09Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify itHaelwenn (lanodan) Monnier
2019-02-09Mix.Tasks.Pleroma.Uploads: Fix typo in documentationHaelwenn (lanodan) Monnier
2019-02-09Web.Federator: Fix unused variableHaelwenn (lanodan) Monnier
2019-02-09Credo fixes: alias grouping/orderingHaelwenn (lanodan) Monnier
2019-02-09Credo fixes: parameter consistencyHaelwenn (lanodan) Monnier
2019-02-09Make credo happyHaelwenn (lanodan) Monnier
2019-02-09Do autofollow first.lain
2019-02-09Respect blocks in mass follow.lain
2019-02-09Merge branch 'add-media-path-to-caddy-cache' into 'develop'lambda
Add /media to Caddy cache See merge request pleroma/pleroma!791
2019-02-09Add /media to Caddy cacheshibayashi
2019-02-09Merge branch 'feature/keyword-policy' into 'develop'lambda
Add keyword policy See merge request pleroma/pleroma!794
2019-02-09oofrinpatch
2019-02-08Add tests and fix a typo in docsrinpatch
2019-02-08Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda
Split hide_network only for local users See merge request pleroma/pleroma!781
2019-02-08fix typo in config.mdrinpatch
2019-02-08wowrinpatch
2019-02-08Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda
Mark streaming feature for iOS apps in readme See merge request pleroma/pleroma!790
2019-02-08Merge branch 'oauth2_strengthening' into 'develop'lambda
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix See merge request pleroma/pleroma!793
2019-02-08What idiot did that? (me)rinpatch
2019-02-08Merge branch 'develop' into feature/keyword-policyrinpatch
2019-02-08rename ftl_removal to federated_timeline_removal to keep consistent naming ↵rinpatch
with SimplePolicy
2019-02-08Add default config for keyword policyrinpatch
2019-02-08Add keyword policyrinpatch
2019-02-07OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security ↵Ivan Tashkinov
breach fix. (`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris, and if that happened before /web/login is accessed for the first time then Pleroma used this externally created record with arbitrary redirect_uris and client_secret known by creator).
2019-02-07mark streaming feature for ios apps in readmehakabahitoyo
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 22:40:45 +0000