aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-08Update AdminFE build in preparation for Pleroma 2.0.2Mark Felder
2020-04-08Merge branch 'fix-auto-link-for-profile-fields' into 'develop'rinpatch
Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352
2020-04-08CHANGELOG.md: add entries for funkwhale-related changesrinpatch
2020-04-02Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300
2020-04-02Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287
2020-04-02Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
Fix profile url for funkwhale channels, removes one source_data use Closes #1653 See merge request pleroma/pleroma!2333
2020-03-31Merge branch 'fix-testing' into 'develop'lain
Fix CI by temporarily removing federated testing See merge request pleroma/pleroma!2314
2020-03-31mix.exs bump version to 2.0.2rinpatch
2020-03-31CHANGELOG.md: Add 2.0.2 entryrinpatch
2020-03-31Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
Improve documentation of mrf_object_age See merge request pleroma/pleroma!2305
2020-03-31Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch
Fix ssl option on Ecto config breaking release See merge request pleroma/pleroma!2307
2020-03-31Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
AccountView: fix for other forms of <br> in bio Closes #1643 See merge request pleroma/pleroma!2322
2020-03-31Merge branch 'admin-api-change-password' into 'develop'lain
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149
2020-03-31Merge branch 'fix/activity-deletion' into 'develop'feld
Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328
2020-03-31Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
[#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301
2020-03-15Merge branch 'release/2.0.1' into 'stable'v2.0.1rinpatch
2.0.1 release See merge request pleroma/pleroma!2298
2020-03-16CHANGELOG.md: Add upgrade notes for 2.0.1rinpatch
2020-03-16CHANGELOG.md: Add remaining entries for 2.0.1rinpatch
2020-03-16static-fe tests: fix to work on stablerinpatch
2020-03-16rate limiter: disable based on if remote ip was found, not on if the plug ↵rinpatch
was enabled The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620
2020-03-16rip out fetch_initial_postsrinpatch
Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
static_fe: Sanitize HTML Closes #1614 See merge request pleroma/pleroma!2299
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 03:07:05 +0000