summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-02-06Split hide_networ only for local usersMaxim Filippov
2019-02-06Merge branch '2019-02-06-update-frontend' into 'develop'lambda
update frontend See merge request pleroma/pleroma!780
2019-02-06update frontendlain
2019-02-06fix testsEgor Kislitsyn
2019-02-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
2019-02-06Allow to configure visibility for admin and moderator badgeseugenijm
2019-02-06Add is_admin and is_moderator boolean fields to the user vieweugenijm
2019-02-05Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch
rich media: parser: reject any data which cannot be explicitly encoded into JSON Closes #596 See merge request pleroma/pleroma!779
2019-02-05rich media: parser: reject any data which cannot be explicitly encoded into JSONWilliam Pitcock
2019-02-05Merge branch 'fix-dm-index' into 'develop'kaniini
Massage index until it actually does the stuff we want. See merge request pleroma/pleroma!772
2019-02-05Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini
activitypub: c2s: add /api/ap/whoami endpoint for andstatus See merge request pleroma/pleroma!773
2019-02-05Merge branch 'testfix/twitter-api' into 'develop'kaniini
test: twitterapi: fix another possible test failure case See merge request pleroma/pleroma!778
2019-02-05test: twitterapi: fix another possible test failure caseWilliam Pitcock
2019-02-05Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini
Split hide_network into hide_followers & hide_followings (fixed) See merge request pleroma/pleroma!765
2019-02-05Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini
mastodon api: fix rendering of cards without image URLs (closes #597) Closes #597 See merge request pleroma/pleroma!777
2019-02-05test: twitterapi: fix the test breakage for realWilliam Pitcock
2019-02-05mastodon api: fix rendering of cards without image URLs (closes #597)William Pitcock
2019-02-05Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'lambda
activitypub: transmogrifier: fix bare tags See merge request pleroma/pleroma!774
2019-02-05Merge branch 'patch-2' into 'develop'lambda
ARGLE GARBLE See merge request pleroma/pleroma!776
2019-02-05Merge branch 'bugfix/rich-media-nil' into 'develop'lambda
html: don't attempt to parse nil content See merge request pleroma/pleroma!775
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 02:39:57 +0000