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 |
|
Ivan Tashkinov
|
e3328bc138
|
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
|
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 |
|
feld
|
9aeac7dcca
|
Merge branch 'feature/prometheus' into 'develop'
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
|
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 |
|
Mark Felder
|
66e7b03372
|
Merge branch 'develop' into feature/prometheus
|
6 years ago |
|
Mark Felder
|
5564cd421d
|
Document Prometheus
|
6 years ago |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
6 years ago |
|
Alex S
|
d140738edf
|
second level of headertext change in doc
|
6 years ago |
|
Alex S
|
3465b7ba9a
|
syntax highlighting
|
6 years ago |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
|
Alex S
|
08d64b977f
|
little changes and typos
|
6 years ago |
|
Alex S
|
851c5bf093
|
updating custom_emoji docs
|
6 years ago |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
6 years ago |
