summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 23:35:30 +0000