kaniini
|
2e2030ada8
|
Merge branch '114_email_confirmation' into 'develop'
[#114] Email confirmation
See merge request pleroma/pleroma!546
|
2018-12-20 13:28:36 +00:00 |
|
kaniini
|
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
|
2018-12-20 04:01:54 +00:00 |
rinpatch
|
d6b133ec51
|
Pleroma-API.md: Additionnal endpoints
|
2018-12-18 18:33:39 +01:00 |
Haelwenn (lanodan) Monnier
|
6adea5a7b2
|
Move to docs
|
2018-12-18 17:16:26 +01:00 |
|
rinpatch
|
4a6855d9ee
|
Provide plaintext representations of content/cw in MastoAPI
|
2017-01-01 03:10:08 +03:00 |
Egor Kislitsyn
|
9abf832b03
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 18:48:10 +07:00 |
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
|
2019-04-08 11:42:20 +00:00 |
|
lambda
|
fd45cab9ec
|
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
|
2019-04-08 11:41:50 +00:00 |
|
lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
2019-04-08 09:50:00 +00:00 |
|
Egor Kislitsyn
|
c3d5c3513a
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
2019-04-08 16:46:59 +07:00 |
|
Egor Kislitsyn
|
a1a854646e
|
Merge branch 'develop' into use-jobs-in-webpush
|
2019-04-08 16:29:20 +07:00 |
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
2019-04-08 12:20:26 +03:00 |
|
lambda
|
b4da2bc1d0
|
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
|
2019-04-08 09:18:01 +00:00 |
|
Ivan Tashkinov
|
e3328bc138
|
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
|
2019-04-07 11:08:37 +03:00 |
eugenijm
|
2056efa714
|
Add scheduler for sending scheduled activities to the queue
|
2019-04-06 23:56:29 +03:00 |
|
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
2019-04-06 23:55:58 +03:00 |
feld
|
9aeac7dcca
|
Merge branch 'feature/prometheus' into 'develop'
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
|
2019-04-06 14:51:46 +00:00 |
Alex S
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
2019-04-06 20:34:00 +07:00 |
|
Egor Kislitsyn
|
f1712cd2f1
|
Use PleromaJobQueue in Pleroma.Web.Push
|
2019-04-05 19:38:44 +07:00 |
|
Ivan Tashkinov
|
47a236f753
|
[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
|
2019-04-05 15:12:02 +03:00 |
Mark Felder
|
66e7b03372
|
Merge branch 'develop' into feature/prometheus
|
2019-04-04 15:39:42 -05:00 |
|
Mark Felder
|
5564cd421d
|
Document Prometheus
|
2019-04-04 12:19:31 -05:00 |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
2019-04-04 16:10:43 +07:00 |
|
Alex S
|
d140738edf
|
second level of headertext change in doc
|
2019-04-02 20:36:36 +07:00 |
|
Alex S
|
3465b7ba9a
|
syntax highlighting
|
2019-04-02 20:32:37 +07:00 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
|
Alex S
|
08d64b977f
|
little changes and typos
|
2019-04-02 16:13:34 +07:00 |
|
Alex S
|
851c5bf093
|
updating custom_emoji docs
|
2019-04-02 15:57:57 +07:00 |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
2019-04-01 17:17:57 +07:00 |