summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-13FormattingMark Felder
2020-02-13FormattingMark Felder
2020-02-13Update description.exsfeld
2020-02-13Apply suggestion to config/description.exsfeld
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-11First round at cleaning up descriptionsMark Felder
2020-02-11Merge branch 'restore-twitter-api-tests' into 'develop'feld
Restore TwitterAPI tests Closes #1257 See merge request pleroma/pleroma!2200
2020-02-12Restore TwitterAPI testsEgor Kislitsyn
2020-02-11Merge branch 'update/admin-fe-20200211' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2198
2020-02-11Hotlink logo instead of attachmentEgor Kislitsyn
2020-02-11Merge branch 'revert-3fee859b' into 'develop'lain
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" See merge request pleroma/pleroma!2199
2020-02-11Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"feld
This reverts merge request !2194
2020-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Mark Felder
update/admin-fe-20200211
2020-02-11Update AdminFE buildMark Felder
2020-02-11Merge branch 'feat/floki-fasthtml' into 'develop'lain
Make Floki use fast_html See merge request pleroma/pleroma!2194
2020-02-11Make Floki use fast_htmlrinpatch
2020-02-11deps: update fast_sanitize to 0.1.7rinpatch
needed to get new fast_html version since 1.0.1 had an attribute parsing bug
2020-02-11deps: update floki to 0.25.0rinpatch
needed to make it use fast_html
2020-02-11Merge branch 'uguu-uwu-notices-bulge' into 'develop'lain
EmojiReactions: Align API endpoints See merge request pleroma/pleroma!2183
2020-02-11Update frontendlain
2020-02-11Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulgelain
2020-02-11Merge branch 'doc/unlisted-search' into 'develop'lain
differences_in_mastoapi_responses.md: Add note about unlisted results Closes #1164 See merge request pleroma/pleroma!2195
2020-02-11Merge branch 'oban-crontab-fix' into 'develop'lain
Set oban crontab to false in tests See merge request pleroma/pleroma!2197
2020-02-11Merge branch 'develop' into feature/new-registrations-digestEgor Kislitsyn
2020-02-11set oban crontab to false in testsAlexander Strizhakov
2020-02-11Merge branch 'docs/kyclos' into 'develop'lain
clients.md: Add Kyclos See merge request pleroma/pleroma!2196
2020-02-11Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-11clients.md: Add KyclosHaelwenn (lanodan) Monnier
2020-02-11differences_in_mastoapi_responses.md: Add note about unlisted resultsHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
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 'docs_backup_restore' into 'develop'Haelwenn
DOCS Backup/Restore/Migrate your instance See merge request pleroma/pleroma!2107
2020-02-10DOCS Backup/Restore/Migrate your instanceIlja
* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server * Added an optional step to reinstall pleroma (esp. for migrating servers) * Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types' * I added a new step to drop and recreate an empty pleroma-database * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15
2020-02-10Merge branch 'fix/compilation-error-docs' into 'develop'rinpatch
Fix a compilation error under certain circumstances See merge request pleroma/pleroma!2193
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-10[#1505] Improved replies-handling tests: updated Mastodon message fixture, ↵Ivan Tashkinov
used exact Pleroma federation message.
2020-02-10removed a commentsMaksim Pechnikov
2020-02-10maked `unread_count` as virtual fieldMaksim Pechnikov
2020-02-10Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-09[#1505] Removed wrapping of reply URIs into `first` element, added comments ↵Ivan Tashkinov
to transmogrifier tests.
2020-02-09Merge branch 'release/1.1.9' into 'stable'rinpatch
Release/1.1.9 See merge request pleroma/pleroma!2189
2020-02-09Merge branch 'fix/email-task-otp' into 'develop'rinpatch
Fix email mix task on OTP releases Closes #1548 See merge request pleroma/pleroma!2191
2020-02-09[#1505] Minor refactoring.Ivan Tashkinov
2020-02-09mix.exs: bump version to 1.1.9rinpatch
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-09changelog: add entry for 1.1.9rinpatch
2020-02-09Actually fix upload limit on OTP releasesrinpatch
Closes #1109
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 15:21:35 +0000