aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2019-02-02Check if rich media uri is relativerinpatch
2019-02-02Use with instead of if in the cardrinpatch
2019-02-02merge only if page_url is an absolute pathrinpatch
2019-02-02Fix rich media relative pathrinpatch
2019-02-01Revert "Merge branch 'feature/split-hide-network' into 'develop'"kaniini
2019-02-01Merge branch 'streaming-api-url-fix' into 'develop'href
2019-02-01Use url() instead of static_url in Endpoint.websocket_url()eugenijm
2019-02-01Merge branch 'develop' into 'develop'href
2019-02-01update nodeinfo version when requesting 2.1Luna
2019-02-01Use String.replace_leading instead of String.replace for getting websocket st...eugenijm
2019-02-01mix format passLuna
2019-02-01downcase software name in nodeinfoLuna
2019-02-01keep compatibility with nodeinfo 2.0Luna
2019-02-01MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a listHaelwenn (lanodan) Monnier
2019-02-01Merge branch 'feature/split-hide-network' into 'develop'kaniini
2019-02-01Merge branch 'serve-sw-pleroma.js' into 'develop'lambda
2019-02-01Serve sw-pleroma.js properlyhref
2019-02-01Merge remote-tracking branch 'origin/develop' into fix-rich-media-togglelain
2019-02-01Merge branch '534_federation_targets_reachability' into 'develop'href
2019-02-01mix format passLuna
2019-02-01use nodeinfo 2.1, add repository fieldLuna
2019-01-31Remove default value for rich media.lain
2019-01-31Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda
2019-01-31rich media: parser: only try to validate strings, not numbers (OEmbed)William Pitcock
2019-01-31rich media: parser: reject OGP fields we cannot safely processWilliam Pitcock
2019-01-31Make rich media support toggleablerinpatch
2019-01-31Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn
2019-01-30Fix 4aff4efa typoshref
2019-01-30Use multiple hackney poolshref
2019-01-29Merge branch 'bugfix/fix-rejects' into 'develop'kaniini
2019-01-29Merge branch 'hj-happiness-improvement' into 'develop'kaniini
2019-01-29activitypub: utils: update the state of *any* pending follow relationship tha...William Pitcock
2019-01-29activitypub: transmogrifier: fix follow request rejectionsWilliam Pitcock
2019-01-29[#534] Made federation push sender be determined basing on content instead of...Ivan Tashkinov
2019-01-29Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn
2019-01-28rich media: oembed: return data in the same format as the other parsersWilliam Pitcock
2019-01-28rich media: kill some testsuite noiseWilliam Pitcock
2019-01-28rich media: parser: add some basic sanity checks on the returned data with pa...William Pitcock
2019-01-28rich media: parser: cache negativesWilliam Pitcock
2019-01-28rich media: parser: add copyright headerWilliam Pitcock
2019-01-28Split hide_network into hide_followers & hide_followingsMaxim Filippov
2019-01-28[#534] Merged `upstream/develop`.Ivan Tashkinov
2019-01-28[#534] Various tweaks. Tests for Instances and Instance.Ivan Tashkinov
2019-01-28Return new-style config if old-style config is set to false.lain
2019-01-28Merge branch 'safe-render-activities' into 'develop'Haelwenn
2019-01-28re f83bae7c: remove unnecessary filterhref
2019-01-28Correctly handle invalid credentials on auth login.lain
2019-01-28[#534] Refactoring / tweaks per MR review.Ivan Tashkinov
2019-01-28mastodon api: card: force OGP images through mediaproxyWilliam Pitcock
2019-01-28rich media: helpers: clean up unused aliasesWilliam Pitcock