summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-07Merge branch 'unused-config-parameter' into 'develop'rinpatch
unused config paramater See merge request pleroma/pleroma!1124
2019-05-07unused config paramaterAlex S
2019-05-07Merge branch 'fix/ex_doc-source-links' into 'develop'rinpatch
Fix/ex_doc source links See merge request pleroma/pleroma!1123
2019-05-07Fix/ex_doc source linksxse
2019-05-06Merge branch 'issue_800' into 'develop'lambda
[#800] added ability renew access_token by refresh_token See merge request pleroma/pleroma!1045
2019-05-06fix formatMaksim
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
BBS / SSH See merge request pleroma/pleroma!997
2019-05-06Merge branch 'feature/845-improve-status-deletion' into 'develop'lambda
Improve status deletion Closes #845 See merge request pleroma/pleroma!1104
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
2019-05-06Remove H1 in @moduledocHaelwenn (lanodan) Monnier
2019-05-06mrf/tag_policy.ex: Add some documentationHaelwenn (lanodan) Monnier
mrf_tag:disable-remote-subscription exact way of working is quite unclear to me. Is it the requester that is denied if they have a tag, or is it the requestee if they have one?
2019-05-06Add short documentation on every MRF PolicyHaelwenn (lanodan) Monnier
2019-05-04BBS: Credo fixes.lain
2019-05-04BBS: Fix tests.lain
2019-05-04BBS: Use cached user fetcher.lain
2019-05-04BBS: small fixes.lain
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-03Merge branch 'fix/embeded-relationship-in-follows' into 'develop'rinpatch
Fix embeded relationships in Mastodon API See merge request pleroma/pleroma!1118
2019-05-03Merge branch 'fix-search-speed' into 'develop'rinpatch
Search: Add fts index on objects table. See merge request pleroma/pleroma!1120
2019-05-03Just have Benchee in all environments.lain
2019-05-03Mix: Also have benchee in test.lain
2019-05-03Merge branch 'bugfix/emoji-size' into 'develop'lambda
Bugfix: emoji size in profile Closes #269 See merge request pleroma/pleroma!792
2019-05-03Search: Add fts index on objects table.lain
2019-05-03MastoAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03TwitterAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03Web.TwitterAPI.UserView: Also view local user emojisHaelwenn (lanodan) Monnier
2019-05-03formatter.ex: Add get_emoji_map/1Haelwenn (lanodan) Monnier
2019-05-03Pleroma.User: remove emojify on parse_bioHaelwenn (lanodan) Monnier
2019-05-03Pleroma.Formatter: width/height to class=emojiHaelwenn (lanodan) Monnier
2019-05-03Credo fixes.lain
2019-05-03Merge branch 'fix/replace-ws' into 'develop'lambda
Standardize construction of websocket URL See merge request pleroma/pleroma!1115
2019-05-03Standardize construction of websocket URLfeld
This follows up on the change made in d747bd98
2019-05-03MastodonApi: Bump api level.lain
2019-05-03Streamer: Stream out Conversations/Participations.lain
2019-05-03Fix embeded relationships in Mastodon APIrinpatch
Currently some endpoints render accounts without for user resulting in embedded relationship being empty. It causes bugs in followers/following tab in pleroma-fe but I fixed it for other endpoints as well just in case
2019-05-02Merge branch 'iss-849' into 'develop'lambda
Parse access_token from body parameters and URL parameters See merge request pleroma/pleroma!1103
2019-05-02Add oauth plug tests for url and body parametersAkiraFukushima
2019-05-02fix: Add mix deps.get before unit-testingAkiraFukushima
2019-05-02Parse access_token from body parameters and URL parametersAkiraFukushima
2019-05-01Merge branch 'develop' into update-oauth-templateMark Felder
2019-05-01Remove incorrect statement about valid charactersMark Felder
2019-05-01Fix testsRoman Chvanikov
2019-05-01Merge remote-tracking branch 'origin/develop' into conversations_threelain
2019-05-01Merge branch 'support/oauth' into 'develop'lambda
Refactored Pleroma.Web.Auth.Authenticator See merge request pleroma/pleroma!1108
2019-05-01Refactored Pleroma.Web.Auth.AuthenticatorMaksim
2019-05-01Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'rinpatch
Remove redundant ensure_scrubbed_html See merge request pleroma/pleroma!1114
2019-05-01Remove redundant ensure_scrubbed_htmlrinpatch
It is never used as handling for fake and non-fake activities was merged into one function above it
2019-05-01Merge branch 'features/download-mastofe-build' into 'develop'lambda
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download See merge request pleroma/pleroma!1052
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-01Merge branch 'harmonize_return_types_in_user_module' into 'develop'lambda
Harmonize return types in user module Closes #718 See merge request pleroma/pleroma!1112