lain
|
4fecd6f9a7
|
Config.exs: Add big warning so that nobody ever edits it.
|
6 years ago |
Haelwenn (lanodan) Monnier
|
1791ee8ec4
|
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
|
6 years ago |
Egor Kislitsyn
|
9abf832b03
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
6 years ago |
lambda
|
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 |
lambda
|
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 |
lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
6 years ago |
Egor Kislitsyn
|
c3d5c3513a
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
6 years ago |
Egor Kislitsyn
|
a1a854646e
|
Merge branch 'develop' into use-jobs-in-webpush
|
6 years ago |
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
6 years ago |
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 |
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 |