Age | Commit message (Collapse) | Author |
|
|
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
|
|
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
|
|
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
|
|
|
|
|
twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
|
# Conflicts:
# config/config.exs
# docs/config.md
|
|
settings refactoring.
|
|
|
|
|
|
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
|
|
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Add fake status submit
See merge request pleroma/pleroma!995
|
|
|
|
|
|
|
|
not inserted to the db
|
|
|
|
|
|
looks better that way
|
|
|
|
|
|
minimize downtimes
|
|
|
|
|
|
changes in apis
|
|
|
|
|
|
|
|
|
|
Move out of Gitlab Wiki
See merge request pleroma/pleroma!990
|
|
|
|
|
|
|
|
|
|
|
|
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
|
|
|
|
|
|
Add safe dm mode option.
See merge request pleroma/pleroma!958
|
|
|