aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-20Fixed mix version computed for underscore-containing branches to be of SemVer...Ivan Tashkinov
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
2019-06-18Added more `redirect_uri` checks to prevent redirect to not explicitly listed...Ivan Tashkinov
2019-06-18Deps: Update auto_linkerrinpatch
2019-06-18Mastodon API: Sanitize display namesrinpatch
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
2019-06-18pleroma_ctl: Run mix tasks using rpc instead of evalrinpatch
2019-06-17Merge branch 'removing-test-errors' into 'develop'rinpatch
2019-06-16Merge branch 'fix/sanitize-report-content' into 'develop'Haelwenn
2019-06-16capturing errorsAlex S
2019-06-16salmon fixAlex S
2019-06-16Merge branch 'issues/570' into 'develop'rinpatch
2019-06-16[#570] add user:notification streamMaksim
2019-06-16Merge branch 'fix/991-version-generation' into 'develop'rinpatch
2019-06-16Fix report content stopping to be nullablerinpatch
2019-06-16Merge branch 'fix-for-new-isntances' into 'develop'lain