summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-31Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
2020-03-31Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch
2020-03-31Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
2020-03-31Merge branch 'admin-api-change-password' into 'develop'lain
2020-03-31Merge branch 'fix/activity-deletion' into 'develop'feld
2020-03-31Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
2020-03-15Merge branch 'release/2.0.1' into 'stable'v2.0.1rinpatch
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 was...rinpatch
2020-03-16rip out fetch_initial_postsrinpatch
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
2020-03-15changelog.md: add 2.0.1 entryrinpatch
2020-03-15pleroma_api_controller.ex: Improve conversations error reportingHaelwenn (lanodan) Monnier
2020-03-15Update AdminFEMark Felder
2020-03-15Merge branch 'fix/cache-control-headers' into 'develop'rinpatch
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
2020-03-15pleroma_api.md: direct_conversation_id vs. conversation_idHaelwenn (lanodan) Monnier
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
2020-03-15Revert "Set better Cache-Control header for static content"rinpatch
2020-03-15Merge branch 'docs/new_user' into 'develop'rinpatch
2020-03-15Merge branch 'fix/signup-without-email' into 'develop'feld
2020-03-15installation/otp_en.md: Fix pleroma.nginx target [deb]Haelwenn (lanodan) Monnier
2020-03-15Fix enforcement of character limitsMark Felder
2020-03-15Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch
2020-03-15relay list shows hosts without accepted followAlexander Strizhakov
2020-03-15static-fe.css: Restore from before a65ee8eaHaelwenn (lanodan) Monnier
2020-03-15mix.exs: bump version to 2.0.1rinpatch
2020-03-08Merge branch 'release/2.0.0' into 'stable'v2.0.0rinpatch
2020-03-07pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6afrinpatch
2020-03-07Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'rinpatch
2020-03-07moderation log: fix improperly migrated datarinpatch
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
2020-03-06Remove EmojiPacks from AdminFE buildMark 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-05Merge branch 'proper_error_messages' into 'develop'lain
2020-03-05Admin API tests: Fix wrong test.lain
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
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
2020-03-04MastodonController: Return 404 errors correctly.lain
generated by cgit v1.2.3 (git 2.44.0) at 2024-05-05 08:05:41 +0000