409ff60bf8
Fix formatting
6 years ago
92362e1e22
Implement large thread filter
6 years ago
d112990776
Specifically disable captcha for automatic tests, it makes them fail
6 years ago
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
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
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
6adea5a7b2
Move to docs
6 years ago
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
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
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
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
b12a904911
Integration tests for mastodon websocket
6 years ago
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
6e2f64a0a6
minutes->seconds_retained in config.md
6 years ago
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
1d31fd0722
Make the hosted kocaptcha the default value
6 years ago
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
7c522f38f0
Enable unsecure cookies by default in dev.exs
6 years ago
c859cd1d61
Fix style
6 years ago
e8537208bd
Add a captcha mock for tests
6 years ago
98e10c0d4f
Add captcha documentation to config.md
6 years ago
23549d3952
Formatting fixes
6 years ago
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
28c43a417e
Add an ability to disabled captcha
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
ef10e08efe
Update config.md
6 years ago
3b65f31606
Update config.md
6 years ago
658edb166f
fix and improve web push; add configuration docs
6 years ago
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
7214d57463
Extended nicknames: allow dashes.
6 years ago
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
6 years ago
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
e1cbb18327
Document the new frontend options.
6 years ago
213176c3c3
Add new frontend options to server-side config.
6 years ago
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
09c13d0929
Use "~" as a route namespace symbol on FE
6 years ago
100a06afe1
config.md: Fix typos and add option description
6 years ago
f079ca7181
Remove french.
6 years ago
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
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
0020b22688
add VAPID to test config
6 years ago
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
ec34de0c1f
WebSub fix test
6 years ago
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
d9a4aed3b3
replace try/catch with File.Exists? in dev.exs
6 years ago
680716b3c9
Config docs
6 years ago
02d3dc6869
Uploads fun, part. 2
6 years ago
b19597f602
reverse proxy / uploads
6 years ago
761ed2355f
config/prod.exs: Remove server: true
...
This breaks mix tasks in regular Elixir
6 years ago
6979eeda34
config: document mrf_user_allowlist
6 years ago
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
bc5cf2c192
Improved version string
6 years ago
bcecdc3ab1
Various runtime configuration fixes
6 years ago
8fd0556c78
better config reading
6 years ago
55abd8482e
better config
6 years ago
8e707aba29
format
6 years ago
58af0787be
add mdii uploader
6 years ago
ee5932a504
http security: allow referrer-policy to be configured
6 years ago
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
6 years ago
5dda13ee5f
config docs: typo fix
6 years ago
df72978dce
csp plug: add support for certificate transparency
6 years ago
69f5dfcfb3
config: add default parameters for CSPPlug
6 years ago
234e471289
config: properly configure CORSPlug.
6 years ago
d1a7a9fd24
config/config.md: Add lines inspired/copied from CONFIGURATION.md
6 years ago
db67c9b118
config/config.md: scope_options_enabled also addresses subject
6 years ago
79bdc3db19
config/config.md: Fill all the blanks
6 years ago
0189ccd4d9
config/config.md: Complete it [WIP]
6 years ago
ee41dbeca5
config/config.md: Create
6 years ago
a880e0a527
Merge branch 'feature/upload-limits' into 'develop'
...
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
6 years ago
36825932eb
s3 uploader: add new feature to force public attachment URIs to go through media proxy
6 years ago
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
6 years ago
ae5beb7b64
Make finmoji optional
6 years ago
3e79d941c8
Defaults for new frontend options in config.exs
6 years ago
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
5acfa2e091
config: pass inline images through mediaproxy ( closes #275 )
6 years ago
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
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
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
6 years ago
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
de5bd6fc65
config: fix up defaults for s3 endpoint configuration
6 years ago
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
8d2d7a8859
Implement uploader behaviour
...
run formatter <#
6 years ago
0df558a6a5
cleaning up a bit.
6 years ago
709816a0f8
example of flexible storage backends
6 years ago
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
6 years ago
b9a642da1e
Add Secure and SameSite cookie flags
6 years ago
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
89e2cb0828
remove unused settings
6 years ago
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
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
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
7bed350a23
config: allow relaying to be disabled
6 years ago
f72cfada1a
add suggestions/web config
6 years ago
d5091c3175
Allow additionnal schemes in the config
6 years ago
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
cc9c062b55
merge
6 years ago
b12d17d2ce
configurable timeout
6 years ago
e4dd58307a
better configuration
6 years ago
2b3f049b06
config: formatting
6 years ago
b23630076f
TwitterAPI: present pleroma frontend config in API
6 years ago
cf219b6add
config: make instance description configurable
6 years ago
091b7925d3
debug
6 years ago
d76f0d87be
do nothing if configuration is skipped
6 years ago
e7c580828c
format
6 years ago
f96244006e
change api
6 years ago
127882a5d5
configurable
6 years ago
5469fb9561
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
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
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
c67cf8e9af
format...
6 years ago
cb21bf5fc2
filter exif data #187
6 years ago
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
6 years ago
92135d00fc
Merge branch 'feature/application-xml-mime' into 'develop'
...
config: add application/xml mimetype support.
See merge request pleroma/pleroma!228
6 years ago
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
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
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
6 years ago
07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
6 years ago
4f9ecfc77a
formatting
6 years ago
b3580b6971
add option to not deny follow if blocked (fixed)
6 years ago
e99c73aeba
add option to not deny follow if blocked
6 years ago
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
6 years ago
09604182d0
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
6 years ago
1c926c7b60
activitypub: allow mastodon S2S block extension support to be disabled
6 years ago
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
6 years ago
737c42920a
Speling
6 years ago
d30907e573
Make it possible to use custom database connection parameters
6 years ago
a7eb148d61
Optionally deactivate public timelines.
6 years ago
d24ddd9fb9
ActivityPub MRF: implement the SimplePolicy policy
7 years ago
4a178b3d65
ActivityPub: implement MRF core hook and baseline noop policy object
7 years ago
cd543d58a1
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
468e41d50c
Respond to proper ActivityPub type.
7 years ago
4bf86d4cf5
config: make the upload limit configurable
7 years ago
4e5aa3b3a0
Add gopher server.
7 years ago
4afbef39f4
Format the code.
7 years ago
6dc98aaf89
Clean up prod.exs a bit.
7 years ago
86058c9a88
Return version in instance endpoint, set version to 0.9.0.
7 years ago
fbc187ac15
Switch to Jason for json handling.
...
It's twice as fast and will be the standard in the coming ecto.
7 years ago
611ca385de
Merge branch 'develop' into feature/activitypub
7 years ago
0e20d5529a
Add way to disable federation.
7 years ago
13ea3eafe5
Longer header lenght.
7 years ago
52200998c9
Merge branch 'develop' into feature/activitypub
7 years ago
f0745148a3
Add config option for enabling/disabling chat.
7 years ago
15cb3f2b01
Revert renaming emoji.txt
7 years ago
ab8b9ababa
Split emoji to default and custom.
7 years ago
2f23ae5b68
Merge branch 'pr-upstream-http-proxy' into 'develop'
...
Pr upstream http proxy
See merge request pleroma/pleroma!43
7 years ago
066fe1a697
use nil instead of empty string
7 years ago
8db83c3dc0
Merge branch 'feature/longfox' into 'develop'
...
add longfox emojis
See merge request pleroma/pleroma!53
7 years ago
7e1d4819ca
add longfox emojis
7 years ago
dffde6631d
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
7 years ago
048f61d7f8
#95 Correct prod.exs
7 years ago
658c4754ff
docs
7 years ago
5ddd15d794
make httppoison use configurable http proxy
7 years ago
5599c5920c
Basic incoming AP support.
7 years ago
1cb5cbdc6c
Improve error handling, add configuration
7 years ago
44dc694882
Add configuration generation tool, update readme.
7 years ago
5794558077
Read variable for testing db.
7 years ago
7c82b82197
Make emoji configurable in files.
7 years ago
c20530e708
Add configuration option for registrations.
7 years ago
50409326a8
Refactor posting and make character limit configurable.
7 years ago
ac2893a945
Add instance config options.
7 years ago
d982f04a65
Mock HTTPoison in testing.
7 years ago
1422e7aa84
Handle incoming websub subscriptions.
8 years ago
8fb73c28bb
Only have one subscription per callback.
8 years ago
ce6cc84a4a
Add basic webfinger.
8 years ago
e7dc39e40c
Basic file uploading via TwAPI.
8 years ago
08fdbd6f3a
Add Uploads.
8 years ago
e32dbfc9a5
Add basic auth.
8 years ago
a93f3421a7
Phoenix skeleton
8 years ago
Karen Konou