summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-02-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
2019-02-05Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch
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
2019-02-05Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini
2019-02-05Merge branch 'testfix/twitter-api' into 'develop'kaniini
2019-02-05test: twitterapi: fix another possible test failure caseWilliam Pitcock
2019-02-05Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini
2019-02-05Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini
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
2019-02-05Merge branch 'patch-2' into 'develop'lambda
2019-02-05Merge branch 'bugfix/rich-media-nil' into 'develop'lambda
2019-02-05Fix SQLMaxim Filippov
2019-02-05ARGLE GARBLEwitches.live
2019-02-05html: don't attempt to parse nil contentWilliam Pitcock
2019-02-05activitypub: transmogrifier: fix bare tagsWilliam Pitcock
2019-02-04activitypub: c2s: add /api/ap/whoami endpoint for andstatusWilliam Pitcock
2019-02-04Massage index until it actually does the stuff we want.lain
2019-02-04Initialize hide_network with falseMaxim Filippov
2019-02-04Merge branch 'feature/mrf-tag' into 'develop'Haelwenn
2019-02-04activitypub: mrf: tag policy: fix force-unlisted and sandbox actionsWilliam Pitcock
2019-02-04activitypub: mrf: tag policy: add support for subscription controlWilliam Pitcock
2019-02-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
2019-02-04Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'rinpatch
2019-02-04fix hellthread threshold deprecation warningKaren Konou
2019-02-04activitypub: mrf: tag policy: refactor the filtering hook a bitWilliam Pitcock
2019-02-04activitypub: mrf: tag policy: add support for processing follow requestsWilliam Pitcock
2019-02-04activitypub: mrf: tag policy: implement force-unlisted and sandboxWilliam Pitcock
2019-02-04mrf: add initial MRF.TagPolicy engineWilliam Pitcock
2019-02-04mix: add user tag/untag taskWilliam Pitcock
2019-02-04Merge branch 'mime-riff' into 'develop'kaniini
2019-02-04Mime: detect RIFF formats (wave, webp, avi)href
2019-02-04Merge branch 'fix/rich-media-relative-path' into 'develop'rinpatch
2019-02-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
2019-02-04Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch
2019-02-04removed a debug thingyKaren Konou
2019-02-04squished a bugKaren Konou
2019-02-04actually commited the changesKaren Konou
2019-02-04fixed Map,put arguments, updated nomenclatureKaren Konou
2019-02-03more tweaks, fixed silly mistakes...Karen Konou
2019-02-03implemented tweaksKaren Konou
2019-02-03Merge branch 'mogrify-orient' into 'develop'kaniini
2019-02-03fixed thingsKaren Konou
2019-02-03made toggleable, added docsKaren Konou
2019-02-03added optional delist featureKaren Konou
2019-02-03Split hide_network into hide_followers & hide_followings (fixed)Maxim Filippov
2019-02-03Merge branch '589-fix-cache' into 'develop'lambda
2019-02-03Unbreak all the tests.lain
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 14:08:13 +0000