aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2019-05-12tests: fix salmon testsWilliam Pitcock
2019-05-12tests: chase federator publish_single_foo removalsWilliam Pitcock
2019-05-11Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' ↵kaniini
into 'develop' Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129
2019-05-11make url uniform in admin apiSachin Joshi
2019-05-09Use "repeated" instead of "retweeted" for repeated statuses in Twitter APIFrancis Dinh
This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09Fix get_in_reply_to in OStatus' activity representer depending on embedded ↵rinpatch
objects
2019-05-08Visibility: Make it more resilient.lain
2019-05-08Merge developAlexander Strizhakov
Merge conflict in lib/pleroma/activity.ex
2019-05-07- Actually use preloaded bookmarks in viewsrinpatch
- Preload bookmarks in bookmark timeline - Rework bookmark preload tests
2019-05-07Merge branch 'conversations_three' into 'develop'lambda
Conversations once more. See merge request pleroma/pleroma!1119
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-06fix formatMaksim
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-03MastoAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03formatter.ex: Add get_emoji_map/1Haelwenn (lanodan) Monnier
2019-05-03Pleroma.Formatter: width/height to class=emojiHaelwenn (lanodan) Monnier
2019-05-03Streamer: Stream out Conversations/Participations.lain
2019-05-01Fix testsRoman Chvanikov
2019-05-01Merge remote-tracking branch 'origin/develop' into conversations_threelain
2019-05-01Refactored Pleroma.Web.Auth.AuthenticatorMaksim
2019-05-01Merge branch 'bugfix/web-notification-special-char' into 'develop'lambda
fix the web push notification with special char for status created See merge request pleroma/pleroma!1092
2019-05-01test fixesAlex S
2019-05-01Merge branch 'develop' into bugfix/web-notification-special-charSachin Joshi
2019-04-29WebPush: Use Object.normalize, rewrite tests so they test reality.lain
2019-04-29Merge branch 'fix/add-default-scope-mastoapi' into 'develop'rinpatch
Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100
2019-04-28Merge branch 'regression/rights-only-for-admin' into 'develop'kaniini
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102
2019-04-28Fix `rights` in TwitterAPI's user entity being present only forrinpatch
Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.
2019-04-27Add default_scope to /api/v1/update_credentialsrinpatch
2019-04-27Fix bookmarks depending on embeded object and move checking if therinpatch
status is bookmarked to SQL
2019-04-27Merge branch 'feature/bbcode' into 'develop'kaniini
BBCode support (backend) See merge request pleroma/pleroma!1097
2019-04-26tests: fix up for changed bbcode library output and verify html is properly ↵William Pitcock
escaped
2019-04-26add support for bbcodeWilliam Pitcock
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