8bcfac93a8
Make credo happy
6 years ago
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
6 years ago
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
6 years ago
b4271de770
Merge branch 'oauth2_strengthening' into 'develop'
...
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix
See merge request pleroma/pleroma!793
6 years ago
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).
6 years ago
c2090b86b7
mark streaming feature for ios apps in readme
6 years ago
d84392c9e0
Merge branch 'remove-pawoo-apps-from-readme' into 'develop'
...
Remove Pawoo apps from README.md
See merge request pleroma/pleroma!788
6 years ago
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
6 years ago
902c72bb56
Mark streaming feature for Apps in README.md
6 years ago
063739054e
Update README.md
6 years ago
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
6 years ago
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
6 years ago
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
6 years ago
26670b09a7
tests: add a rich media card that contains all relevant fields
6 years ago
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
6 years ago
6eb8c1eb92
test: add some regression tests for the rich media card rendering
6 years ago
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
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
6 years ago
ab80c8ebb8
adds a couple of explicit examples for ExSyslogger
6 years ago
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
6 years ago
f753043ce0
Fix if clause in activity_pub user_view
6 years ago
43b3f9e96e
rids the duplicate timestamp from default ExSyslogger config
6 years ago
f1b72bfb70
Split hide_networ only for local users
6 years ago
3c08e20d68
Merge branch '2019-02-06-update-frontend' into 'develop'
...
update frontend
See merge request pleroma/pleroma!780
6 years ago
78a51f4dd4
update frontend
6 years ago
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
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
6 years ago
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
6 years ago
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
00d572fd58
Merge branch 'testfix/twitter-api' into 'develop'
...
test: twitterapi: fix another possible test failure case
See merge request pleroma/pleroma!778
6 years ago
73e6a1f1dd
test: twitterapi: fix another possible test failure case
6 years ago
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
6 years ago
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
6 years ago
c4d317ccb6
test: twitterapi: fix the test breakage for real
6 years ago
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
6 years ago
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
6 years ago
040ab352a5
Merge branch 'patch-2' into 'develop'
...
ARGLE GARBLE
See merge request pleroma/pleroma!776
6 years ago
8892f4468c
Merge branch 'bugfix/rich-media-nil' into 'develop'
...
html: don't attempt to parse nil content
See merge request pleroma/pleroma!775
6 years ago
c48aba3c2a
Fix SQL
6 years ago
47eb557617
ARGLE GARBLE
...
Update .gitignore
6 years ago
a2bb5d890d
html: don't attempt to parse nil content
6 years ago
e71ab5a10f
activitypub: transmogrifier: fix bare tags
6 years ago
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
cd6606b7f6
Initialize hide_network with false
6 years ago
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
6 years ago
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
6 years ago
64a3993425
activitypub: mrf: tag policy: add support for subscription control
6 years ago
Haelwenn (lanodan) Monnier