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
d35246c449
added healthcheck setting to instance config
5 years ago
0d6265cfe2
Change the default manifest to pleroma's namespace
5 years ago
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
9bd5e2dec9
Make emoji default_manifest a config option
6 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
6 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
6 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
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
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
7222afe01b
Clean merge crumbs
6 years ago
7e930559fe
Serve metrics at `/api/pleroma/app_metrics`
6 years ago
0b5c818cb7
[ #1 ] fix telemetry
6 years ago
bc3618a38d
Set up telemetry and prometheus
6 years ago
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
08d64b977f
little changes and typos
6 years ago
9b2188da7c
refactoring of emoji tags config to use groups
6 years ago
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
d5a1e08bf1
Add default mail adapter settings to config
6 years ago
10fdc080a0
BBS: Tests and formatting.
6 years ago
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
8468f3f6d4
Add safe dm mode option.
6 years ago
lain