lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Mark Felder
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
feld
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
Mark Felder
7222afe01b
Clean merge crumbs
6 years ago
href
7e930559fe
Serve metrics at `/api/pleroma/app_metrics`
6 years ago
Egor Kislitsyn
0b5c818cb7
[ #1 ] fix telemetry
6 years ago
href
bc3618a38d
Set up telemetry and prometheus
6 years ago
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Alex S
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
Ivan Tashkinov
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Alex S
08d64b977f
little changes and typos
6 years ago
Alex S
9b2188da7c
refactoring of emoji tags config to use groups
6 years ago
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
Ivan Tashkinov
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Mark Felder
d5a1e08bf1
Add default mail adapter settings to config
6 years ago
lain
10fdc080a0
BBS: Tests and formatting.
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Ivan Tashkinov
81bf6d9e6a
[ #923 ] Typo fix.
6 years ago
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
Ivan Tashkinov
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
Ivan Tashkinov
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
rinpatch
28cfb2c37a
Enable dedupe by default
6 years ago
rinpatch
e2fe796c63
Add some tests
6 years ago
link0ff
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
link0ff
9338f061a3
Support LDAP method start_tls
6 years ago
Ivan Tashkinov
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
kaniini
46200d8fac
Merge branch 'fix-tlsv1.3' into 'develop'
...
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
6 years ago
Ekaterina Vaartis
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
Haelwenn (lanodan) Monnier
a283a1fcd0
Add default config for masto_fe
...
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
6 years ago
Egor Kislitsyn
eb84de0143
allow users to disable their own account
6 years ago
KokaKiwi
b57913b13a
Fix supported TLS versions as TLS 1.3 support seems buggy.
6 years ago
link0ff
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
William Pitcock
6b2a1ad1c8
config: fix chat endpoint path
6 years ago
William Pitcock
9aec00d711
config: update config for cowboy 2 endpoints
6 years ago
Egor
c3ac9424d2
AutoLinker
6 years ago
link0ff
e278d47023
OpenLDAP support
6 years ago
Egor
bff9eb5ef7
Reports
6 years ago
kaniini
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
lain
d812a347ca
Add optional welcome message.
6 years ago
Karen Konou
d943c90249
Add tests, change default config values, fix a bug
6 years ago
Haelwenn (lanodan) Monnier
71ce564ecc
config/dev.exs: Don’t put secure cookies on dev
6 years ago
Egor Kislitsyn
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
rinpatch
2174f6eb4f
Add default config for keyword policy
6 years ago
Michael Loftis
43b3f9e96e
rids the duplicate timestamp from default ExSyslogger config
6 years ago
Egor Kislitsyn
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
rinpatch
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
Karen Konou
0ef0ae35ab
added optional delist feature
6 years ago
lain
e61f0be951
Unbreak all the tests.
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
rinpatch
7057891db6
Make rich media support toggleable
6 years ago
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
href
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
6 years ago
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
Egor Kislitsyn
55affbca7f
add a job queue
6 years ago
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
lain
39b2457734
Change default bg image in new config.
6 years ago
Ivan Tashkinov
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
6 years ago
lain
e221c681dc
New frontend configuration mechanism.
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
rinpatch
a38f21f51d
unfurl_nsfw: false by default
6 years ago
Mark Felder
207489aa25
Also add to default config
6 years ago
rinpatch
76f80940da
oops
6 years ago
rinpatch
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
rinpatch
e4dc3f71ae
Resolve merge conflict
6 years ago
kaniini
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
Mark Felder
5419b1a030
Alpha sort the restricted nicknames
6 years ago
Egor Kislitsyn
28afcb7c31
move defaults from sample_config.exs to config.exs
6 years ago
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
6 years ago
Haelwenn (lanodan) Monnier
c9b99d4486
config/config.exs: Add syslog backends
6 years ago
href
53f56039e5
Remove media proxy examples in config/config.exs
...
1. this was overriding the real defaults
2. it's documented in `config/config.md`
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
rinpatch
9ef664ffce
Merge branch 'fix-chat' into 'develop'
...
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
6 years ago
rinpatch
d1983ed028
Merge branch 'fix/reserve-media-username' into 'develop'
...
Reserve /media
See merge request pleroma/pleroma!620
6 years ago
Rin Toshaka
5142b50f39
reserve /media
6 years ago
lain
8910e103ce
Add handler for Phoenix-style socket.
6 years ago
lain
400337b0a7
Make Federator options configurable.
6 years ago
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
lambda
9c782e59dd
Raise remote limit
6 years ago
Ekaterina Vaartis
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
lain
1dd71026a1
Add 'about' to restricted list.
...
And correct pleromaFE config.
6 years ago
lain
8da2c45c27
Add ~ to the list of restricted names.
6 years ago
lain
5811e65e67
Add some hard limits on inserted activities.
6 years ago
lain
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
6 years ago
Karen Konou
c76179419d
Renamed the things
6 years ago
Karen Konou
409ff60bf8
Fix formatting
6 years ago
Karen Konou
92362e1e22
Implement large thread filter
6 years ago
Ekaterina Vaartis
d112990776
Specifically disable captcha for automatic tests, it makes them fail
6 years ago
Ekaterina Vaartis
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
kaniini
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
lain
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
Haelwenn (lanodan) Monnier
6adea5a7b2
Move to docs
6 years ago
lambda
443d59baa0
Merge branch 'feature/new-user-routes' into 'develop'
...
Use "~" as a route namespace symbol on FE
See merge request pleroma/pleroma!530
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
href
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
href
b12a904911
Integration tests for mastodon websocket
6 years ago
href
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
vaartis
6e2f64a0a6
minutes->seconds_retained in config.md
6 years ago
Ekaterina Vaartis
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
Ekaterina Vaartis
1d31fd0722
Make the hosted kocaptcha the default value
6 years ago
Ekaterina Vaartis
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
Rin Toshaka
7c522f38f0
Enable unsecure cookies by default in dev.exs
6 years ago
Ekaterina Vaartis
c859cd1d61
Fix style
6 years ago
Ekaterina Vaartis
e8537208bd
Add a captcha mock for tests
6 years ago
Ekaterina Vaartis
98e10c0d4f
Add captcha documentation to config.md
6 years ago
Ekaterina Vaartis
23549d3952
Formatting fixes
6 years ago
Haelwenn (lanodan) Monnier
ff7ce9a9fb
config/config.exs: Add application/jrd+json => jrd+json to fix webfinger
...
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
6 years ago
Ekaterina Vaartis
28c43a417e
Add an ability to disabled captcha
6 years ago
Ekaterina Vaartis
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
Haelwenn
ef10e08efe
Update config.md
6 years ago
lambda
3b65f31606
Update config.md
6 years ago
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
6 years ago
Ivan Tashkinov
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
Ivan Tashkinov
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
href
7214d57463
Extended nicknames: allow dashes.
6 years ago
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
Ivan Tashkinov
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
6 years ago
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
Ivan Tashkinov
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
scarlett
e1cbb18327
Document the new frontend options.
6 years ago
scarlett
213176c3c3
Add new frontend options to server-side config.
6 years ago
lambda
729321ad20
Merge branch 'fix/config-md-typos' into 'develop'
...
config.md: Fix typos and add `federating` option description
See merge request pleroma/pleroma!525
6 years ago
Maxim Filippov
09c13d0929
Use "~" as a route namespace symbol on FE
6 years ago
Rin Toshaka
100a06afe1
config.md: Fix typos and add option description
6 years ago
href
f079ca7181
Remove french.
6 years ago
href
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
kaniini
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
6 years ago
Egor Kislitsyn
0020b22688
add VAPID to test config
6 years ago
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
Maksim Pechnikov
ec34de0c1f
WebSub fix test
6 years ago
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
rinpatch
d9a4aed3b3
replace try/catch with File.Exists? in dev.exs
6 years ago
href
680716b3c9
Config docs
6 years ago
href
02d3dc6869
Uploads fun, part. 2
6 years ago
href
b19597f602
reverse proxy / uploads
6 years ago
Haelwenn (lanodan) Monnier
761ed2355f
config/prod.exs: Remove server: true
...
This breaks mix tasks in regular Elixir
6 years ago
William Pitcock
6979eeda34
config: document mrf_user_allowlist
6 years ago
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
href
bc5cf2c192
Improved version string
6 years ago
href
bcecdc3ab1
Various runtime configuration fixes
6 years ago
hakabahitoyo
8fd0556c78
better config reading
6 years ago
hakabahitoyo
55abd8482e
better config
6 years ago
hakabahitoyo
8e707aba29
format
6 years ago
Hakaba Hitoyo
58af0787be
add mdii uploader
6 years ago
William Pitcock
ee5932a504
http security: allow referrer-policy to be configured
6 years ago
William Pitcock
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
6 years ago
William Pitcock
5dda13ee5f
config docs: typo fix
6 years ago
William Pitcock
df72978dce
csp plug: add support for certificate transparency
6 years ago
William Pitcock
69f5dfcfb3
config: add default parameters for CSPPlug
6 years ago
William Pitcock
234e471289
config: properly configure CORSPlug.
6 years ago
Haelwenn (lanodan) Monnier
d1a7a9fd24
config/config.md: Add lines inspired/copied from CONFIGURATION.md
6 years ago
Haelwenn (lanodan) Monnier
db67c9b118
config/config.md: scope_options_enabled also addresses subject
6 years ago
Haelwenn (lanodan) Monnier
79bdc3db19
config/config.md: Fill all the blanks
6 years ago
Haelwenn (lanodan) Monnier
0189ccd4d9
config/config.md: Complete it [WIP]
6 years ago
Haelwenn (lanodan) Monnier
ee41dbeca5
config/config.md: Create
6 years ago
kaniini
a880e0a527
Merge branch 'feature/upload-limits' into 'develop'
...
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
6 years ago
William Pitcock
36825932eb
s3 uploader: add new feature to force public attachment URIs to go through media proxy
6 years ago
William Pitcock
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
6 years ago
scarlett
ae5beb7b64
Make finmoji optional
6 years ago
scarlett
3e79d941c8
Defaults for new frontend options in config.exs
6 years ago
Haelwenn (lanodan) Monnier
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
William Pitcock
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
William Pitcock
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
William Pitcock
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
William Pitcock
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
William Pitcock
5acfa2e091
config: pass inline images through mediaproxy ( closes #275 )
6 years ago
William Pitcock
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
William Pitcock
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
William Pitcock
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
William Pitcock
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
Hakaba Hitoyo
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
kaniini
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
6 years ago
Haelwenn (lanodan) Monnier
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
6 years ago
William Pitcock
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
William Pitcock
de5bd6fc65
config: fix up defaults for s3 endpoint configuration
6 years ago
William Pitcock
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
Thurloat
8d2d7a8859
Implement uploader behaviour
...
run formatter <#
6 years ago
Thurloat
0df558a6a5
cleaning up a bit.
6 years ago
Thurloat
709816a0f8
example of flexible storage backends
6 years ago
William Pitcock
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
6 years ago
shibayashi
b9a642da1e
Add Secure and SameSite cookie flags
6 years ago
kaniini
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
hakabahitoyo
89e2cb0828
remove unused settings
6 years ago
William Pitcock
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
kaniini
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
6 years ago
lambda
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
6 years ago
William Pitcock
7bed350a23
config: allow relaying to be disabled
6 years ago
Hakaba Hitoyo
f72cfada1a
add suggestions/web config
6 years ago
Haelwenn (lanodan) Monnier
d5091c3175
Allow additionnal schemes in the config
6 years ago
Tristan Mahé
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
Hakaba Hitoyo
cc9c062b55
merge
6 years ago
Hakaba Hitoyo
b12d17d2ce
configurable timeout
6 years ago
Hakaba Hitoyo
e4dd58307a
better configuration
6 years ago
William Pitcock
2b3f049b06
config: formatting
6 years ago
William Pitcock
b23630076f
TwitterAPI: present pleroma frontend config in API
6 years ago
William Pitcock
cf219b6add
config: make instance description configurable
6 years ago
Hakaba Hitoyo
091b7925d3
debug
6 years ago
Hakaba Hitoyo
d76f0d87be
do nothing if configuration is skipped
6 years ago
hakabahitoyo
e7c580828c
format
6 years ago
hakabahitoyo
f96244006e
change api
6 years ago
hakabahitoyo
127882a5d5
configurable
6 years ago
Tristan Mahé
5469fb9561
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
Jorty
748fff6544
Fix auto-shortcode emoji
...
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
6 years ago
Jorty
c171f9790b
Move emoji glob setting to config.exs
...
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users
6 years ago
Tristan Mahé
c67cf8e9af
format...
6 years ago
Tristan Mahé
cb21bf5fc2
filter exif data #187
6 years ago
lambda
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
6 years ago
lambda
92135d00fc
Merge branch 'feature/application-xml-mime' into 'develop'
...
config: add application/xml mimetype support.
See merge request pleroma/pleroma!228
6 years ago
William Pitcock
60d6038be5
mrf simple: add accept lists
...
accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space.
6 years ago
William Pitcock
c5bbc46f87
config: add application/xml mimetype support.
...
application/xml is the older xml mimetype. some legacy scripts make use of it,
as well as common use for debugging with curl and other tools. so it makes sense
to have it alongside text/xml.
6 years ago
squidboi
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
6 years ago
squidboi
07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
6 years ago
squidboi
4f9ecfc77a
formatting
6 years ago
squidboi
b3580b6971
add option to not deny follow if blocked (fixed)
6 years ago
squidboi
e99c73aeba
add option to not deny follow if blocked
6 years ago
squidboi
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
6 years ago
William Pitcock
09604182d0
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
6 years ago
William Pitcock
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
6 years ago
Thog
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
6 years ago
Mark Felder
737c42920a
Speling
6 years ago
Mark Felder
d30907e573
Make it possible to use custom database connection parameters
6 years ago
lain
a7eb148d61
Optionally deactivate public timelines.
7 years ago
William Pitcock
d24ddd9fb9
ActivityPub MRF: implement the SimplePolicy policy
7 years ago
William Pitcock
4a178b3d65
ActivityPub: implement MRF core hook and baseline noop policy object
7 years ago
lain
cd543d58a1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
lain
468e41d50c
Respond to proper ActivityPub type.
7 years ago