aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2019-04-26Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'lambda
Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059
2019-04-26Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093
2019-04-25Move settings to Source subentityrinpatch
2019-04-25fixes for testsAlex S
2019-04-25Merge branch 'develop' into feature/disable-accountEgor Kislitsyn
2019-04-25activitypub: transmogrifier: send reject follow if following does not succeedWilliam Pitcock
2019-04-24Fix leaking private configuration parameters in Mastodon and Twitter APIs, ↵rinpatch
and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24fix the status notification with special charSachin Joshi
2019-04-23Extend Mastodon API with public endpoint for getting Favorites timeline of ↵Sergey Suprunenko
any user (#789)
2019-04-22Add `pleroma.in_reply_to_account_acct` to MastoAPI status entityrinpatch
2019-04-22Use `User.get_cached*` everywhereEgor
2019-04-22Feature/826 healthcheck endpointAlexander Strizhakov
2019-04-22Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-22Merge branch 'rework-emoji-management' into 'develop'kaniini
Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073
2019-04-21Add accounts and last_status to conversation read responseRoman Chvanikov
2019-04-21[#923] Refactored OAuthController#authorize definitions, added test.Ivan Tashkinov
2019-04-21Set correct values in the MastoAPI reblog status vieweugenijm
2019-04-20Fix tests that used finmojiEkaterina Vaartis
2019-04-20Handle `reblogs` on the first follow request in MastoAPIeugenijm
2019-04-19Merge branch 'feature/database-compaction' into 'develop'kaniini
database compaction See merge request pleroma/pleroma!473
2019-04-19typo fixAlexander Strizhakov
docs for RelMe provider
2019-04-19Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'lambda
OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047
2019-04-18Fix my incorrect search test fixrinpatch
2019-04-18Merge branch 'develop' into feature/database-compactionrinpatch
2019-04-18Use the preloaded object in tag queriesrinpatch
2019-04-17activitypub: fix filtering of boosts from blocked usersWilliam Pitcock
2019-04-17activitypub: properly filter out transitive activities concerning blocked usersWilliam Pitcock
2019-04-17Remove containment tests from transmogrifier and fix thread visibility solverrinpatch
2019-04-17Refactor tests that used ActivityPub.fetch_object_from_idrinpatch
2019-04-17Refactor all tests that acessed the embeded objectrinpatch
2019-04-17Fix note count testrinpatch
2019-04-17Make credo happyrinpatch
2019-04-17Update functions in object fetcher for tesla and set up a proper mock for testsrinpatch
2019-04-17Added some more normalization calls all in mastodon api controllerrinpatch
2019-04-17Merge branch 'develop' into feature/database-compactionrinpatch
2019-04-16Merge branch 'feature/788-separate-email-addresses' into 'develop'kaniini
Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040
2019-04-16Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn
activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069
2019-04-16Handle new-style mastodon follow listsNormandy
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16activitypub: allow indirect messages from users being followed at a personal ↵William Pitcock
inbox
2019-04-15Conversation: Add accounts to output.lain
2019-04-15Conversation: Return full status object, id is a string.lain
2019-04-15Merge branch 'fix/status-reblogged' into 'develop'lambda
Assign reblogged in the Mastodon reblog status view Closes #812 See merge request pleroma/pleroma!1057
2019-04-15Merge branch 'unfollow-oneself' into 'develop'lambda
Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061
2019-04-15Use User.get_cached_by*eugenijm
2019-04-15Remove inReplyToStatusIdrinpatch
2019-04-15Handle follow/unfollow directed to themselveseugenijm
2019-04-14Assign reblogged in the Mastodon reblog status vieweugenijm
2019-04-13naming fixAlex S
2019-04-13Merge develop to 788-separate-email-addressesAlex S
Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029