alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,991 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

3991 Commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 6ca633ddd3
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure) 2019-02-09 16:31:17 +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 381fe44172
HTML.Scrubber.Default: Consistency 2019-02-09 14:59:21 +01: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 bd9b5fffbc
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation 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
Karen Konou 4430a0ad12 added another test 2019-02-09 14:34:42 +01:00
Karen Konou 09189c3a7c Made a test! 2019-02-09 14:23:51 +01:00
lain 563f04e81b Do autofollow first. 2019-02-09 13:39:57 +01:00
lain bbd0049fae Respect blocks in mass follow. 2019-02-09 13:24:23 +01:00
lambda 99fd199bda Merge branch 'add-media-path-to-caddy-cache' into 'develop' 
Add /media to Caddy cache

See merge request pleroma/pleroma!791
 2019-02-09 11:39:01 +00:00
shibayashi e868cfe619 Add /media to Caddy cache 2019-02-09 11:39:01 +00: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
rinpatch b05a341187 oof 2019-02-09 08:12:30 +03:00
rinpatch 9a23f8f3ea Add tests and fix a typo in docs 2019-02-08 20:23:26 +03: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
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
 2019-02-08 12:18:05 +00:00
Karen Konou a44e532fb1 Added thread unmuting (still a bit buggy maybe) 2019-02-08 13:17:11 +01:00
rinpatch 38ff9b3568 fix typo in config.md 2019-02-08 15:12:44 +03:00
rinpatch 7356659273 wow 2019-02-08 15:12:13 +03:00
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
 2019-02-08 12:10:35 +00:00
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
 2019-02-08 12:09:43 +00: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
rinpatch 2174f6eb4f Add default config for keyword policy 2019-02-08 12:48:39 +03:00
rinpatch 46aa8c18a2 Add keyword policy 2019-02-08 12:38:24 +03:00
Karen Konou 97a2789caa resolved merge conflict 2019-02-07 23:47:13 +01:00
Karen Konou c43f414a79 Somehow fixed the repo insert [skip-ci] 2019-02-07 23:44:49 +01:00
Karen Konou 7e3ec93ed0 made a silly oopsie 2019-02-07 22:59:53 +01:00
Karen Konou 6b5032e10e made a silly oopsie 2019-02-07 22:38:54 +01:00
Karen Konou 77448de492 ugghhhh 2019-02-07 22:25:07 +01:00
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).
 2019-02-07 22:14:06 +03:00
Karen Konou f4ff4ffba2 Migration and some boilerplate stuff 2019-02-07 17:36:14 +01:00
hakabahitoyo c2090b86b7 mark streaming feature for ios apps in readme 2019-02-07 12:01:35 +09:00
kaniini d84392c9e0 Merge branch 'remove-pawoo-apps-from-readme' into 'develop' 
Remove Pawoo apps from README.md

See merge request pleroma/pleroma!788
 2019-02-07 02:19:52 +00:00
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
 2019-02-07 02:18:51 +00:00
hakabahitoyo 902c72bb56 Mark streaming feature for Apps in README.md 2019-02-07 11:04:37 +09:00
Hakaba Hitoyo 063739054e Update README.md 2019-02-07 01:15:27 +00:00
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
 2019-02-06 22:40:24 +00:00
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
 2019-02-06 22:34:44 +00:00