summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-02-13Merge branch 'develop' into hellthread-filter-fixKaren Konou
2019-02-13User.follow_all: Respect blocks in both directions.lain
2019-02-13Update token.exMaxim Filippov
2019-02-13Add revoke tokenMaxim Filippov
2019-02-13Add OAuth tokens endpointMaxim Filippov
2019-02-13bugfix mdii uploaderhakabahitoyo
2019-02-13added checks for public url and follower collectionsKaren Konou
2019-02-12Plugs.HTTPSecurityPlug: Add webpacker to connect-srcHaelwenn (lanodan) Monnier
2019-02-12Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev modeHaelwenn (lanodan) Monnier
This is needed to run dev mode mastofe at the same time
2019-02-12Use url[:scheme] instead of protocol to determine if https is enabledshibayashi
2019-02-11Filter summary in keywordpolicyrinpatch
2019-02-11Merge branch 'feature/thread-muting' into 'develop'rinpatch
Feature/thread muting See merge request pleroma/pleroma!796
2019-02-11Merge branch 'feature/rich-media-limits' into 'develop'lambda
rich media: tighten fetching timeouts and size limits See merge request pleroma/pleroma!809
2019-02-11Merge branch 'develop' into feature/thread-mutingKaren Konou
2019-02-11Refactor as per Rin's suggestions, add endpoint testsKaren Konou
2019-02-11Revert "Merge branch 'object-creation' into 'develop'"lambda
This reverts merge request !802
2019-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
# Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex
2019-02-10rich media: tighten fetching timeouts and size limitsWilliam Pitcock
2019-02-10Merge branch 'fix/credo-issues' into 'develop'kaniini
Fix credo issues See merge request pleroma/pleroma!786
2019-02-10refactor, status view updating, error handlingKaren Konou
2019-02-10Merge branch 'object-creation' into 'develop'rinpatch
Do object insertion through Cachex See merge request pleroma/pleroma!802
2019-02-09Merge branch 'follow-enhancements' into 'develop'kaniini
Respect blocks in mass follow. See merge request pleroma/pleroma!797
2019-02-09Do object insertion through Cachexlain
So we don't flood our postgres logs with errors. Should also make things slightly faster.
2019-02-09Add unique index and unique constraint check, uniqueness test failsKaren Konou
2019-02-09elixir too new for CI's mix format lolKaren Konou
2019-02-09it works!!Karen Konou
2019-02-09Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)Haelwenn (lanodan) Monnier
2019-02-09de-group import/sHaelwenn (lanodan) Monnier
2019-02-09de-group alias/esHaelwenn (lanodan) Monnier
2019-02-09HTML.Scrubber.Default: ConsistencyHaelwenn (lanodan) Monnier
2019-02-09StashHaelwenn (lanodan) Monnier
2019-02-09Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify itHaelwenn (lanodan) Monnier
2019-02-09Mix.Tasks.Pleroma.Uploads: Fix typo in documentationHaelwenn (lanodan) Monnier
2019-02-09Web.Federator: Fix unused variableHaelwenn (lanodan) Monnier
2019-02-09Credo fixes: alias grouping/orderingHaelwenn (lanodan) Monnier
2019-02-09Credo fixes: parameter consistencyHaelwenn (lanodan) Monnier
2019-02-09Make credo happyHaelwenn (lanodan) Monnier
2019-02-09Do autofollow first.lain
2019-02-09Respect blocks in mass follow.lain
2019-02-09Merge branch 'feature/keyword-policy' into 'develop'lambda
Add keyword policy See merge request pleroma/pleroma!794
2019-02-08help i am not good with gitKaren Konou
2019-02-08Added thread unmuting (still a bit buggy maybe)Karen Konou
2019-02-08Added thread unmuting (still a bit buggy maybe)Karen Konou
2019-02-08wowrinpatch
2019-02-08Merge branch 'develop' into feature/thread-mutingKaren Konou
2019-02-08What idiot did that? (me)rinpatch
2019-02-08Merge branch 'develop' into feature/keyword-policyrinpatch
2019-02-08rename ftl_removal to federated_timeline_removal to keep consistent naming ↵rinpatch
with SimplePolicy
2019-02-08Add default config for keyword policyrinpatch
2019-02-08Add keyword policyrinpatch