aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)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
This reverts merge request !733
2019-02-01Merge branch 'streaming-api-url-fix' into 'develop'href
Fix WebSocket streaming API URL. See merge request pleroma/pleroma!756
2019-02-01Use url() instead of static_url in Endpoint.websocket_url()eugenijm
2019-02-01Merge branch 'develop' into 'develop'href
Use nodeinfo 2.1 See merge request pleroma/pleroma!753
2019-02-01update nodeinfo version when requesting 2.1Luna
2019-02-01Use String.replace_leading instead of String.replace for getting websocket ↵eugenijm
streaming api url. Extract the login responsible for obtaining websocket URL into the corresponding Endpoint function.
2019-02-01mix format passLuna
2019-02-01downcase software name in nodeinfoLuna
2019-02-01keep compatibility with nodeinfo 2.0Luna
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler gives the same result, while the 2.1 handler inserts the software.repository field. requested by @href
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
Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma!733
2019-02-01Merge branch 'serve-sw-pleroma.js' into 'develop'lambda
Serve sw-pleroma.js properly See merge request pleroma/pleroma!754
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
[#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703
2019-02-01mix format passLuna
2019-02-01use nodeinfo 2.1, add repository fieldLuna
that is the only change from nodeinfo 2.0 to 2.1 also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
2019-01-31Remove default value for rich media.lain
Setting it to true will actually override a 'false' set before.
2019-01-31Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda
rich media non-unicode bugfix See merge request pleroma/pleroma!749
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
Features/glitch soc frontend See merge request pleroma/pleroma!192
2019-01-30Fix 4aff4efa typoshref
2019-01-30Use multiple hackney poolshref
* federation (ap, salmon) * media (rich media, media proxy) * upload (uploader proxy) Each "part" will stop fighting others ones -- a huge federation outbound could before make the media proxy fail to checkout a connection in time. splitted media and uploaded media for the good reason than an upload pool will have all connections to the same host (the uploader upstream). it also has a longer default retention period for connections.
2019-01-29Merge branch 'bugfix/fix-rejects' into 'develop'kaniini
follow request fixups Closes #537 See merge request pleroma/pleroma!734
2019-01-29Merge branch 'hj-happiness-improvement' into 'develop'kaniini
New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700
2019-01-29activitypub: utils: update the state of *any* pending follow relationship ↵William Pitcock
that matches the actor and target
2019-01-29activitypub: transmogrifier: fix follow request rejectionsWilliam Pitcock
2019-01-29[#534] Made federation push sender be determined basing on content instead ↵Ivan Tashkinov
of `referer` header. Updated tests.
2019-01-29Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn
Rich Media support, part 2. See merge request pleroma/pleroma!719
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 ↵William Pitcock
pattern matching
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
This is in preparation for 1.0. We'll be able to switch the config to the new mechanism on PleromaFE then as well.
2019-01-28Merge branch 'safe-render-activities' into 'develop'Haelwenn
remove unnecessary filter (re !723) See merge request pleroma/pleroma!729
2019-01-28re f83bae7c: remove unnecessary filterhref
2019-01-28Correctly handle invalid credentials on auth login.lain
Closes #407
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