Code

merge upstream#234

Code

Merged

mashirozx merged 41 commits intomastermashirozx/mastodon:masterfrom devmashirozx/mastodon:devCopy head branch name to clipboardOct 16, 2020

+1,523-399

Commits

Commits on Oct 7, 2020

• Bump babel-jest from 26.3.0 to 26.5.2 (mastodon#14945)

  Show description for 9114b84
  dependabot[bot]

  authored
  9114b84

  Copy full SHA for 9114b84

• Bump @github/webauthn-json from 0.5.5 to 0.5.6 (mastodon#14946)

  Show description for 0b03ee3
  dependabot[bot]

  authored
  0b03ee3

  Copy full SHA for 0b03ee3

• Bump sass from 1.26.11 to 1.26.12 (mastodon#14947)

  Show description for e2d20be
  dependabot[bot]

  authored
  e2d20be

  Copy full SHA for e2d20be

• Bump eslint-plugin-react from 7.21.2 to 7.21.3 (mastodon#14950)

  Show description for dcaff7d
  dependabot[bot]

  authored
  dcaff7d

  Copy full SHA for dcaff7d

• Bump mini-css-extract-plugin from 0.11.0 to 0.11.3 (mastodon#14949)

  Show description for d175a3b
  dependabot[bot]

  authored
  d175a3b

  Copy full SHA for d175a3b

• Bump jest from 26.4.2 to 26.5.2 (mastodon#14951)

  Show description for 3f6ab34
  dependabot[bot]

  authored
  3f6ab34

  Copy full SHA for 3f6ab34

• Bump eslint from 7.6.0 to 7.10.0 (mastodon#14948)

  Show description for a37732e
  dependabot[bot]

  authored
  a37732e

  Copy full SHA for a37732e

• update themes

  mashirozx

  committed
  d9f8890

  Copy full SHA for d9f8890

• Remove dependency on goldfinger gem (mastodon#14919)

  Show description for 7d985f2
  Gargron

  authored
  7d985f2

  Copy full SHA for 7d985f2

• Fix unread notification marker not updating when mounting column (mastodon#14954)

  ClearlyClaire

  authored
  dac3e36

  Copy full SHA for dac3e36

Commits on Oct 9, 2020

• Fix issue checking for last unread notification when there are gaps (mastodon#14960)

  ClearlyClaire

  authored
  dc52a77

  Copy full SHA for dc52a77

• add & fix themes

  mashirozx

  committed
  c1d9995

  Copy full SHA for c1d9995

• Merge branch 'master' into dev

  mashirozx

  authored
  aeccdb6

  Copy full SHA for aeccdb6

• update theme

  mashirozx

  committed
  6271102

  Copy full SHA for 6271102

• Merge branch 'dev' of github.com:mashirozx/mastodon into dev

  mashirozx

  committed
  f3f410b

  Copy full SHA for f3f410b

• fix theme

  mashirozx

  committed
  4926488

  Copy full SHA for 4926488

• fix theme

  mashirozx

  committed
  e024c43

  Copy full SHA for e024c43

Commits on Oct 12, 2020

• Add IP-based rules (mastodon#14963)

  Gargron

  authored
  5e1364c

  Copy full SHA for 5e1364c

• Fix browser notification permission request logic (mastodon#13543)

  Show description for f54ca3d
  ClearlyClaire

  authored
  f54ca3d

  Copy full SHA for f54ca3d

• Add duration parameter to muting. (mastodon#13831)

  Show description for 9676175
  aquarla

  authored
  9676175

  Copy full SHA for 9676175

• helm: add optional cron job to run tootctl remove media (mastodon#14396)

  dunn

  authored
  53b22d2

  Copy full SHA for 53b22d2

• Change how CDN_HOST is passed down to make assets build reproducible (mastodon#14381)

  Show description for 4c45b43
  ClearlyClaire

  authored
  4c45b43

  Copy full SHA for 4c45b43

Commits on Oct 13, 2020

• handle conflict

  mashirozx

  committed
  3e5636b

  Copy full SHA for 3e5636b

• Bump compression-webpack-plugin from 6.0.2 to 6.0.3 (mastodon#14979)

  Show description for 3547009
  dependabot[bot]

  authored
  3547009

  Copy full SHA for 3547009

• Bump sass-loader from 10.0.2 to 10.0.3 (mastodon#14977)

  Show description for fc87b15
  dependabot[bot]

  authored
  fc87b15

  Copy full SHA for fc87b15

• Bump imports-loader from 1.1.0 to 1.2.0 (mastodon#14976)

  Show description for 658dbd7
  dependabot[bot]

  authored
  658dbd7

  Copy full SHA for 658dbd7

• Bump tzinfo-data from 1.2020.1 to 1.2020.2 (mastodon#14966)

  Show description for 5b131f0
  dependabot[bot]

  authored
  5b131f0

  Copy full SHA for 5b131f0

• Bump rubocop from 0.92.0 to 0.93.0 (mastodon#14967)

  Show description for 06c3d36
  dependabot[bot]

  authored
  06c3d36

  Copy full SHA for 06c3d36

• Bump file-loader from 6.1.0 to 6.1.1 (mastodon#14974)

  Show description for 5de8665
  dependabot[bot]

  authored
  5de8665

  Copy full SHA for 5de8665

• Bump eslint-plugin-react from 7.21.3 to 7.21.4 (mastodon#14968)

  Show description for a8e8ee2
  dependabot[bot]

  authored
  a8e8ee2

  Copy full SHA for a8e8ee2

• Bump terser-webpack-plugin from 4.2.2 to 4.2.3 (mastodon#14971)

  Show description for df8cbbf
  dependabot[bot]

  authored
  df8cbbf

  Copy full SHA for df8cbbf

• Bump eslint from 7.10.0 to 7.11.0 (mastodon#14975)

  Show description for 37295d5
  dependabot[bot]

  authored
  37295d5

  Copy full SHA for 37295d5

• Bump sass from 1.26.12 to 1.27.0 (mastodon#14973)

  Show description for ec1d8b7
  dependabot[bot]

  authored
  ec1d8b7

  Copy full SHA for ec1d8b7

• Bump jest from 26.5.2 to 26.5.3 (mastodon#14969)

  Show description for bb18092
  dependabot[bot]

  authored
  bb18092

  Copy full SHA for bb18092

• Fix a bear check when the activity object is nil (mastodon#14981)

  noellabo

  authored
  b4c4af1

  Copy full SHA for b4c4af1

Commits on Oct 15, 2020

• Change how missing desktop notifications permission is displayed (mastodon#14985)

  Show description for a69ca29
  Gargron

  authored
  a69ca29

  Copy full SHA for a69ca29

• Fix strings that could not be translated (mastodon#14980)

  mayaeh

  authored
  fb5f3be

  Copy full SHA for fb5f3be

Commits on Oct 16, 2020

• Fix translation string (mastodon#14986)

  mayaeh

  authored
  4130aef

  Copy full SHA for 4130aef

• update theme

  mashirozx

  committed
  abae994

  Copy full SHA for abae994

• handle conflict

  mashirozx

  committed
  9e55cba

  Copy full SHA for 9e55cba

• Merge branch 'master' into dev

  mashirozx

  authored
  fe5f6d3

  Copy full SHA for fe5f6d3