aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-06-22Merge branch 'develop' into release-docsrinpatch
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-21Merge branch 'revert-6f5a0cc1' into 'develop'kaniini
Revert "Merge branch 'fix/ogp-title' into 'develop'" See merge request pleroma/pleroma!1317
2019-06-21change the anti-link-spam MRF implementation to use old_user? instead of the ↵William Pitcock
previous name
2019-06-21Move config templates to priv so they can be found in releasesrinpatch
2019-06-21Revert "Merge branch 'fix/ogp-title' into 'develop'"feld
This reverts merge request !1277
2019-06-21Default DB configuration to false and set the default database name torinpatch
`pleroma` instead of `pleroma_dev`
2019-06-20Merge branch 'fix/config-gen-releases' into 'develop'rinpatch
Refactor mix tasks a bit and make config generator work with releases See merge request pleroma/pleroma!1312
2019-06-20Fixes for dynamic configurationAlexander Strizhakov
2019-06-20Allow setting upload/static directories in the config generatorrinpatch
2019-06-20Remove deprecated dedupe_media from the config templaterinpatch
2019-06-20Remove a useless binding from config template callrinpatch
2019-06-20Release Tasks: Ensure the application is loaded before getting therinpatch
modules Needed for non-rpc tasks to work
2019-06-20Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functionsrinpatch
instead of aliasing This seems to be the convention for functions that can be reused between different mix tasks in all Elixir projects I've seen and it gets rid on an error message when someone runs mix pleroma.common Also in this commit by accident: - Move benchmark task under a proper namespace - Insert a space after the prompt
2019-06-19Apply suggestion to lib/mix/tasks/pleroma/user.exIvan Tashkinov
2019-06-19User sign out mix task.Ivan Tashkinov
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 12:18:20 +0000