summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-09added another testKaren Konou
2019-02-09Made a test!Karen Konou
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-08help i am not good with gitKaren Konou
2019-02-08Added thread unmuting (still a bit buggy maybe)Karen Konou
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-08Added thread unmuting (still a bit buggy maybe)Karen Konou
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-08Merge branch 'develop' into feature/thread-mutingKaren Konou
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-07resolved merge conflictKaren Konou
2019-02-07Somehow fixed the repo insert [skip-ci]Karen Konou
2019-02-07made a silly oopsieKaren Konou
2019-02-07made a silly oopsieKaren Konou
2019-02-07ugghhhhKaren Konou
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-07Migration and some boilerplate stuffKaren Konou
2019-02-07mark streaming feature for ios apps in readmehakabahitoyo
2019-02-07Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini
Remove Pawoo apps from README.md See merge request pleroma/pleroma!788
2019-02-07Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini
Mark streaming feature for Apps in README.md See merge request pleroma/pleroma!789
2019-02-07Mark streaming feature for Apps in README.mdhakabahitoyo
2019-02-07Update README.mdHakaba Hitoyo
2019-02-06Merge branch 'rename-followings' into 'develop'kaniini
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE See merge request pleroma/pleroma!787
2019-02-06hide_followings was renamed to hide_followers in the FE, but never synced up ↵Mark Felder
in the BE This was a dirty regex replace which worked on my server
2019-02-06Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn
rich media cards: bugfixes and regression tests See merge request pleroma/pleroma!785
2019-02-06tests: add a rich media card that contains all relevant fieldsWilliam Pitcock
2019-02-06Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini
Add admin and moderator badges to user view and make their visibility configurable See merge request pleroma/pleroma!767
2019-02-06test: add some regression tests for the rich media card renderingWilliam Pitcock
2019-02-06mastodon api: rich media: don't clobber %URI struct with a stringWilliam Pitcock
2019-02-06Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'Haelwenn
Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format. See merge request pleroma/pleroma!784
2019-02-06adds a couple of explicit examples for ExSysloggerMichael Loftis
2019-02-06Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch
Fix if clause in activity_pub user_view See merge request pleroma/pleroma!783
2019-02-06Fix if clause in activity_pub user_viewhref
2019-02-06rids the duplicate timestamp from default ExSyslogger configMichael Loftis
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-11 18:39:41 +0000