summaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)Author
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'lambda
Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019
2019-04-08Merge branch 'twitter_oauth' into 'develop'lambda
OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923
2019-04-08Merge branch 'feature/770-add-emoji-tags' into 'develop'lambda
Feature/770 add emoji tags See merge request pleroma/pleroma!998
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08Merge branch 'develop' into use-jobs-in-webpushEgor Kislitsyn
2019-04-08[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # docs/config.md # test/support/factory.ex
2019-04-08Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'lambda
# Conflicts: # config/config.exs # docs/config.md
2019-04-07[#923] Removed <br> elements from auth forms, adjusted docs, minor auth ↵Ivan Tashkinov
settings refactoring.
2019-04-06Add scheduler for sending scheduled activities to the queueeugenijm
2019-04-06Added limits and media attachments for scheduled activities.eugenijm
2019-04-06Merge branch 'feature/prometheus' into 'develop'feld
Upstream: Metrics and debugging See merge request pleroma/pleroma!1020
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-05Document the admin API endpoints for controlling follow/unfollowMark Felder
2019-04-05Use PleromaJobQueue in Pleroma.Web.PushEgor Kislitsyn
2019-04-05[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.Ivan Tashkinov
2019-04-04Merge branch 'develop' into feature/prometheusMark Felder
2019-04-04Add ability to ship logs to a Slack channelfeld
2019-04-04Document PrometheusMark Felder
2019-04-04Improve Transmogrifier.upgrade_user_from_ap_id/2Egor Kislitsyn
2019-04-02Fix preview not being usable in form datarinpatch
2019-04-02Merge branch 'feature/fake-statuses' into 'develop'lambda
Add fake status submit See merge request pleroma/pleroma!995
2019-04-02second level of headertext change in docAlex S
2019-04-02syntax highlightingAlex S
2019-04-02Merge develop into feature/770-add-emoji-tagsAlex S
2019-04-02Rename fake param to preview and make the tests check that the object was ↵rinpatch
not inserted to the db
2019-04-02little changes and typosAlex S
2019-04-02updating custom_emoji docsAlex S
2019-04-01Make only important note bold rather than the whole paragraph because it ↵rinpatch
looks better that way
2019-04-01Remove outdated howto change config and port and move it to config.md insteadrinpatch
2019-04-01restart makes no sense here as we instructed to stop the service beforerinpatch
2019-04-01Instruct to stop the service only after git pulling and getting deps to ↵rinpatch
minimize downtimes
2019-04-01change bold text to be proper geadings in introduction.mdrinpatch
2019-04-01Fix backup/restore page to have proper headingsrinpatch
2019-04-01Adding tag to emoji ets tableAlex S
changes in apis
2019-03-29document fake optionrinpatch
2019-03-29qsrinpatch
2019-03-29Improve PleromaJobQeue config documentationrinpatch
2019-03-29Replace Pleroma.Jobs with `pleroma_job_queue`Egor
2019-03-29Merge branch 'sayonara-gitlab-wiki' into 'develop'lambda
Move out of Gitlab Wiki See merge request pleroma/pleroma!990
2019-03-28Remove duplicated header from i2p.mdrinpatch
2019-03-28did it really take me 4 commits to fix this?rinpatch
2019-03-28Remove duplicated header from admin_api.mdrinpatch
2019-03-28remove admin tasks as they have their page in mix tasks category alreadyrinpatch
2019-03-28cringerinpatch
2019-03-28Move out of Gitlab Wikirinpatch
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
2019-03-27Add user show endpoint for Pleroma admin APIeugenijm
2019-03-27Add more user filters + move search to its own moduleMaxim Filippov
2019-03-22Merge branch 'safe-mentions' into 'develop'kaniini
Add safe dm mode option. See merge request pleroma/pleroma!958
2019-03-21docs: document `conversation_id` extensionWilliam Pitcock