summaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-01-22Merge branch 'develop' into feature/new-registrations-digestEgor Kislitsyn
2020-01-22Fix credo warningsEgor Kislitsyn
2020-01-22Add new users digest emailEgor Kislitsyn
2020-01-22Merge branch 'emoji-reaction-extensions-2' into 'develop'rinpatch
Emoji Reactions: In the API, sort them by first emoji insertion date See merge request pleroma/pleroma!2126
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-21Merge branch 'develop' into fix/attachments-cleanupRoman Chvanikov
2020-01-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120
2020-01-21exclude blocked user posts from search resultsMaksim Pechnikov
2020-01-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
emoji-reaction-extensions
2020-01-20[#1521] AdminApiControllerTest: fixed create report test (OAuth).Ivan Tashkinov
2020-01-20Merge branch 'favoritng-responses' into 'develop'rinpatch
Mastodon API: Align favoriting / repeating behavior with Mastodon See merge request pleroma/pleroma!2119
2020-01-20StatusView: Add `emoji_reactions`lain
2020-01-20Merge branch 'credo/version-bump-1.1.5' into 'develop'lain
Bump credo to 1.1.5 See merge request pleroma/pleroma!2115
2020-01-20StatusControllerTest: Fix typolain
2020-01-20Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'lain
Pleroma API: `emoji_reactions_by` does not need authorization See merge request pleroma/pleroma!2117
2020-01-20CommonAPI: Don't error out on double favs/repeatslain
2020-01-20Merge branch 'fix-admin-api-scope' into 'develop'lain
fix oauth scopes for AdminApi#reports_update See merge request pleroma/pleroma!2087
2020-01-20Pleroma API: `emoji_reactions_by` does not need authorizationlain
2020-01-20Bump credo to 1.1.5Haelwenn (lanodan) Monnier
2020-01-20Check for unapplied migrations on startuprinpatch
Closes #1328
2020-01-19Add test case for attachment deletion when non-map data.url present in DBRoman Chvanikov
2020-01-19Delete attachments asynchronouslyRoman Chvanikov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks
2020-01-15Fix notification controller testEgor Kislitsyn
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-14compilation warnings fixAlexander Strizhakov
2020-01-12Delete attachments when status is deletedRoman Chvanikov
2020-01-12Merge branch 'updated-at-on-conversation-read' into 'develop'feld
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080
2020-01-12Merge branch 'issue/1354' into 'develop'feld
[#1354] fix remote follow See merge request pleroma/pleroma!2079
2020-01-12Assign token that can write to followsMark Felder
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2020-01-12Merge branch 'issue/1487' into 'develop'feld
[#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090
2020-01-11Remove MDII uploaderHakaba Hitoyo
2020-01-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks # Conflicts: # lib/pleroma/user.ex
2020-01-10Merge branch 'issue/1490' into 'develop'lain
[#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.
2020-01-08fix create service actorMaksim Pechnikov
2020-01-05Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing ↵eugenijm
updated_at and bringing conversation to the top in the user's direct conversation list
2020-01-03fixed Metadata.Utils.scrub_html_and_truncateMaksim Pechnikov
2020-01-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-25added code of mr#2067Maksim Pechnikov
2019-12-24fix oauth scopes for AdminApi#reports_updateMaksim Pechnikov
2019-12-22update testMaksim Pechnikov
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-21Merge branch 'feature/custom-runtime-modules' into 'develop'rinpatch
Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039
2019-12-21Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"Maxim Filippov
This reverts merge request !2076
2019-12-20Posts without media attachments should get the Summary TwitterCardMark Felder
2019-12-20Merge branch 'feature/status-counts-by-scope' into 'develop'feld
Stats: return status counts by scope See merge request pleroma/pleroma!2076
2019-12-19Expose issue via failing testMaxim Filippov
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests