summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-12[#114] SMTP deps and config.Ivan Tashkinov
2018-12-12Merge branch 'support/issue_442' into 'develop'kaniini
[#442] fix warnings See merge request pleroma/pleroma!536
2018-12-12fix warningsMaksim Pechnikov
2018-12-10Merge branch 'new-fe-options' into 'develop'scarlett
Add new frontend options to server-side config. See merge request pleroma/pleroma!535
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 10 update frontend See merge request pleroma/pleroma!534
2018-12-10Fix warnings.lain
2018-12-10update frontendlain
2018-12-10Merge branch 'fix_empty_bio_crash' into 'develop'lambda
Fixes #415. Do not crash during registration when hasn't filled bio field Closes #415 See merge request pleroma/pleroma!529
2018-12-10Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'lambda
Mix tasks: improve uploads.ex moduledoc See merge request pleroma/pleroma!528
2018-12-10Merge branch 'fix/config-md-typos' into 'develop'lambda
config.md: Fix typos and add `federating` option description See merge request pleroma/pleroma!525
2018-12-10Merge branch 'support/bugfix_272' into 'develop'lambda
[#272] fix hashtags in api See merge request pleroma/pleroma!510
2018-12-10Merge branch 'fix/theora-detection-read-bytes' into 'develop'lambda
Fix Theora detection in mime.ex See merge request pleroma/pleroma!493
2018-12-10Merge branch 'anonymize-filter-text' into 'develop'lambda
AnonymizeFilename: allow for a pre-defined text instead of random string See merge request pleroma/pleroma!516
2018-12-10Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'lambda
# Conflicts: # lib/mix/tasks/pleroma/uploads.ex
2018-12-10Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'lambda
Parallel588/pleroma support/compile warnings See merge request pleroma/pleroma!532
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
Update angristan/docker-pleroma URL in README See merge request pleroma/pleroma!526
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
Mix Tasks: Add task uploads.ex for migrating local uploads. See merge request pleroma/pleroma!517
2018-12-08Merge branch 'fix/nodeinfo-nil-features' into 'develop'lambda
Nodeinfo: remove null features; relay feature. See merge request pleroma/pleroma!520
2018-12-08Merge branch 'fix/media-proxy-url-encoded' into 'develop'lambda
Media proxy: fix url encoding See merge request pleroma/pleroma!521
2018-12-08Merge branch 'fix/typo-relay-ex' into 'develop'lambda
[#283] Mix Tasks: Fix a typo in relay.ex See merge request pleroma/pleroma!522
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
[#155] Fix Gopher server binding only to default value See merge request pleroma/pleroma!518
2018-12-07Merge branch 'media-proxy-follow-redirect' into 'develop'lambda
Media proxy: follow HTTP redirects by default Closes #421 See merge request pleroma/pleroma!519
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
[#394] User tags Closes #394 See merge request pleroma/pleroma!508
2018-12-07Make gopher respect ipRin Toshaka
2018-12-07Fix a typoRin Toshaka
2018-12-07Merge branch 'emoji-alphabetical-ordering' into 'develop'lambda
Emojis: Alphabetical ordering Closes #366 See merge request pleroma/pleroma!515
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
Improve docs
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
Add mix pleroma.user unsubscribe to mix doc See merge request pleroma/pleroma!512
2018-12-07Merge branch 'fix/typo-in-relay-doc' into 'develop'lambda
Mix Tasks: Fix a typo in relay.ex moduledoc See merge request pleroma/pleroma!513