summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-02-15Merge branch 'bugfix/actor-containment' into 'develop'rinpatch
activitypub: correctly handle bare URIs in user lookup Closes #645 See merge request pleroma/pleroma!829
2019-02-15Add tests, change default config values, fix a bugKaren Konou
2019-02-15Add logic for keeping follow_request_count up-to-date on the `follow`,eugenijm
`approve_friend_request`, and `deny_friend_request` actions. Add follow_request_count to the user view.
2019-02-14user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()William Pitcock
get_or_fetch() handles the nickname verses URI differences transparently.
2019-02-14Merge branch 'bugfix/activitypub-reserialization' into 'develop'lambda
activitypub transmogrifier: fix reserialization edge cases See merge request pleroma/pleroma!826
2019-02-14activitypub: clean up logging statements a littleWilliam Pitcock
2019-02-14Merge remote-tracking branch 'upstream/develop' into patch-image-descriptionWim Vanderbauwhede
2019-02-14[#468] Refactored OAuth scopes parsing / defaults handling.Ivan Tashkinov
2019-02-14Fix queue nameEgor Kislitsyn
2019-02-14fix S3 links encoding in MediaproxyEgor Kislitsyn
2019-02-14activitypub: user view: formattingWilliam Pitcock
2019-02-14activitypub: user view: report totalItems=0 for follows/followers when hiddenWilliam Pitcock
2019-02-14activitypub: user view: remove totalItems from user outboxWilliam Pitcock
(this is based on a counter in User.Info, but the counter is not reliable.)
2019-02-14activitypub: user view: remove totalInbox from user inbox viewWilliam Pitcock
It is not really feasible to quickly calculate the totalItems value and it shouldn't be trusted anyway.
2019-02-14Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'kaniini
ActivityPub C2S oauth endpoints See merge request pleroma/pleroma!821
2019-02-14activitypub: user view: do not expose oAuth endpoints for instance usersWilliam Pitcock
2019-02-14oauth: never use base64 padding when returning tokens to applicationsWilliam Pitcock
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since Base64 strings are self-synchronizing, padding characters are unnecessary, so don't generate them in the first place.
2019-02-14activitypub: transmogrifier: correctly handle nil inReplyTo valueWilliam Pitcock
2019-02-14activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag ↵William Pitcock
objects
2019-02-13Improve login error for OAuth flowMark Felder
2019-02-14[#468] User UI for OAuth permissions restriction. Standardized storage ↵Ivan Tashkinov
format for `scopes` fields, updated usages.
2019-02-13activitypub: user view: use route helpers instead of hardcoded URIsWilliam Pitcock
2019-02-13activitypub: user view: add oauthRegistrationEndpoint to user profilesWilliam Pitcock
2019-02-13activitypub: user view: fix up endpoints renderingWilliam Pitcock
2019-02-13user view: add AP C2S oauth endpoints to local user profilesWilliam Pitcock
2019-02-13refactored codeKaren Konou
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