aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2019-02-05Fix SQLMaxim Filippov
2019-02-05ARGLE GARBLEwitches.live
Update .gitignore
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
Also makes the index a lot smoler.
2019-02-04Initialize hide_network with falseMaxim Filippov
2019-02-04Merge branch 'feature/mrf-tag' into 'develop'Haelwenn
MRF TagPolicy engine See merge request pleroma/pleroma!768
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-04Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'rinpatch
fix hellthread threshold deprecation warning See merge request pleroma/pleroma!770
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
Mime: detect RIFF formats (wave, webp, avi) See merge request pleroma/pleroma!769
2019-02-04Mime: detect RIFF formats (wave, webp, avi)href
2019-02-04Merge branch 'fix/rich-media-relative-path' into 'develop'rinpatch
Fix rich media relative path Closes #588 See merge request pleroma/pleroma!759
2019-02-04Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch
Improve hellthread filter Closes #584 See merge request pleroma/pleroma!766
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
Update Mogrify docs and warning for deprecated syntax See merge request pleroma/pleroma!763
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
Resolve "Update object cache on favs/boosts" Closes #589 See merge request pleroma/pleroma!764
2019-02-03Unbreak all the tests.lain
2019-02-03Still do caching in tests.lain
2019-02-03Update Mogrify docs and warning for deprecated syntax to encourageMark Felder
users to enable both strip and auto-orient
2019-02-03Merge branch '582_federation_retirement_optimization' into 'develop'kaniini
[#582] Optimized federation retirement by reducing the number of SQL calls Closes #582 See merge request pleroma/pleroma!762
2019-02-03[#582] Made single-pub task call Instance.set_reachable/1 if `set_reachable` ↵Ivan Tashkinov
is not specified. Added tests.
2019-02-03[#582] Optimized federation retirement by reducing the number of SQL callsIvan Tashkinov
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`, calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
2019-02-02Merge branch 'fix/oauth-page-responsiveness' into 'develop'rinpatch
Add responsive features to layout Closes #564 See merge request pleroma/pleroma!760
2019-02-02Add responsive features to layoutMaxim Filippov