aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-10Merge branch 'release/1.1.8' into 'stable'v1.1.8lain
Release/1.1.8 See merge request pleroma/pleroma!2096
2020-01-10Update version to 1.1.8lain
2020-01-101.1.8 Changeloglain
2020-01-10Fix captcha time, which was meant to be 5 minutesMark Felder
2020-01-10Update `captcha` dependencyEgor Kislitsyn
2020-01-10Add Kocaptcha endpoint to config.exsEgor Kislitsyn
2019-12-14Merge branch 'release/1.1.7' into 'stable'v1.1.7rinpatch
Release/1.1.7 See merge request pleroma/pleroma!2065
2019-12-13remove a random testrinpatch
it's was already removed from develop in 4e535209172bb5460353fe011c06d127cfaa5847
2019-12-13Add Kocaptcha endpoint to the test configrinpatch
2019-12-13.gitlab-ci.yml: bump rum postgres to non-bugged version and disablerinpatch
--trace
2019-12-13mix.exs: bump version to 1.1.7rinpatch
2019-12-13changelog: add entry for bundled pleroma-fe changes on 1.1.7rinpatch
2019-12-13pleroma-fe bundle: update to 36910935727ad75616a60bfb4a1622df6a686b7brinpatch
2019-12-13changelog: entry for 1.1.7rinpatch
2019-12-13Add native captcha and enable it by default.Egor Kislitsyn
2019-12-13report federating status in nodeinfohref
2019-12-13Set better Cache-Control header for static contentrinpatch
Closes #1382
2019-12-13OTP releases: only set name and distribution type if not set alreadyrinpatch
Fixes not being able to run two OTP releases on one machine because of the name conflict.
2019-12-13OTP: Fix runtime upload limit config being ignoredrinpatch
Closes #1109
2019-11-19Merge branch 'release/1.1.6' into 'stable'v1.1.6rinpatch
Release/1.1.6 See merge request pleroma/pleroma!1995
2019-11-19changelog: fix wrong header levelsrinpatch
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-19mix.exs: bump version to 1.1.6rinpatch
2019-11-19UserEnabledPlug: fix test after backportingrinpatch
We didn't get rid of user info on stable yet
2019-11-19Add a changelog entry for email confirmation fixrinpatch
2019-11-19OAuthPlug, Router: Handle deactivated users in the UserEnabledPluglain
2019-11-19UserEnabledPlug: Don't authenticate unconfirmed users.lain
2019-11-19User: Don't let deactivated users authenticate.rinpatch
2019-11-19Add a changelog entry for oauth authorize fixrinpatch
2019-11-19Check client and token in GET /oauth/authorizeAkiraFukushima
2019-11-19Fix rendering conversations when there's a malformed statusrinpatch
2019-11-09Bump mix.exs versionv1.1.5rinpatch
2019-11-09Merge branch 'release/1.1.5' into 'stable'rinpatch
Release/1.1.5 See merge request pleroma/pleroma!1954
2019-11-09Add a changelog entry about frontend bundle updaterinpatch
2019-11-09Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642rinpatch
2019-11-09object containment: handle all cases where ID is invalid (missing, nil, ↵Ariadne Conill
non-string)
2019-11-08Add changelog for 1.1.5rinpatch
2019-11-08Bump HtmlEntities to 0.5rinpatch
This release brings a major performance imrovement, see https://github.com/martinsvalin/html_entities/pull/17
2019-11-08Object Fetcher: set cache after reinjectingrinpatch
Probably fixes the issue hj had, where polls would have different counters between endpoints.
2019-11-08Fix TrailingFormatPlug not being active for /api/oauth_tokensrinpatch
2019-11-05Merge branch 'release/1.1.4' into 'stable'v1.1.4lain
Release/1.1.4 - user.info fix plus NOT NULL for user.info See merge request pleroma/pleroma!1927
2019-11-04Apply suggestion to CHANGELOG.mdlain
2019-11-04Migrations: Don't copy over mutes unless there actually are some.lain
2019-11-04streamer: use direct object for filter checks when there is no valid child ↵Ariadne Conill
object in an activity We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291
2019-11-04Migrations: Add a fixup migration for the muted_notificationslain
This sets info->muted_notifications to an emtpy array if it is explicitly set to null before. This can happen when safe_jsonb_set coalesces to a jsonb null, which will make ecto not use the default value of [] anymore because it has been explicitly overwritten.
2019-11-01Fix bookmark migration using a query with a schemarinpatch
This resulted in failures when updating from Pleroma <1.0 because of all the new fields that were added to the user schema.
2019-11-01Tests: Fix tests failing because of info being null.lain
2019-11-01Mixfile: Bump version.lain
2019-11-01Changelog: Add information about user.info migration.lain
2019-11-01Migrations: Add migration to fill empty info fields and make them non-null.lain