Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
5 anos atrás
Ivan Tashkinov
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
5 anos atrás
Ivan Tashkinov
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
5 anos atrás
lambda
99fd199bda
Merge branch 'add-media-path-to-caddy-cache' into 'develop'
Add /media to Caddy cache
See merge request pleroma/pleroma!791
5 anos atrás
shibayashi
e868cfe619
Add /media to Caddy cache
5 anos atrás
lambda
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
Add keyword policy
See merge request pleroma/pleroma!794
5 anos atrás
rinpatch
b05a341187
oof
5 anos atrás
rinpatch
9a23f8f3ea
Add tests and fix a typo in docs
5 anos atrás
lambda
c5f8df08a7
Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'
Split hide_network only for local users
See merge request pleroma/pleroma!781
5 anos atrás
rinpatch
38ff9b3568
fix typo in config.md
5 anos atrás
rinpatch
7356659273
wow
5 anos atrás
lambda
ba7d7ffd80
Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'
Mark streaming feature for iOS apps in readme
See merge request pleroma/pleroma!790
5 anos atrás
lambda
b4271de770
Merge branch 'oauth2_strengthening' into 'develop'
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix
See merge request pleroma/pleroma!793
5 anos atrás
rinpatch
f88dec8b33
What idiot did that? (me)
5 anos atrás
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
5 anos atrás
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
5 anos atrás
rinpatch
2174f6eb4f
Add default config for keyword policy
5 anos atrás
rinpatch
46aa8c18a2
Add keyword policy
5 anos atrás
Ivan Tashkinov
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).
5 anos atrás
hakabahitoyo
c2090b86b7
mark streaming feature for ios apps in readme
5 anos atrás
kaniini
d84392c9e0
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'
Remove Pawoo apps from README.md
See merge request pleroma/pleroma!788
5 anos atrás
kaniini
24dd0fc545
Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'
Mark streaming feature for Apps in README.md
See merge request pleroma/pleroma!789
5 anos atrás
hakabahitoyo
902c72bb56
Mark streaming feature for Apps in README.md
5 anos atrás
Hakaba Hitoyo
063739054e
Update README.md
5 anos atrás
kaniini
430f23323c
Merge branch 'rename-followings' into 'develop'
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
See merge request pleroma/pleroma!787
5 anos atrás
Mark Felder
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
5 anos atrás
Haelwenn
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
5 anos atrás
William Pitcock
26670b09a7
tests: add a rich media card that contains all relevant fields
5 anos atrás
kaniini
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
5 anos atrás
William Pitcock
6eb8c1eb92
test: add some regression tests for the rich media card rendering
5 anos atrás
William Pitcock
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
5 anos atrás
Haelwenn
09b71a9053
Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'
Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.
See merge request pleroma/pleroma!784
5 anos atrás
Michael Loftis
ab80c8ebb8
adds a couple of explicit examples for ExSyslogger
5 anos atrás
rinpatch
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
5 anos atrás
href
f753043ce0
Fix if clause in activity_pub user_view
5 anos atrás
Michael Loftis
43b3f9e96e
rids the duplicate timestamp from default ExSyslogger config
5 anos atrás
Maxim Filippov
f1b72bfb70
Split hide_networ only for local users
5 anos atrás
lambda
3c08e20d68
Merge branch '2019-02-06-update-frontend' into 'develop'
update frontend
See merge request pleroma/pleroma!780
5 anos atrás
lain
78a51f4dd4
update frontend
5 anos atrás
eugenijm
035eaeb9b8
Allow to configure visibility for admin and moderator badges
5 anos atrás
eugenijm
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
5 anos atrás
rinpatch
c46490b199
Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'
rich media: parser: reject any data which cannot be explicitly encoded into JSON
Closes #596
See merge request pleroma/pleroma!779
5 anos atrás
William Pitcock
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
5 anos atrás
kaniini
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
5 anos atrás
kaniini
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
5 anos atrás
kaniini
00d572fd58
Merge branch 'testfix/twitter-api' into 'develop'
test: twitterapi: fix another possible test failure case
See merge request pleroma/pleroma!778
5 anos atrás
William Pitcock
73e6a1f1dd
test: twitterapi: fix another possible test failure case
5 anos atrás
kaniini
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
5 anos atrás
kaniini
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
5 anos atrás
William Pitcock
c4d317ccb6
test: twitterapi: fix the test breakage for real
5 anos atrás