aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-06-22support for tuples with more than 2 valuesAlex S
2019-06-22fix for int and modulesAlex S
2019-06-21Merge branch 'chore/update-bbcode' into 'develop'kaniini
2019-06-21Merge branch 'fix/fallback-config' into 'develop'rinpatch
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
2019-06-21Merge branch 'feature/mrf-anti-link-spam' into 'develop'kaniini
2019-06-21Merge branch 'fix/use-config-when-possible' into 'develop'rinpatch
2019-06-21Merge branch 'oauth_secure_redirect' into 'develop'kaniini
2019-06-21Merge branch 'revert-6f5a0cc1' into 'develop'kaniini
2019-06-21change the anti-link-spam MRF implementation to use old_user? instead of the ...William Pitcock
2019-06-21Merge branch 'fix-rate-limit-test' into 'develop'kaniini
2019-06-21use Config in generated config when availablerinpatch
2019-06-21Merge branch 'move-sample-configs' into 'develop'rinpatch
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
2019-06-21Fix rate limiter testsEgor Kislitsyn
2019-06-20Merge branch 'fix/config-gen-releases' into 'develop'rinpatch
2019-06-20Merge branch 'fix/dynamic-configuration' into 'develop'lain
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
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
2019-06-20Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functionsrinpatch
2019-06-19Merge branch 'user_sign_out_mix_task' into 'develop'rinpatch
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
2019-06-19Make possible to override the branch name via a env variablerinpatch
2019-06-19Merge branch 'logger-level-for-migration-tasks' into 'develop'rinpatch
2019-06-19aliases for mix tasksAlexander Strizhakov
2019-06-19Merge branch 'begone-the-dot-hack' into 'develop'rinpatch
2019-06-19Merge branch 'fix/rich-media-hashtags-again' into 'develop'lain
2019-06-19Merge branch 'update-frontend-c4fcdc71' into 'develop'lain
2019-06-19Refactor pleroma_ctl copying to a generic function for copying files into the...rinpatch
2019-06-19Rich Media: Skip Microformats hashtagsrinpatch
2019-06-19Update bundled pleroma-fe to c4fcdc71rinpatch
2019-06-18Merge branch 'deps/update-auto-linker' into 'develop'lain
2019-06-18Merge branch 'fix/mastoapi-sanitize-display-name' into 'develop'lain
2019-06-18Minor edit (comment).Ivan Tashkinov