aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-02-27Do not fail when user has no emailEgor Kislitsyn
2020-02-26Admin API: Exclude boosts from `GET ↵eugenijm
/api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
2020-02-26Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts ↵eugenijm
`godmode` and `local_only`)
2020-02-26Allow account registration without an emailEgor Kislitsyn
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2020-02-25Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility ↵eugenijm
scope
2020-02-24open conn in separate taskAlexander Strizhakov
2020-02-24Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'lain
Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236
2020-02-24Captcha: return invalid when answer_data is nilHaelwenn (lanodan) Monnier
2020-02-22[#1560] Restricted AP- & OStatus-related routes for non-federating instances.Ivan Tashkinov
2020-02-22Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # CHANGELOG.md # config/config.exs
2020-02-21fix for timeout clauseAlexander Strizhakov
2020-02-21hackney pool timeoutAlexander Strizhakov
2020-02-21don't log info ssl messagesAlexander Strizhakov
2020-02-21more info in Connections.checkin timout errorsAlexander Strizhakov
2020-02-21by default don't use gun retriesAlexander Strizhakov
remove conn depends on retry setting from config
2020-02-21Merge branch 'develop' into gunAlexander Strizhakov
2020-02-20Merge branch 'single_emoji_reaction' into 'develop'Haelwenn
Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226
2020-02-20Merge branch 'require-signature' into 'develop'lain
Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071
2020-02-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123
2020-02-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # config/config.exs
2020-02-20Merge branch 'feature/new-registrations-digest' into 'develop'lain
New users digest email Closes #1514 See merge request pleroma/pleroma!2128
2020-02-20[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3Ivan Tashkinov
2020-02-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-19removing retry option and changing some logger messages levelsAlexander Strizhakov
2020-02-18SpellingMark Felder
2020-02-18Merge branch 'develop' into gunMark Felder
2020-02-18Merge branch 'fix/status-view/expires_at' into 'develop'lain
Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation
2020-02-18Merge branch 'chore/standardize-mrf-behavior' into 'develop'lain
Standardize @behaviour usage in MRFs See merge request pleroma/pleroma!2212
2020-02-18Merge branch 'need-reboot-flag' into 'develop'lain
need_reboot flag for adminFE See merge request pleroma/pleroma!2188
2020-02-18Fix `status.expires_at` typeEgor Kislitsyn
2020-02-18adding gun adapterAlexander Strizhakov
2020-02-17Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-16Use floki's new APIs for parsing fragmentsrinpatch
2020-02-15[#1505] Restricted max thread distance for fetching replies on incoming ↵Ivan Tashkinov
federation (in addition to reply-to depth restriction).
2020-02-15MastodonAPI.StatusView: Do not use site_nameHaelwenn (lanodan) Monnier
site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
2020-02-14Standardize @behaviour usage in MRFsMark Felder
2020-02-13Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'rinpatch
NodeInfo: Fix federating status not being reported when MRF transparency is disabled Closes #1568 See merge request pleroma/pleroma!2206
2020-02-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-13NodeInfo: Fix federating status not being reported when MRFrinpatch
transparency is disabled Closes #1568
2020-02-13Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'feld
# Conflicts: # config/description.exs
2020-02-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-12Fix `status.expires_in` validationEgor Kislitsyn
2020-02-11Fix the confusingly named and inverted logic of "no_attachment_links"Mark Felder
The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare.
2020-02-11Hotlink logo instead of attachmentEgor Kislitsyn
2020-02-11Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"feld
This reverts merge request !2194
2020-02-11Make Floki use fast_htmlrinpatch
2020-02-11Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulgelain