6a6a5b3251
de-group alias/es
6 years ago
381fe44172
HTML.Scrubber.Default: Consistency
6 years ago
2272934a5e
Stash
6 years ago
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
6 years ago
bd9b5fffbc
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation
6 years ago
473095faf2
Web.Federator: Fix unused variable
6 years ago
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
106f4e7a0f
Credo fixes: parameter consistency
6 years ago
8bcfac93a8
Make credo happy
6 years ago
4430a0ad12
added another test
6 years ago
09189c3a7c
Made a test!
6 years ago
563f04e81b
Do autofollow first.
6 years ago
bbd0049fae
Respect blocks in mass follow.
6 years ago
99fd199bda
Merge branch 'add-media-path-to-caddy-cache' into 'develop'
...
Add /media to Caddy cache
See merge request pleroma/pleroma!791
6 years ago
e868cfe619
Add /media to Caddy cache
6 years ago
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
6 years ago
b05a341187
oof
6 years ago
9a23f8f3ea
Add tests and fix a typo in docs
6 years ago
7e47a810a2
help i am not good with git
6 years ago
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
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
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
6 years ago
38ff9b3568
fix typo in config.md
6 years ago
7356659273
wow
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
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
f88dec8b33
What idiot did that? (me)
6 years ago
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
2174f6eb4f
Add default config for keyword policy
6 years ago
46aa8c18a2
Add keyword policy
6 years ago
97a2789caa
resolved merge conflict
6 years ago
c43f414a79
Somehow fixed the repo insert [skip-ci]
6 years ago
7e3ec93ed0
made a silly oopsie
6 years ago
6b5032e10e
made a silly oopsie
6 years ago
77448de492
ugghhhh
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
f4ff4ffba2
Migration and some boilerplate stuff
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
Haelwenn (lanodan) Monnier