summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-12-12Allow to set both admin and moderator at the same time in mix task Userlink0ff
2018-12-12Fix toggle_activated in mix task Userlink0ff
2018-12-12Merge branch 'support/issue_442' into 'develop'kaniini
2018-12-12fix warningsMaksim Pechnikov
2018-12-10Merge branch 'new-fe-options' into 'develop'scarlett
2018-12-10Document the new frontend options.scarlett
2018-12-10Add new frontend options to server-side config.scarlett
2018-12-10Merge branch '2018-12-10-update-frontend' into 'develop'lambda
2018-12-10Fix warnings.lain
2018-12-10update frontendlain
2018-12-10Merge branch 'fix_empty_bio_crash' into 'develop'lambda
2018-12-10Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'lambda
2018-12-10Merge branch 'fix/config-md-typos' into 'develop'lambda
2018-12-10Merge branch 'support/bugfix_272' into 'develop'lambda
2018-12-10Merge branch 'fix/theora-detection-read-bytes' into 'develop'lambda
2018-12-10Merge branch 'anonymize-filter-text' into 'develop'lambda
2018-12-10Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'lambda
2018-12-10Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'lambda
2018-12-10Format.lain
2018-12-10Treat warnings as errors outside of tests.lain
2018-12-10updatesMaksim Pechnikov
2018-12-10Keep the shortdoc descriptiverinpatch
2018-12-10Fixes #415. Properly handle nil and empty string by User.parse_bioraeno
2018-12-09Mix tasks: improve uploads.ex moduledocRin Toshaka
2018-12-09fix compile warningsMaksim Pechnikov
2018-12-09Merge branch 'angristan-docker' into 'develop'Haelwenn
2018-12-09Update angristan/docker-pleroma linkStanislas
2018-12-09config.md: Fix typos and add option descriptionRin Toshaka
2018-12-09formattingMaksim Pechnikov
2018-12-09fix hashtags in api responseMaksim Pechnikov
2018-12-08Remove french.href
2018-12-08Merge branch 'fix/add-upload.ex' into 'develop'lambda
2018-12-08Merge branch 'fix/nodeinfo-nil-features' into 'develop'lambda
2018-12-08Merge branch 'fix/media-proxy-url-encoded' into 'develop'lambda
2018-12-08Merge branch 'fix/typo-relay-ex' into 'develop'lambda
2018-12-08[#283] Mix Tasks: Fix a typo in relay.exRin Toshaka
2018-12-07Media proxy: fix url encodinghref
2018-12-07Merge branch 'fix/gopher-respect-ip' into 'develop'lambda
2018-12-07Merge branch 'media-proxy-follow-redirect' into 'develop'lambda
2018-12-07Nodeinfo: remove null features; relay feature.href
2018-12-07Media proxy: follow HTTP redirects by defaulthref
2018-12-07Merge branch '394_user_tags' into 'develop'lambda
2018-12-07Make gopher respect ipRin Toshaka
2018-12-07Fix a typoRin Toshaka
2018-12-07Merge branch 'emoji-alphabetical-ordering' into 'develop'lambda
2018-12-07Mix Tasks: Add task uploads.ex for migrating local uploads.Rin Toshaka
2018-12-07AnonymizeFilename: allow for a pre-defined text instead of random stringhref
2018-12-07Emojis: Alphabetical orderinghref
2018-12-07[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)Ivan Tashkinov
2018-12-07Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'lambda