summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-13Merge branch 'fix/hashtags-streaming' into 'develop'rinpatch
Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294
2020-03-13Merge branch 'static-accept-missing' into 'develop'rinpatch
Fix static FE plug to handle missing Accept header. See merge request pleroma/pleroma!2260
2020-03-13Merge branch 'bugfix/br-vs-newline' into 'develop'rinpatch
Formatting: Do not use \n and prefer <br> instead Closes #1374 and #1375 See merge request pleroma/pleroma!2204
2020-03-13Merge branch 'revert/cache-control' into 'develop'rinpatch
Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290
2020-03-13Fix hashtags WebSocket streamingEgor Kislitsyn
2020-03-13Formatting: 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-12Merge branch 'exclude-posts-visible-to-admin' into 'develop'feld
Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272
2020-03-11Merge 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-11Merge branch 'fix/signup-without-email' into 'develop'feld
Allow account registration without an email See merge request pleroma/pleroma!2246
2020-03-11Merge 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-11Merge branch 'relay-list-change' into 'develop'feld
Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240
2020-03-11Revert "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-11using Pleroma.Config instead of etsAlexander Strizhakov
2020-03-11compile fixAlexander Strizhakov
2020-03-11merging release default config on app startAlexander Strizhakov
2020-03-11Merge branch 'docs/debian-install' into 'develop'rinpatch
installation/otp_en.md: Fix pleroma.nginx target [deb] See merge request pleroma/pleroma!2280
2020-03-11CLI_tasks: Use manpage formatting conventionsHaelwenn (lanodan) Monnier
- [] for options - <> for mandatory arguments - foo ... when foo can be repeated [ci skip]
2020-03-11CLI_tasks/user.md: Fix `pleroma.user new` documentationHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1621 [ci skip]
2020-03-11Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'Haelwenn
static-fe.css: Restore from before a65ee8ea See merge request pleroma/pleroma!2284
2020-03-11static-fe.css: Restore from before a65ee8eaHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
2020-03-10Merge branch 'fix/post-length-validation' into 'develop'lain
Fix enforcement of character limits Closes #1618 See merge request pleroma/pleroma!2283
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-10installation/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-09Merge branch 'patch-1' into 'develop'lain
Better advice for vacuuming after restoring. See merge request pleroma/pleroma!2233
2020-03-08Merge branch 'chore/mix-version-bump' into 'develop'rinpatch
mix.exs: bump version to development one See merge request pleroma/pleroma!2279
2020-03-08mix.exs: bump version to development onerinpatch
2020-03-08Merge branch 'stable' into 'develop'rinpatch
Sync develop with stable Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606 See merge request pleroma/pleroma!2278
2020-03-08Merge branch 'release/2.0.0' into 'stable'rinpatch
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-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
Wait in mix task while pleroma is rebooted See merge request pleroma/pleroma!2225
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-06Merge branch 'revert-67cc4dce' into 'develop'feld
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" See merge request pleroma/pleroma!2276
2020-03-06Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"feld
This reverts merge request !2274
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
Once more, with feeling
2020-03-06Merge branch 'update/admin-fe-without-emojipack' into 'develop'lain
Remove emoji support from AdminFE See merge request pleroma/pleroma!2274
2020-03-06Remove emoji support from AdminFEMark Felder
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-05Exclude private and direct statuses visible to the admin when using godmodeeugenijm
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 09:39:20 +0000