aboutsummaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2020-02-25instance.gen task: remind to transfer the config to the database afterrinpatch
migrations
2020-02-25instance.gen task: make instance name default to the domainrinpatch
2020-02-25Fix Dialyzer warningsEgor Kislitsyn
2020-02-24Merge branch 'fix/instance-gen-custom-static' into 'develop'rinpatch
instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237
2020-02-24instance.gen task: fix crash when using custom static directoryrinpatch
Closes #1082
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility ↵eugenijm
scope
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-22Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # CHANGELOG.md # config/config.exs
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-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-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-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-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
2020-02-11Merge branch 'develop' into feature/new-registrations-digestEgor Kislitsyn
2020-02-11Merge branch 'issue/1383' into 'develop'rinpatch
[#1383] Switch periodic jobs from quantum to oban See merge request pleroma/pleroma!2015
2020-02-10Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-10Fix a compilation error under certain circumstancesrinpatch
I've noticed that sometimes when switching from develop to stable and back, develop fails to compile and rm -r ing the _build and deps dirs doesn't help at all. This is due to Admin API controller needing to generate JSON description of the config at compile time. Evaluating `config/description.exs` calls `Generator.list_modules_in_dir/2`, which in turn predicts the module names of files in the directory and tries to convert the predicted name to *existing* atoms. Sometimes the compiler will call that function before compiling the modules in the said directory, so the conversion will of course fail. This fixes it by removing the requirement of the atoms being existent. The function is not subjected to any untrusted user input so this should be safe. An ideal fix would be to block the compilation of docs before all modules are compiled and then get a list of compiled elixir modules under the namespace we want instead of directory hacks, but I have not been able to figure out how to do that.
2020-02-09[#1505] Removed wrapping of reply URIs into `first` element, added comments ↵Ivan Tashkinov
to transmogrifier tests.
2020-02-09[#1505] Minor refactoring.Ivan Tashkinov
2020-02-09[#1505] Fixed `replies` serialization (included objects' ids instead of ↵Ivan Tashkinov
activities' ids).
2020-02-09Fix email mix task on OTP releasesrinpatch
Closes pleroma#1548
2020-02-08Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation
2020-02-08[#1505] Added tests, changelog entry, tweaked config settings related to ↵Ivan Tashkinov
replies output on outgoing federation.
2020-02-08Merge branch 'fix/upload-limit-otp' into 'develop'lain
Actually fix upload limit on OTP releases Closes #1109 See merge request pleroma/pleroma!2185
2020-02-08need_reboot flagAlexander Strizhakov
2020-02-07Actually fix upload limit on OTP releasesrinpatch
Closes #1109
2020-02-07Merge branch 'cancel-follow-request' into 'develop'Haelwenn
Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175
2020-02-07Questions: Add timezone to `closed` propertyLain Soykaf
2020-02-07EmojiReactions: Remove old API endpointsLain Soykaf