aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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-01Merge branch 'revert-0a82a7e6' into 'develop'kaniini
Revert "Merge branch 'feature/split-hide-network' into 'develop'" See merge request pleroma/pleroma!758
2019-02-01Revert "Merge branch 'feature/split-hide-network' into 'develop'"kaniini
This reverts merge request !733
2019-02-01Merge branch 'hotfix/object-normalize-cache' into 'develop'href
object: use cached accesses when possible in Object.normalize() See merge request pleroma/pleroma!757
2019-02-01Merge branch 'streaming-api-url-fix' into 'develop'href
Fix WebSocket streaming API URL. See merge request pleroma/pleroma!756
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
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-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
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list See merge request pleroma/pleroma!755
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-01use Mix.Project.Config for some Application functionsLuna
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 branch 'fix-rich-media-toggle' into 'develop'lambda
Remove default value for rich media. See merge request pleroma/pleroma!751
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-31Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn
docs/Pleroma-API.md: Add missing token field documentation See merge request pleroma/pleroma!752
2019-01-31docs/Pleroma-API.md: Add missing token field documentationHaelwenn (lanodan) Monnier
[ci skip]
2019-01-31Remove default value for rich media.lain
Setting it to true will actually override a 'false' set before.
2019-01-31Merge branch 'user-follow-all-unique' into 'develop'kaniini
User.follow_all: ensure the following array stays unique See merge request pleroma/pleroma!750
2019-01-31User.follow_all: ensure its stays uniquehref
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-31test: http mocks: formattingWilliam Pitcock
2019-01-31Merge branch 'develop' into 'develop'kaniini
Clarify the description of the `logo_mask` configuration key. See merge request pleroma/pleroma!747
2019-01-31Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini
Make rich media support toggleable See merge request pleroma/pleroma!748
2019-01-31test: rich media: parser: add malformed data regression testWilliam Pitcock