aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-19Merge branch 'user_sign_out_mix_task' into 'develop'rinpatch
User sign out mix task See merge request pleroma/pleroma!1309
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-19pleroma_ctl: Rename arch to flavour because it also includes the libcrinpatch
2019-06-19pleroma_ctl: add an update commandrinpatch
Closes #988 and #1004
2019-06-19Make possible to override the branch name via a env variablerinpatch
This is useful for the CI builds because they have a detached HEAD or for emulating a feature that is availible only on a particular branch (e.g pleroma_ctl downloads CI artifacts only for develop and master)
2019-06-19Merge branch 'logger-level-for-migration-tasks' into 'develop'rinpatch
Logger level for migration tasks Closes #983 See merge request pleroma/pleroma!1295
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-19Merge branch 'update-frontend-c4fcdc71' into 'develop'lain
Update bundled pleroma-fe to c4fcdc71 See merge request pleroma/pleroma!1303
2019-06-19Refactor pleroma_ctl copying to a generic function for copying files into ↵rinpatch
the release dir
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-19Update bundled pleroma-fe to c4fcdc71rinpatch
2019-06-18Merge branch 'deps/update-auto-linker' into 'develop'lain
Deps: Update auto_linker See merge request pleroma/pleroma!1300
2019-06-18Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop'lain
Mastodon API: Sanitize display names Closes #1000 See merge request pleroma/pleroma!1299
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-18Merge branch 'feature/pleroma-ctl-rpc' into 'develop'Haelwenn
pleroma_ctl: Run mix tasks using rpc instead of eval See merge request pleroma/pleroma!1297
2019-06-18pleroma_ctl: Run mix tasks using rpc instead of evalrinpatch
This patch changes pleroma_ctl to call into a running instance instead of spinning up a new one for mix task execution. This significantly decreases the time needed for mix task execution (on my machine for `pleroma_ctl user set rin --no-admin` the difference is 0.2s vs 4.2s) and allows mix tasks to affect the instance context, for example, this allows to clear the cache after user deletion
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-16capturing errorsAlex S
2019-06-16salmon fixAlex S
removed some ownership sandbox error
2019-06-16Merge branch 'issues/570' into 'develop'rinpatch
[#570] add user:notification stream See merge request pleroma/pleroma!1274
2019-06-16[#570] add user:notification streamMaksim
2019-06-16Merge branch 'fix/991-version-generation' into 'develop'rinpatch
version generation Closes #991 See merge request pleroma/pleroma!1291
2019-06-16Fix report content stopping to be nullablerinpatch
2019-06-16Merge branch 'fix-for-new-isntances' into 'develop'lain
fix for new instances See merge request pleroma/pleroma!1294
2019-06-16fix for new instancesAlexander Strizhakov
2019-06-16no print version to the shellAlex S
2019-06-16Credo fixesrinpatch
2019-06-16Sanitize HTML in ReportViewrinpatch
Closes #990
2019-06-16Add tests for report viewrinpatch
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-15Update Phoenix to 1.4.8Mark Felder
2019-06-15Merge branch 'feature/add-chat-token-to-masto-api' into 'develop'rinpatch
Mastodon API: Return the token needed for the chat. See merge request pleroma/pleroma!1292
2019-06-15Apply suggestion to CHANGELOG.mdlain