67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
5 years ago
e39c190f04
Configuration: disable migration lock.
5 years ago
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
0992094bd6
Merge branch 'cleanup' into 'develop'
...
Remove unused queue from the config
See merge request pleroma/pleroma!1158
5 years ago
153c15cdb2
Merge branch 'legacy-fe-config' into 'develop'
...
remove deprecated PleromaFE configuration
See merge request pleroma/pleroma!1152
5 years ago
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
6c9f45f4dd
Remove unused queue from the config
5 years ago
071f78733a
switch to pleroma/http_signatures library
5 years ago
38f3393e93
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
...
As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)
Also in this commit: minor changelog improvements.
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
fedaca15a3
websub: adapt to work as a federator publishing module
5 years ago
179293e51c
salmon: refactor to work as a federator publishing module
5 years ago
10695a28d2
federator: publisher: add publish() wrapper
5 years ago
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
f46295faa7
unused config paramater
5 years ago
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
501af917b5
add support for bbcode
5 years ago
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
d35246c449
added healthcheck setting to instance config
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
0d6265cfe2
Change the default manifest to pleroma's namespace
5 years ago
8f93d4c423
Remove most finmoji mentions where appropriate
5 years ago
9bd5e2dec9
Make emoji default_manifest a config option
5 years ago
a141f0807b
Assume packs without emoji.txt only have emoji pictures, unhardcode
...
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
5 years ago
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
5 years ago
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
6 years ago
4fecd6f9a7
Config.exs: Add big warning so that nobody ever edits it.
6 years ago
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
lain