d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
06c4935c11
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
...
Update Mastodon Frontend to 2019-02-10 bundle
See merge request pleroma/pleroma!806
6 years ago
5d34e5a51e
Merge branch 'feather_mention' into 'develop'
...
Add Feather to the clients list
See merge request pleroma/pleroma!804
6 years ago
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
49b5f8d7c9
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'
...
Update service files of OpenRC and systemd to new recommended paths
See merge request pleroma/pleroma!798
6 years ago
d1752a81a8
Update service files of OpenRC and systemd to new recommended paths
6 years ago
fcd8a2d0d6
Update Mastodon Frontend to 2019-02-10 bundle
...
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10
[ci skip]
6 years ago
db407e4d50
add feather to webclients
6 years ago
57501defb4
Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'
...
Recommend the acme-challenge path that is used in the installation guides
See merge request pleroma/pleroma!803
6 years ago
612ace96de
Merge branch 'docs/pleroma-clients' into 'develop'
...
docs/Clients.md: Add documentation about clients supporting pleroma
See merge request pleroma/pleroma!726
6 years ago
94385313b5
docs/Clients.md: Add Nekonium
...
[ci skip]
6 years ago
daa25f3403
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
...
[ci skip]
6 years ago
f2d5989ffa
docs/Clients.md: Add Social (GNOME)
...
[ci skip]
6 years ago
91a41ec670
docs/Clients.md: Add per-type sections
...
helps differenciate between Electrons and others like Brutaldon.
[ci skip]
6 years ago
5f767be331
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
6 years ago
d0cf58d032
WIP: docs/Clients.md: Add documentation about clients supporting pleroma
...
[ci skip]
6 years ago
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
6 years ago
1d8b578bb7
Recommend the acme-challenge path that is used in the installation guides
6 years ago
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
6 years ago
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
6ca633ddd3
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
6 years ago
d924dc73ba
de-group import/s
6 years ago
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
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
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
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
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
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
lambda