William Pitcock
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
2019-02-14 03:01:39 +00:00
kaniini
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
2019-02-14 02:50:06 +00:00
William Pitcock
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
2019-02-14 02:41:21 +00:00
William Pitcock
e9ef4b8da6
oauth: never use base64 padding when returning tokens to applications
...
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-14 01:10:04 +00:00
William Pitcock
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
2019-02-14 00:35:54 +00:00
William Pitcock
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
2019-02-14 00:35:53 +00:00
Mark Felder
f62c1d6266
Improve login error for OAuth flow
2019-02-13 22:33:22 +00:00
Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
2019-02-14 00:29:29 +03:00
William Pitcock
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
2019-02-13 19:34:43 +00:00
William Pitcock
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
2019-02-13 19:34:43 +00:00
William Pitcock
db8abd958d
activitypub: user view: fix up endpoints rendering
2019-02-13 19:34:43 +00:00
William Pitcock
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
2019-02-13 19:34:43 +00:00
Karen Konou
bef9b9cb66
refactored code
2019-02-13 16:23:09 +01:00
Karen Konou
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
2019-02-13 16:22:14 +01:00
Maxim Filippov
760fec4cb8
Update token.ex
2019-02-13 12:59:56 +03:00
Maxim Filippov
62a45bdc11
Add revoke token
2019-02-13 12:59:56 +03:00
Maxim Filippov
61a4bc5095
Add OAuth tokens endpoint
2019-02-13 12:59:56 +03:00
Karen Konou
1d727cd069
added checks for public url and follower collections
2019-02-13 00:01:34 +01:00
rinpatch
379d04692c
Filter summary in keywordpolicy
2019-02-11 21:35:40 +03:00
rinpatch
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
2019-02-11 15:02:14 +00:00
lambda
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
2019-02-11 12:33:58 +00:00
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
Karen Konou
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
2019-02-11 12:04:02 +01:00
lambda
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
2019-02-11 08:07:39 +00:00
Egor Kislitsyn
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
William Pitcock
45e57dd187
rich media: tighten fetching timeouts and size limits
2019-02-10 21:54:08 +00:00
kaniini
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
2019-02-10 20:54:21 +00:00
Karen Konou
cc21fc5f53
refactor, status view updating, error handling
2019-02-10 10:42:30 +01:00
lain
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
2019-02-09 22:01:08 +01:00
Karen Konou
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
2019-02-09 20:52:11 +01:00
Karen Konou
a0d732ec55
it works!!
2019-02-09 17:47:57 +01:00
Haelwenn (lanodan) Monnier
d924dc73ba
de-group import/s
2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
Ivan Tashkinov
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
2019-02-09 17:32:33 +03:00
Ivan Tashkinov
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
2019-02-09 17:09:08 +03:00
Haelwenn (lanodan) Monnier
2272934a5e
Stash
2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier
473095faf2
Web.Federator: Fix unused variable
2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier
60ea29dfe6
Credo fixes: alias grouping/ordering
2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier
106f4e7a0f
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier
8bcfac93a8
Make credo happy
2019-02-09 14:59:20 +01:00
lambda
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
2019-02-09 11:38:37 +00:00
Karen Konou
7e47a810a2
help i am not good with git
2019-02-08 13:22:29 +01:00
Karen Konou
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
2019-02-08 13:20:40 +01:00
Karen Konou
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
2019-02-08 13:17:11 +01:00
rinpatch
7356659273
wow
2019-02-08 15:12:13 +03:00
Karen Konou
98ec578f4d
Merge branch 'develop' into feature/thread-muting
2019-02-08 12:44:02 +01:00
rinpatch
f88dec8b33
What idiot did that? (me)
2019-02-08 13:16:50 +03:00
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
2019-02-08 13:12:33 +03:00
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
2019-02-08 13:12:09 +03:00
