summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
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-09[#468] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.Ivan Tashkinov
2019-02-09[#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.Ivan Tashkinov
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
2019-02-07Somehow fixed the repo insert [skip-ci]Karen Konou
2019-02-07made a silly oopsieKaren Konou
2019-02-07ugghhhhKaren Konou
2019-02-07OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security ↵Ivan Tashkinov
breach fix. (`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris, and if that happened before /web/login is accessed for the first time then Pleroma used this externally created record with arbitrary redirect_uris and client_secret known by creator).
2019-02-07Migration and some boilerplate stuffKaren Konou
2019-02-06hide_followings was renamed to hide_followers in the FE, but never synced up ↵Mark Felder
in the BE This was a dirty regex replace which worked on my server
2019-02-06Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn
rich media cards: bugfixes and regression tests See merge request pleroma/pleroma!785
2019-02-06Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini
Add admin and moderator badges to user view and make their visibility configurable See merge request pleroma/pleroma!767
2019-02-06mastodon api: rich media: don't clobber %URI struct with a stringWilliam Pitcock
2019-02-06Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch
Fix if clause in activity_pub user_view See merge request pleroma/pleroma!783
2019-02-06Fix if clause in activity_pub user_viewhref
2019-02-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobsEgor Kislitsyn
2019-02-06Allow to configure visibility for admin and moderator badgeseugenijm
2019-02-06Add is_admin and is_moderator boolean fields to the user vieweugenijm
2019-02-05rich media: parser: reject any data which cannot be explicitly encoded into JSONWilliam Pitcock
2019-02-05Merge branch 'fix-dm-index' into 'develop'kaniini
Massage index until it actually does the stuff we want. See merge request pleroma/pleroma!772
2019-02-05Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini
activitypub: c2s: add /api/ap/whoami endpoint for andstatus See merge request pleroma/pleroma!773
2019-02-05Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini
Split hide_network into hide_followers & hide_followings (fixed) See merge request pleroma/pleroma!765
2019-02-05Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini
mastodon api: fix rendering of cards without image URLs (closes #597) Closes #597 See merge request pleroma/pleroma!777
2019-02-05mastodon api: fix rendering of cards without image URLs (closes #597)William Pitcock
2019-02-05Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'lambda
activitypub: transmogrifier: fix bare tags See merge request pleroma/pleroma!774
2019-02-05html: don't attempt to parse nil contentWilliam Pitcock