summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-21Merge branch 'chore/update-bbcode' into 'develop'kaniini
mix: update bbcode dependency to v0.1.1 See merge request pleroma/pleroma!1321
2019-06-21Merge branch 'fix/fallback-config' into 'develop'rinpatch
Fallback to Config if Mix.Config does not exist, even if Config does not exist either See merge request pleroma/pleroma!1320
2019-06-21mix: update bbcode dependency to v0.1.1William Pitcock
2019-06-22Fallback to Config if Mix.Config does not exist, even if Config does notrinpatch
exist either For some weird reason Code.ensure_loaded?(Config) is false on OTP releases even though `use Config` from config files works just fine.
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 'fix/use-config-when-possible' into 'develop'rinpatch
use Config in generated config when available See merge request pleroma/pleroma!1319
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-21Merge branch 'fix-rate-limit-test' into 'develop'kaniini
Fix rate limiter tests See merge request pleroma/pleroma!1316
2019-06-21use Config in generated config when availablerinpatch
Mix.Config is deprecated and does not work on OTP releases. However we can't fully switch to Config because it is not present in Elixir < 1.9. I tried to evaluate if Config is available at runtime, but for some weird reason OTP releases crash if I do that.
2019-06-21Merge branch 'move-sample-configs' into 'develop'rinpatch
Move config templates to priv so they can be found in releases See merge request pleroma/pleroma!1318
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-21Fix rate limiter testsEgor Kislitsyn
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-20Merge branch 'fix/dynamic-configuration' into 'develop'lain
Fixes for dynamic configuration See merge request pleroma/pleroma!1313
2019-06-20Fixes for dynamic configurationAlexander Strizhakov
2019-06-20Disable rpc for instance genrinpatch
2019-06-20Merge branch 'develop' into fix/config-gen-releasesrinpatch
2019-06-20Merge branch 'feature/release-update-script' into 'develop'rinpatch
pleroma_ctl: add an update command Closes #1004 and #988 See merge request pleroma/pleroma!1305
2019-06-20Apply suggestion to rel/files/bin/pleroma_ctlrinpatch
2019-06-20Export PLEROMA_BUILD_BRANCHrinpatch
2019-06-20docs: better description for mrf anti link spamWilliam Pitcock
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 07:34:15 +0000