summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-11deps: update fast_html to 1.0.3floki-fast_html-2-electric-boogalorinpatch
2020-02-11Revert "Merge branch 'revert-3fee859b' into 'develop'"rinpatch
This reverts commit 01984d15cee6682afdb4c393ee0e6d0059bdb87c, reversing changes made to 3fee859b60d2b97e8210faf872a03d99cfc574cc.
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 '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-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-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-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-09Fix email mix task on OTP releasesrinpatch
Closes pleroma#1548
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-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-07Merge branch 'questions-timezone' into 'develop'rinpatch
Questions: Add timezone to `closed` property Closes #1552 See merge request pleroma/pleroma!2184
2020-02-07Questions: Add timezone to `closed` propertyLain Soykaf
2020-02-07deps: update plug to 1.9rinpatch
Includes functionality needed to fix upload limit not being changed at runtime: https://github.com/elixir-plug/plug/commit/087cd64d864696c74bf07f935e2ae31caec19a1e
2020-02-07Apply suggestion to docs/API/pleroma_api.mdlain
2020-02-07Apply suggestion to docs/API/pleroma_api.mdlain
2020-02-07EmojiReactions: Remove old API endpointsLain Soykaf
2020-02-07EmojiReactions: Add docs and ChangelogLain Soykaf
2020-02-07EmojiReactions: Add Mastodon-aligned reaction endpoints, change responseLain Soykaf
2020-02-07Add User.get_follow_state/2Egor Kislitsyn
2020-02-07Merge branch 'rename_emoji_reactios' into 'develop'rinpatch
EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181
2020-02-07Merge branch 'docs-fix' into 'develop'rinpatch
Fix for config.md See merge request pleroma/pleroma!2182
2020-02-07fixAlexander Strizhakov
2020-02-06EmojiReactions: Rename to EmojiReactsLain Soykaf
2020-02-06Merge branch 'update/fe-bundle-20200206' into 'develop'rinpatch
Update FE bundle See merge request pleroma/pleroma!2180
2020-02-06Update FE bundleMark Felder
2020-02-06Merge branch 'mastoapi-non-html-strings' into 'develop'feld
mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167
2020-02-06Merge branch 'fix/dymamic-docs' into 'develop'feld
Simplify in-database config docs See merge request pleroma/pleroma!2178
2020-02-06Merge branch 'config-changes' into 'develop'feld
Config changes Closes #1547 See merge request pleroma/pleroma!2174
2020-02-06Update CHANGELOGEgor Kislitsyn
2020-02-06Cancellation of a follow request for a remote userEgor Kislitsyn
2020-02-06Merge branch 'develop' into fix/dymamic-docsrinpatch
2020-02-06Simplify in-database config docsrinpatch
Large part of it was no longer true (i.e none of the changes need recompilation anymore and you can't brick an instance by changing them, it's not necessary to manually truncate the db manually anymore)
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-01 06:56:47 +0000