aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-15changelog.md: add 2.0.1 entryrinpatch
2020-03-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15Update AdminFEMark Felder
2020-03-15Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
Fix Cache Control headers on media See merge request pleroma/pleroma!2295
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-03-15pleroma_api.md: direct_conversation_id vs. conversation_idHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15Fix hashtags WebSocket streamingEgor Kislitsyn
2020-03-15Fix static FE plug to handle missing Accept header.Phil Hagelberg
2020-03-15Formatting: Do not use \n and prefer <br> insteadHaelwenn (lanodan) Monnier
It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15Revert "Set better Cache-Control header for static content"rinpatch
On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613
2020-03-15Merge branch 'docs/new_user' into 'develop'rinpatch
CLI_tasks/user.md: Fix `pleroma.user new` documentation Closes #1621 See merge request pleroma/pleroma!2286
2020-03-15Merge branch 'fix/signup-without-email' into 'develop'feld
Allow account registration without an email See merge request pleroma/pleroma!2246
2020-03-15installation/otp_en.md: Fix pleroma.nginx target [deb]Haelwenn (lanodan) Monnier
Needs to be backported to stable. Related: https://git.pleroma.social/pleroma/pleroma-support/issues/29
2020-03-15Fix enforcement of character limitsMark Felder
2020-03-15Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch
Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288
2020-03-15relay list shows hosts without accepted followAlexander Strizhakov
2020-03-15static-fe.css: Restore from before a65ee8eaHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
2020-03-15mix.exs: bump version to 2.0.1rinpatch
2020-03-08Merge branch 'release/2.0.0' into 'stable'v2.0.0rinpatch
Release/2.0.0 See merge request pleroma/pleroma!2273
2020-03-07pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6afrinpatch
2020-03-07Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'rinpatch
moderation log: fix improperly migrated data See merge request pleroma/pleroma!2277
2020-03-07moderation log: fix improperly migrated datarinpatch
Some of the actions used to have a user map as a subject, which was then changed to an array of user maps. However instead of migrating old data there was just a hack to transform it every time, moreover this hack didn't include all possible actions, which resulted in crashes. This commit fixes the crashes by introducing a proper database migration for old data. Closes #1606
2020-03-07wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-06Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'rinpatch
Remove EmojiPacks from AdminFE build See merge request pleroma/pleroma!2275
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
Once more, with feeling
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05Merge branch 'stable' into release/2.0.0rinpatch
2020-03-05version bump changelog and mix versionrinpatch
2020-03-05changelog: sync with stablerinpatch
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
MastodonController: Return 404 errors correctly. See merge request pleroma/pleroma!2270
2020-03-05Admin API tests: Fix wrong test.lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
Generate instance stats on startup Closes #1598 See merge request pleroma/pleroma!2271
2020-03-04Document the instance stats fixMark Felder
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
Do not fail when user has no email See merge request pleroma/pleroma!2249
2020-03-03Merge branch 'chore/update-copyrights' into 'develop'Haelwenn
Update Copyrights See merge request pleroma/pleroma!2269
2020-03-03Older copyright updatesMark Felder
2020-03-03Update CopyrightsMark Felder
2020-03-02Merge branch 'prepared-statements-settings' into 'develop'lain
Prepared statements settings See merge request pleroma/pleroma!2238
2020-03-02Exclude reblogs from `GET /api/pleroma/admin/statuses` by defaulteugenijm
2020-03-02Merge branch 'docs_cheatsheet_fix' into 'develop'rinpatch
fix for :fetch_initial_posts See merge request pleroma/pleroma!2266
2020-03-02fix for :fetch_initial_postsilja
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
2020-03-02Merge branch 'feature/1482-activity_pub_transactions' into 'develop'Haelwenn
ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089
2020-03-02Merge branch 'chores/bump-copyright' into 'develop'Haelwenn
Bump copyright See merge request pleroma/pleroma!2265
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-02Bump copyright years of files changed after 2019-01-01Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2020-03-01Merge branch 'docs_cheatsheet' into 'develop'rinpatch
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source See merge request pleroma/pleroma!2262
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 03:07:44 +0000