aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-02-03[#582] Optimized federation retirement by reducing the number of SQL callsIvan Tashkinov
2019-02-02Merge branch 'fix/oauth-page-responsiveness' into 'develop'rinpatch
2019-02-02Add responsive features to layoutMaxim Filippov
2019-02-01Merge branch 'revert-0a82a7e6' into 'develop'kaniini
2019-02-01Revert "Merge branch 'feature/split-hide-network' into 'develop'"kaniini
2019-02-01Merge branch 'hotfix/object-normalize-cache' into 'develop'href
2019-02-01Merge branch 'streaming-api-url-fix' into 'develop'href
2019-02-01object: use cached accesses when possible in Object.normalize()William Pitcock
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-01add tests for nodeinfo 2.0 compat and 2.1's new fieldLuna
2019-02-01Merge branch 'bugfix/get_list_return_404' into 'develop'Haelwenn
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-01use Mix.Project.Config for some Application functionsLuna
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 branch 'fix-rich-media-toggle' into 'develop'lambda
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-31Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn
2019-01-31docs/Pleroma-API.md: Add missing token field documentationHaelwenn (lanodan) Monnier
2019-01-31Remove default value for rich media.lain
2019-01-31Merge branch 'user-follow-all-unique' into 'develop'kaniini
2019-01-31User.follow_all: ensure its stays uniquehref
2019-01-31Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda
2019-01-31test: http mocks: formattingWilliam Pitcock
2019-01-31Merge branch 'develop' into 'develop'kaniini
2019-01-31Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini
2019-01-31test: rich media: parser: add malformed data regression testWilliam Pitcock
2019-01-31rich media: parser: only try to validate strings, not numbers (OEmbed)William Pitcock
2019-01-31test: add malformed OGP data fixtureWilliam Pitcock
2019-01-31rich media: parser: reject OGP fields we cannot safely processWilliam Pitcock
2019-01-31Make rich media support toggleablerinpatch
2019-01-31Clarify the description of the `logo_mask` configuration key.Alice
2019-01-31Merge branch 'revert-4d3655c4' into 'develop'lambda
2019-01-31Revert "Merge branch 'spc-fix-3' into 'develop'"lambda
2019-01-31Merge branch 'spc-fix-3' into 'develop'kaniini
2019-01-31Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn
2019-01-31Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'Haelwenn
2019-01-31[MastodonFE] Update Frontend (glitch)Haelwenn (lanodan) Monnier
2019-01-30Merge branch 'add-wiki-reference-to-readme' into 'develop'kaniini
2019-01-30Reformat to make markdownlint happy and other little typographic thingsshibayashi