aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
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
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-03Merge branch 'align-mastodon-conversations' into 'develop'lambda
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-03Change query order in fetch_activities_for_context_query to make poll vote ex...rinpatch
2019-06-02Remove a TODO comment as the tests for poll view were writtenrinpatch
2019-06-02Make error message about author's inability to vote more sensiblerinpatch
2019-06-02Refresh the object in CommonAPI.vote instead of MastoAPI controllerrinpatch
2019-06-02formattingWilliam Pitcock
2019-06-02mrf: add subchain policyWilliam Pitcock
2019-06-02mrf: allow a policy chain to be specified when filteringWilliam Pitcock
2019-06-02Merge branch 'feature/notification-control-part-2' into 'develop'kaniini
2019-06-01Mastodon API: Refresh the object before rendering it after votingrinpatch
2019-06-01Mastodon API: actually check for poll votesrinpatch
2019-06-01Resolve merge conflictsrinpatch
2019-06-01Add poll votesrinpatch
2019-06-01Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'kaniini
2019-06-01Remove all follower collections but actor's from "cc"Sergey Suprunenko
2019-06-01visibility: if litepub:directMessage is asserted, always report the object as...William Pitcock
2019-06-01Remove now useless flavours switchingHaelwenn (lanodan) Monnier
2019-06-01mastodon_api_controller.ex: Remove vanilla from supported_flavoursHaelwenn (lanodan) Monnier
2019-05-31Merge branch 'hotfix/leaking-lists' into 'develop'lambda
2019-05-31MastodonAPI: Add extension to set and get pleroma_settings_store.lain
2019-05-31AccountView: settings -> settings_storelain
2019-05-31User: Add settings store to Info, AccountViewlain
2019-05-31Mastodon API: Fix lists leaking private postsrinpatch
2019-05-31Fix fix_explicit_addressing moving follower collection to cc and add tests fo...rinpatch
2019-05-31Mastodon Conversation API: Don't return own account in 'accounts'.lain
2019-05-30Replace missing non-nullable Card attributes with empty stringsSergey Suprunenko
2019-05-30Merge branch 'use-pleroma-config' into 'develop'lambda
2019-05-30Use Pleroma.Config everywhereEgor Kislitsyn
2019-05-29Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"kaniini
2019-05-29Default search limit should be 40Mark Felder
2019-05-29router: require oauth_read for searchingWilliam Pitcock
2019-05-26Merge branch 'refactor/die-httpoison-die' into 'develop'lambda
2019-05-26mrf: simple policy: fix matching imported activitypub and ostatus statusesWilliam Pitcock
2019-05-25twitter api: user view: expose user notification settings under pleroma objectWilliam Pitcock
2019-05-25remove @websub and @ostatus module-level constantsWilliam Pitcock
2019-05-25kill @httpoisonWilliam Pitcock
2019-05-25Keep nodeinfo available when not federatingAaron Tinio
2019-05-24Move the Cache Control header test to its own filefeld
2019-05-23Change the order of preloading when fetching activities for contextrinpatch
2019-05-22Fix credo issuesrinpatch
2019-05-22mrf: simple policy: add the ability to strip avatars and banners from user pr...William Pitcock
2019-05-22activitypub: run user objects through MRF filtersWilliam Pitcock
2019-05-22mrf: defang policy modules for filtering user profile objectsWilliam Pitcock
2019-05-22Exclude Answers from fetching by defaultrinpatch
2019-05-22Normalize poll votes to Answer objectsrinpatch