Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-01-28 | [#534] Merged `upstream/develop`. | Ivan Tashkinov | |
2019-01-28 | Update config.md | lain | |
2019-01-27 | docs/Pleroma-API.md: Add note about emoji endpoints similarities | Haelwenn (lanodan) Monnier | |
[ci skip] | |||
2019-01-25 | [#534] Configurable outgoing federation reachability timeout. | Ivan Tashkinov | |
2019-01-23 | New frontend configuration mechanism. | lain | |
2019-01-18 | Fix merge conflict | rinpatch | |
2019-01-17 | Make attachment links configurable | Mark Felder | |
Thanks @href! | |||
2019-01-17 | Introduce optional unfurling of nsfw content | rinpatch | |
2019-01-16 | Add config doc | rinpatch | |
2019-01-11 | Fix spellign. | scarlett | |
2019-01-09 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵ | Egor Kislitsyn | |
feature/pinned-posts # Conflicts: # docs/config.md | |||
2019-01-08 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵ | Egor Kislitsyn | |
feature/pinned-posts | |||
2019-01-08 | add default configuration for the pinned statuses and some doc | Egor Kislitsyn | |
2019-01-08 | Add a setting for users to autofollow on sign up. | lain | |
2019-01-06 | config/config.exs: Add syslog backends | Haelwenn (lanodan) Monnier | |
2019-01-03 | Merge branch 'captcha' into 'develop' | rinpatch | |
Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585 | |||
2019-01-01 | Add documentation. | lain | |
2018-12-31 | Add docs/Admin-API.md | Haelwenn (lanodan) Monnier | |
[ci skip] | |||
2018-12-26 | Add some hard limits on inserted activities. | lain | |
2018-12-23 | Renamed the things | Karen Konou | |
2018-12-23 | Add documentation | Karen Konou | |
2018-12-21 | Make captcha (kocaptcha) stateless | Ekaterina Vaartis | |
Also rename seconds_retained to seconds_valid since that's how it is now. Put it down from 180 to 20 seconds. The answer data is now stored in an encrypted text transfered to the client and back, so no ETS is needed | |||
2018-12-20 | Merge branch '114_email_confirmation' into 'develop' | kaniini | |
[#114] Email confirmation See merge request pleroma/pleroma!546 | |||
2018-12-20 | Merge branch 'documentation/copy-pleroma-api' into 'develop' | kaniini | |
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints See merge request pleroma/pleroma!571 | |||
2018-12-18 | Pleroma-API.md: Additionnal endpoints | rinpatch | |
2018-12-18 | Move to docs | Haelwenn (lanodan) Monnier | |
2017-01-01 | Provide plaintext representations of content/cw in MastoAPI | rinpatch | |
2019-04-08 | Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush | Egor Kislitsyn | |
2019-04-08 | Merge 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-08 | Merge branch 'twitter_oauth' into 'develop' | lambda | |
OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923 | |||
2019-04-08 | Merge branch 'feature/770-add-emoji-tags' into 'develop' | lambda | |
Feature/770 add emoji tags See merge request pleroma/pleroma!998 | |||
2019-04-08 | Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush | Egor Kislitsyn | |
2019-04-08 | Merge branch 'develop' into use-jobs-in-webpush | Egor 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-08 | Merge 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-06 | Add scheduler for sending scheduled activities to the queue | eugenijm | |
2019-04-06 | Added limits and media attachments for scheduled activities. | eugenijm | |
2019-04-06 | Merge branch 'feature/prometheus' into 'develop' | feld | |
Upstream: Metrics and debugging See merge request pleroma/pleroma!1020 | |||
2019-04-06 | Merge develop to 770-add-emoji-tags | Alex S | |
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs | |||
2019-04-05 | Use PleromaJobQueue in Pleroma.Web.Push | Egor Kislitsyn | |
2019-04-05 | [#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme. | Ivan Tashkinov | |
2019-04-04 | Merge branch 'develop' into feature/prometheus | Mark Felder | |
2019-04-04 | Document Prometheus | Mark Felder | |
2019-04-04 | Improve Transmogrifier.upgrade_user_from_ap_id/2 | Egor Kislitsyn | |
2019-04-02 | second level of headertext change in doc | Alex S | |
2019-04-02 | syntax highlighting | Alex S | |
2019-04-02 | Merge develop into feature/770-add-emoji-tags | Alex S | |
2019-04-02 | little changes and typos | Alex S | |
2019-04-02 | updating custom_emoji docs | Alex S | |