Commit Graph

557 Commits (c6fdfbc4f14b855d9cdf2d757ff2c43282aabe90)

Author SHA1 Message Date
href 4aff4efa8d
Use multiple hackney pools
6 years ago
Haelwenn (lanodan) Monnier 7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
6 years ago
Haelwenn (lanodan) Monnier aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
6 years ago
Haelwenn (lanodan) Monnier 3f9d0c08ea
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
6 years ago
kaniini d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
6 years ago
Egor Kislitsyn 55affbca7f add a job queue
6 years ago
Ivan Tashkinov d3f9e6f6fe [#534] Merged `upstream/develop`.
6 years ago
lain bcc559e4e6 Update config.md
6 years ago
Haelwenn (lanodan) Monnier 37520e1e79
docs/Pleroma-API.md: Add note about emoji endpoints similarities
6 years ago
Ivan Tashkinov 656ed7c84a [#534] Configurable outgoing federation reachability timeout.
6 years ago
lain e221c681dc New frontend configuration mechanism.
6 years ago
rinpatch 74346a7035 Fix merge conflict
6 years ago
Mark Felder 8c368d42a2 Make attachment links configurable
6 years ago
rinpatch 4d5f15cd42 Introduce optional unfurling of nsfw content
6 years ago
rinpatch bfe2a11a6b Add config doc
6 years ago
scarlett 9eba6b96dc Fix spellign.
6 years ago
Egor Kislitsyn 48591aab98 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn 0c750bc432 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn 6428ef77ad add default configuration for the pinned statuses and some doc
6 years ago
lain 0fae04c4e3 Add a setting for users to autofollow on sign up.
6 years ago
Haelwenn (lanodan) Monnier c9b99d4486
config/config.exs: Add syslog backends
6 years ago
rinpatch b73a1a33de Merge branch 'captcha' into 'develop'
6 years ago
lain 1a0391c8a4 Add documentation.
6 years ago
Haelwenn (lanodan) Monnier 286632dfa2
Add docs/Admin-API.md
6 years ago
lain 5811e65e67 Add some hard limits on inserted activities.
6 years ago
Karen Konou c76179419d Renamed the things
6 years ago
Karen Konou c92f91ffeb Add documentation
6 years ago
Ekaterina Vaartis 336e37d98f Make captcha (kocaptcha) stateless
6 years ago
kaniini 2e2030ada8 Merge branch '114_email_confirmation' into 'develop'
6 years ago
kaniini fda148a9a2 Merge branch 'documentation/copy-pleroma-api' into 'develop'
6 years ago
rinpatch d6b133ec51
Pleroma-API.md: Additionnal endpoints
6 years ago
Haelwenn (lanodan) Monnier 6adea5a7b2
Move to docs
6 years ago
rinpatch 4a6855d9ee Provide plaintext representations of content/cw in MastoAPI
8 years ago
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
6 years ago
lambda fd45cab9ec Merge branch 'twitter_oauth' into 'develop'
6 years ago
lambda 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop'
6 years ago
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
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
6 years ago
lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
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'
6 years ago
Alex S 7410aee886 Merge develop to 770-add-emoji-tags
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
6 years ago