aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2020-01-25restarting pleroma from outside applicationAlexander Strizhakov
2020-01-25[#1505] Background fetching of incoming activities' `replies` collections.Ivan Tashkinov
2020-01-24added atom feedMaksim Pechnikov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-24Merge branch 'emoji-reaction-sanity-check' into 'develop'rinpatch
Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132
2020-01-24Emoji reactions: Change api format once morelain
2020-01-23Emoji reactions: Add sanity checks for the cachelain
2020-01-23Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-23Merge branch 'emoji-notifications' into 'develop'Haelwenn
Emoji notifications See merge request pleroma/pleroma!2130
2020-01-22Merge branch 'develop' into features/remote-follow-userpage-redirectMark Felder
2020-01-22Notifications: Add emoji reaction notificationslain
2020-01-22[#1505] Added Mastodon-compatible `replies` collection to Note federated ↵Ivan Tashkinov
representation.
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Merge branch 'admin-be' into 'develop'feld
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-22support for updating env after settings deletionAlexander Strizhakov
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21remote_follow_controller.ex: Redirect to the user page on successHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120
2020-01-21Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-21fix for db keyAlexander Strizhakov
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
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-18releases supportAlexander Strizhakov
2020-01-18full update for some subkeysAlexander Strizhakov
2020-01-17return db key on update requestsAlexander Strizhakov
2020-01-17some clean upAlexander Strizhakov
2020-01-17updated error messages for authentication processMaksim Pechnikov
2020-01-17saving to DB only added by user settingsAlexander Strizhakov
2020-01-16renamingAlexander Strizhakov
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-15Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-15Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1478-oauth-admin-scopes-tweaks
2020-01-15Merge branch 'develop' into 'feature/tag_feed'lain
# Conflicts: # CHANGELOG.md
2020-01-15little cleanupAlexander Strizhakov
2020-01-15Fix notification controller testEgor Kislitsyn
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn