aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2019-06-16Sanitize HTML in ReportViewrinpatch
Closes #990
2019-06-15Merge branch 'bugfix/980-polls-double-vote' into 'develop'lain
MastodonAPI Controller: Band-Aid double vote problem. See merge request pleroma/pleroma!1275
2019-06-15Merge branch 'update/phoenix-and-plug' into 'develop'lain
Update Phoenix See merge request pleroma/pleroma!1290
2019-06-15Merge branch '963_oob_oauth_redirect_fix' into 'develop'kaniini
[#963] No redirect on OOB OAuth authorize request with existing authorization See merge request pleroma/pleroma!1276
2019-06-15OEmbed.OEmbedController does not exist in the Pleroma codebase. It was ↵Mark Felder
removed in commit 92c5640f and this leftover artifact breaks compiling now.
2019-06-15Mastodon API: Return the token needed for the chat.lain
2019-06-14Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'rinpatch
AccountView: Add user background. See merge request pleroma/pleroma!1280
2019-06-14it is changed in compile timeAlexander Strizhakov
we can't change module attributes and endpoint settings in runtime
2019-06-14[#948] /api/v1/account_search added optional parameters (limit, offset, ↵Maksim
following)
2019-06-14MastodonAPI: Add a way to update the background image.lain
2019-06-13AccountView: Add user background.lain
2019-06-13Improve <title> fallback; Add a testEgor Kislitsyn
2019-06-12Revert "Only run Floki if title is missing from the map"Mark Felder
This reverts commit 97d2b1a45ab12c530dd730518b9d8ca546bbc9f2.
2019-06-12Only run Floki if title is missing from the mapMark Felder
2019-06-12Attempt to use <title> from HTML as a fallbackMark Felder
2019-06-12[#963] No redirect on OOB OAuth authorize request with existing ↵Ivan Tashkinov
authorization. OAuth-related refactoring.
2019-06-12MastodonAPI Controller: Band-Aid double vote problem.lain
2019-06-12Update `auto_linker` dependencyEgor Kislitsyn
2019-06-11Merge branch 'feature/rate-limiter' into 'develop'lain
Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266
2019-06-11Replace `MastodonAPIController.account_register/2` rate limiterEgor Kislitsyn
2019-06-11Add rate limiting for search endpointsEgor Kislitsyn
2019-06-07Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetchedrinpatch
2019-06-06Replace Mix.env with Pleroma.Config.get(:env)rinpatch
Mix.env/0 is not availible in release environments such as distillery or elixir's built-in releases.
2019-06-05Merge branch 'bugfix/377-stuck-follow-request' into 'develop'kaniini
Bugfix/377 stuck follow request Closes #377 See merge request pleroma/pleroma!1250
2019-06-05Merge branch 'improve-search' into 'develop'kaniini
[#943] Contain search for unauthenticated users See merge request pleroma/pleroma!1220
2019-06-05Utils: Use update_follow_state_for_all when appropriate.lain
2019-06-05Utils: Split update_follow_state and update_follow_state_for_all.lain
2019-06-05User: Remove superfluous `maybe_follow`.lain
2019-06-05Transmogrifier: Add tests for incoming follows to locked accounts.lain
2019-06-05OAuth consumer: tests fix, comments, Keycloak config notes.Ivan Tashkinov
2019-06-05Contain search for unauthenticated usersEgor Kislitsyn
2019-06-05Merge branch 'explicit-addressing' into 'develop'kaniini
Explicit addressing See merge request pleroma/pleroma!1239
2019-06-04NodeInfo: Add explicit addressing to nodeinfo.lain
2019-06-04update ActivityPub#fetch_activities_queryMaksim Pechnikov
2019-06-04Merge branch 'develop' into issue/941Maksim Pechnikov
2019-06-04update ActivityPub#fetch_activities_queryMaksim Pechnikov
2019-06-04Fix CommonAPI.vote returning tuples inside of the activity array instead of ↵rinpatch
just activities
2019-06-04Restrict `get_existing_votes` to only get Create activitiesrinpatch
2019-06-04Merge remote-tracking branch 'origin/develop' into explicit-addressinglain
2019-06-04utils: access inReplyTo as an explicit string when fetching poll results`William Pitcock
2019-06-04Merge branch 'develop' into issue/941Maksim Pechnikov
2019-06-04nodeinfo: add pollLimits to metadataWilliam Pitcock
2019-06-04Merge branch 'feature/mrf-subchain' into 'develop'kaniini
MRF: subchain policy See merge request pleroma/pleroma!1233
2019-06-04Merge branch 'generic-fe-settings' into 'develop'kaniini
Generic settings store for frontend user settings See merge request pleroma/pleroma!1221
2019-06-03update api to set skip_thread_containmentMaksim Pechnikov
2019-06-03Remove repeated scope listseugenijm
2019-06-03CommonAPI: Add explicit addressing.lain
2019-06-03Use workaround for the heavy checkmark symbol in iOSeugenijm
2019-06-03Merge branch 'develop' into update-oauth-templateMark Felder
2019-06-03add option skip_thread_containmentMaksim Pechnikov