aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2019-06-23Merge branch 'rich_media_titles_two' into 'develop'kaniini
Rich media titles two See merge request pleroma/pleroma!1325
2019-06-23Merge branch 'admin-config' into 'develop'kaniini
Admin config See merge request pleroma/pleroma!1328
2019-06-23support for config groupsAlex S
2019-06-23Merge branch 'develop' into 'remove-avatar-header'Sachin Joshi
# Conflicts: # CHANGELOG.md
2019-06-22support for tuples with more than 2 valuesAlex S
2019-06-22Rich Media Parser: Do not return just a title if nothing else is there.lain
2019-06-22Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""lain
This reverts commit b6af80f769195b5047ee8da07166f022c2e29b0a.
2019-06-22Merge branch 'fix/ecto-tasks-release' into 'develop'rinpatch
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything See merge request pleroma/pleroma!1322
2019-06-22notifications: fix notification generation for non-create activitiesWilliam Pitcock
in 300d94c62, an Object.normalize() call was introduced. calling Object.normalize() on an activity with a non-object URI (say, a user) causes Really Bad Things to happen. so don't do that.
2019-06-22fix for int and modulesAlex S
2019-06-22Load the application before executing the create taskrinpatch
2019-06-21Merge branch 'feature/mrf-anti-link-spam' into 'develop'kaniini
implement anti link spam MRF See merge request pleroma/pleroma!1307
2019-06-21Merge branch 'oauth_secure_redirect' into 'develop'kaniini
OAuth security improvements (`redirect_uri` listing enforcement) See merge request pleroma/pleroma!1302
2019-06-21change the anti-link-spam MRF implementation to use old_user? instead of the ↵William Pitcock
previous name
2019-06-21Revert "Merge branch 'fix/ogp-title' into 'develop'"feld
This reverts merge request !1277
2019-06-20Release Tasks: Ensure the application is loaded before getting therinpatch
modules Needed for non-rpc tasks to work
2019-06-19unbreak pollsWilliam Pitcock
2019-06-19implement anti link spam MRFWilliam Pitcock
2019-06-19aliases for mix tasksAlexander Strizhakov
ecto.migrate ecto.rollback
2019-06-19Merge branch 'begone-the-dot-hack' into 'develop'rinpatch
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits See merge request pleroma/pleroma!1298
2019-06-19Merge branch 'fix/rich-media-hashtags-again' into 'develop'lain
Rich Media: Skip Microformats hashtags See merge request pleroma/pleroma!1304
2019-06-19Rich Media: Skip Microformats hashtagsrinpatch
When fixing this problem I incorrectly assumed a.hashtag is the proper way for detecting hashtags, but it is just something Pleroma and Mastodon add. Per microformats it should be detected by the presense of rel=tag. This MR adds a check for rel=tag, but I still left a.hashtag just in case
2019-06-18Merge branch 'deps/update-auto-linker' into 'develop'lain
Deps: Update auto_linker See merge request pleroma/pleroma!1300
2019-06-18Minor edit (comment).Ivan Tashkinov
2019-06-18Added more `redirect_uri` checks to prevent redirect to not explicitly ↵Ivan Tashkinov
listed URI.
2019-06-18Deps: Update auto_linkerrinpatch
2019-06-18Mastodon API: Sanitize display namesrinpatch
Closes #1000
2019-06-18Add proper error handling for when the post exceeds character limitsrinpatch
2019-06-18Mastodon API: Remove the dot hackrinpatch
2019-06-17Merge branch 'removing-test-errors' into 'develop'rinpatch
Removing test errors See merge request pleroma/pleroma!1296
2019-06-16Merge branch 'fix/sanitize-report-content' into 'develop'Haelwenn
Sanitize HTML in ReportView Closes #990 See merge request pleroma/pleroma!1293
2019-06-16salmon fixAlex S
removed some ownership sandbox error
2019-06-16[#570] add user:notification streamMaksim
2019-06-16Fix report content stopping to be nullablerinpatch
2019-06-16fix for new instancesAlexander Strizhakov
2019-06-16Credo fixesrinpatch
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-14Merge branch 'fix/hashtag-rich-media' into 'develop'lain
Fix hashtags being picked up by rich media parser Closes #989 See merge request pleroma/pleroma!1288
2019-06-14[#948] /api/v1/account_search added optional parameters (limit, offset, ↵Maksim
following)
2019-06-14Fix hashtags being picked up by rich media parserrinpatch
Closes #989
2019-06-14Add copyright info to containment.exEgor
2019-06-14MastodonAPI: Add a way to update the background image.lain
2019-06-14Improve rate limiter documentationEgor Kislitsyn
Documents how to disable rate limiting
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 02:10:14 +0000