dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
2019-02-17 13:49:14 +03:00
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
2019-02-15 19:54:37 +03:00
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
2019-02-14 17:03:19 +03:00
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
2019-02-14 00:29:29 +03:00
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
2019-02-09 17:32:33 +03:00
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
2019-02-09 17:09:08 +03:00
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
7356659273
wow
2019-02-08 15:12:13 +03:00
f88dec8b33
What idiot did that? (me)
2019-02-08 13:16:50 +03:00
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
2019-02-08 13:12:33 +03:00
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
2019-02-08 13:12:09 +03:00
2174f6eb4f
Add default config for keyword policy
2019-02-08 12:48:39 +03:00
46aa8c18a2
Add keyword policy
2019-02-08 12:38:24 +03:00
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security 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-07 22:14:06 +03:00
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
2019-02-06 22:34:44 +00:00
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
2019-02-06 18:39:13 +00:00
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
2019-02-06 18:19:47 +00:00
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
2019-02-06 18:02:15 +00:00
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
2019-02-06 17:47:58 +00:00
f753043ce0
Fix if clause in activity_pub user_view
2019-02-06 18:42:19 +01:00
035eaeb9b8
Allow to configure visibility for admin and moderator badges
2019-02-06 06:18:05 +03:00
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
2019-02-06 02:10:06 +03:00
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
2019-02-05 20:50:57 +00:00
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
2019-02-05 20:27:31 +00:00
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
2019-02-05 20:26:31 +00:00
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
2019-02-05 18:56:59 +00:00
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
2019-02-05 18:53:43 +00:00
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
2019-02-05 18:30:27 +00:00
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
2019-02-05 11:30:18 +00:00
a2bb5d890d
html: don't attempt to parse nil content
2019-02-05 05:06:17 +00:00
e71ab5a10f
activitypub: transmogrifier: fix bare tags
2019-02-05 00:43:28 +00:00
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
2019-02-04 22:58:29 +00:00
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
2019-02-04 23:47:29 +01:00
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
2019-02-04 19:20:11 +00:00
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
2019-02-04 19:03:54 +00:00
64a3993425
activitypub: mrf: tag policy: add support for subscription control
2019-02-04 17:48:48 +00:00
3ae11835a9
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
...
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
2019-02-04 17:32:12 +00:00
4031c94a59
fix hellthread threshold deprecation warning
2019-02-04 18:26:56 +01:00
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
2019-02-04 17:06:37 +00:00
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
2019-02-04 17:04:05 +00:00
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
2019-02-04 17:04:05 +00:00
88e32a32ce
mrf: add initial MRF.TagPolicy engine
2019-02-04 17:04:05 +00:00
93e136d70b
mix: add user tag/untag task
2019-02-04 17:04:05 +00:00
25a659d2dc
Merge branch 'mime-riff' into 'develop'
...
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
2019-02-04 16:52:41 +00:00
127f99ae18
Mime: detect RIFF formats (wave, webp, avi)
2019-02-04 17:44:41 +01:00
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
2019-02-04 16:01:34 +00:00
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
2019-02-04 12:36:50 +00:00
58262a8b8a
removed a debug thingy
2019-02-04 11:22:25 +00:00
4430641349
squished a bug
2019-02-04 12:09:00 +01:00
3cf046babb
actually commited the changes
2019-02-04 10:23:43 +01:00
Ivan Tashkinov