aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2019-02-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
# Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/federator/federator.ex
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-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-01Revert "Merge branch 'feature/split-hide-network' into 'develop'"kaniini
This reverts merge request !733
2019-02-01Merge branch 'develop' into 'develop'href
Use nodeinfo 2.1 See merge request pleroma/pleroma!753
2019-02-01add tests for nodeinfo 2.0 compat and 2.1's new fieldLuna
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 '534_federation_targets_reachability' into 'develop'href
[#534] Unreachable federation targets retirement Closes #534 See merge request pleroma/pleroma!703
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-31User.follow_all: ensure its stays uniquehref
2019-01-31test: http mocks: formattingWilliam Pitcock
2019-01-31test: rich media: parser: add malformed data regression testWilliam Pitcock
2019-01-31test: add malformed OGP data fixtureWilliam Pitcock
2019-01-31Revert "Merge branch 'spc-fix-3' into 'develop'"lambda
This reverts merge request !682
2019-01-31Merge branch 'spc-fix-3' into 'develop'kaniini
Spc fix 3 See merge request pleroma/pleroma!682
2019-01-31Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn
Features/glitch soc frontend See merge request pleroma/pleroma!192
2019-01-31Merge remote-tracking branch 'MAIN/develop' into feature/jobsEgor Kislitsyn
2019-01-30Fix specs.lain
2019-01-30Use race-condition free mass follow.lain
2019-01-29Merge branch 'hj-happiness-improvement' into 'develop'kaniini
New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700
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-28FormatMaxim Filippov
2019-01-28Split hide_network into hide_followers & hide_followingsMaxim Filippov
2019-01-28add a job queueEgor Kislitsyn
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-28Correctly handle invalid credentials on auth login.lain
Closes #407
2019-01-28test: add status posting with OGP link preview testWilliam Pitcock
2019-01-28API: kill /api/rich_media/parse endpointWilliam Pitcock
2019-01-28test: update twitterapi testsWilliam Pitcock
2019-01-28test: update mastodon status view testsWilliam Pitcock
2019-01-28mastodon api: factor out status card fetching, move status card rendering to ↵William Pitcock
statusview, add opengraph extended data
2019-01-28[MastoAPI][GlitchAPI] Add bookmarksHaelwenn (lanodan) Monnier
2019-01-27Fix objects.lain
2019-01-27Merge branch 'features/mastoapi-multi-hashtag' into 'develop'kaniini
MastodonAPI multi-hashtag See merge request pleroma/pleroma!652
2019-01-27Web.MastodonAPI.AccountView: Add is_moderator and is_adminHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
2019-01-26Merge branch 'flake-from-int' into 'develop'kaniini
Flake: support integers in from_string/1 See merge request pleroma/pleroma!715
2019-01-26Flake: support integers in from_string/1href
Some previously issued stateless tokens have integer ids in them.
2019-01-26mastodon api: use OGP uri instead of page_url for deducing domain name, fix testWilliam Pitcock
2019-01-26Web.MastodonAPI.MastodonAPIController: Add Rich-Media supportHaelwenn (lanodan) Monnier
2019-01-26Move definitions of RichMedia fixtures to test/support/http_request_mock.exHaelwenn (lanodan) Monnier
2019-01-26Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all ↵Haelwenn (lanodan) Monnier
and any parameters
2019-01-26Fix the logic in multi-hashtag TLsHaelwenn (lanodan) Monnier