summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-08Make uploadlimit an object that stores upload limits for avatars, banners, ↵Rin Toshaka
backgrounds, general content
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-07Add uploadlimit to Twitter API configRin Toshaka
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
2018-12-07Fix a typo in relay.ex moduledocrinpatch
2018-12-07[#394] Refactoring (using Ecto.Multi; "untag" route change).Ivan Tashkinov
2018-12-07Oopsrinpatch
2018-12-07Add mix pleroma.user unsubscribe to mix docrinpatch
2018-12-07Merge branch 'fix/add-common.ex' into 'develop'eal
add common.ex See merge request pleroma/pleroma!511
2018-12-07Rename def to defvalrinpatch
2018-12-07add common.exRin Toshaka
2018-12-06Merge branch 'refactor/mix-tasks' into 'develop'kaniini
Rebased !243 See merge request pleroma/pleroma!509
2018-12-06[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.Ivan Tashkinov
2018-12-06Update README.mdRin Toshaka
2018-12-06[#394] View tests fix.Ivan Tashkinov
2018-12-06Remove unused vars from user.exRin Toshaka
2018-12-06[#394] Refactoring.Ivan Tashkinov
2018-12-06Update instance.ex for web pushRin Toshaka
2018-12-06[#394] Formatting fix.Ivan Tashkinov
2018-12-06Merge developRin Toshaka
2018-12-06[#394] Added `users.tags` and admin routes to tag and untag users. Added tests.Ivan Tashkinov
2018-12-06Refactor common functions to common.exRin Toshaka
2018-12-06Refactor common functions to common.exRin Toshaka
2018-12-06remove migrate_local_uploads.exRin Toshaka
2018-12-06Merge branch 'fix/mastodon-api-settings' into 'develop'kaniini
Fix put_settings and remove info_changeset See merge request pleroma/pleroma!507