Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.

2020-10-21 19:10:50 +02:00

..

locale-data

[i18n] update and corrections for Occitan locale (#9404)

2018-12-01 17:39:13 +01:00

ar.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

ast.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

bg.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

bn.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

br.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

ca.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

co.json

New Crowdin updates (#14285)

2020-07-15 14:59:26 +02:00

cs.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

cy.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

da.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

de.json

New Crowdin updates (#14285)

2020-07-15 14:59:26 +02:00

defaultMessages.json

Merge branch 'master' into glitch-soc/merge-upstream

2020-10-21 19:10:50 +02:00

el.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

en.json

Merge branch 'master' into glitch-soc/merge-upstream

2020-10-21 19:10:50 +02:00

eo.json

New Crowdin updates (#14197)

2020-07-10 20:57:21 +02:00

es-AR.json

New Crowdin updates (#14285)

2020-07-15 14:59:26 +02:00

es.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

et.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

eu.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

fa.json

New Crowdin updates (#14285)

2020-07-15 14:59:26 +02:00

fi.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

fr.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

ga.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

gl.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

he.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

hi.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

hr.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

hu.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

hy.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

id.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

index.js

Finalized theme loading and stuff

2017-11-20 22:13:37 -08:00

io.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

is.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

it.json

New Crowdin updates (#14285)

2020-07-15 14:59:26 +02:00

ja.json

Merge branch 'master' into glitch-soc/merge-upstream

2020-10-21 19:10:50 +02:00

ka.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

kab.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

kk.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

kn.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

ko.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

ku.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

lt.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

lv.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

mk.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

ml.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

mr.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

ms.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

nl.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

nn.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

no.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

oc.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

pl.json

Merge branch 'master' into glitch-soc/merge-upstream

2020-07-22 13:38:17 +02:00

pt-BR.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

pt-PT.json

New Crowdin updates (#14285)

2020-07-15 14:59:26 +02:00

ro.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

ru.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

sc.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

sk.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

sl.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

sq.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

sr-Latn.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

sr.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

sv.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

szl.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

ta.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

tai.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

te.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

th.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

tr.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

ug.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

uk.json

ran yarn manage:translations (#14344)

2020-07-18 19:01:16 +02:00

ur.json

reword "boost to original audience" as per #14596 (#14598)

2020-08-23 00:08:31 +02:00

vi.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

whitelist_ar.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ast.json

Weblate translations (2018-07-25) (#8065)

2018-07-24 20:47:13 +02:00

whitelist_bg.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_bn.json

Weblate translations (2019-03-24) (#10362)

2019-03-24 18:44:59 +01:00

whitelist_br.json

New Crowdin translations (#11799)

2019-09-16 15:11:01 +02:00

whitelist_ca.json

Fix minor Japanese translations (#3099)

2017-05-17 17:50:39 +02:00

whitelist_co.json

Add Corsican localization (#7390)

2018-05-07 01:34:19 +02:00

whitelist_cs.json

Weblate translations (2018-07-11) (#7992)

2018-07-11 01:14:38 +02:00

whitelist_cy.json

Weblate translations (2018-08-31) (#8535)

2018-08-31 04:28:29 +02:00

whitelist_da.json

Weblate translations (2018-07-11) (#7992)

2018-07-11 01:14:38 +02:00

whitelist_de.json

Add German translations (#11043)

2019-06-10 21:36:20 +02:00

whitelist_el.json

Add el and te (#7332)

2018-05-03 15:54:10 +02:00

whitelist_en.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_eo.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_es-AR.json

New Crowdin translations (#11985)

2019-09-29 17:10:01 +02:00

whitelist_es.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_et.json

New Crowdin translations (#11305)

2019-08-17 22:02:37 +02:00

whitelist_eu.json

Add el and te (#7332)

2018-05-03 15:54:10 +02:00

whitelist_fa.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_fi.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_fr.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ga.json

New Crowdin translations (#11861)

2019-09-20 23:05:23 +02:00

whitelist_gl.json

Weblate translations (#5946)

2017-12-09 15:35:22 +01:00

whitelist_he.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_hi.json

Add hi.json (#10573)

2019-04-21 04:52:20 +02:00

whitelist_hr.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_hu.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_hy.json

Weblate translations (#6323)

2018-01-22 14:20:58 +01:00

whitelist_id.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_io.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_is.json

New Crowdin translations (#12378)

2020-01-12 15:18:03 +01:00

whitelist_it.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ja.json

Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org (#3725)

2017-06-13 03:55:28 +02:00

whitelist_ka.json

Add Georgian language translation (#8250)

2018-08-18 01:00:01 +09:00

whitelist_kab.json

New Crowdin translations (#12378)

2020-01-12 15:18:03 +01:00

whitelist_kk.json

Weblate translations (2019-02-23) (#10103)

2019-02-23 18:41:28 +01:00

whitelist_kn.json

New Crowdin translations (#12146)

2019-11-13 23:24:55 +01:00

whitelist_ko.json

i18n: Add korean translation (#4064)

2017-07-04 16:11:23 +02:00

whitelist_ku.json

New Crowdin updates (#14197)

2020-07-10 20:57:21 +02:00

whitelist_lt.json

New Crowdin translations (#11060)

2019-06-12 15:56:18 +02:00

whitelist_lv.json

Weblate translations (2019-01-08) (#9758)

2019-01-08 14:09:57 +01:00

whitelist_mk.json

New Crowdin translations (#12047)

2019-10-03 03:36:52 +02:00

whitelist_ml.json

New Crowdin translations (#12146)

2019-11-13 23:24:55 +01:00

whitelist_mr.json

New Crowdin translations (#12146)

2019-11-13 23:24:55 +01:00

whitelist_ms.json

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00

whitelist_nl.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_nn.json

New Crowdin translations (#11799)

2019-09-16 15:11:01 +02:00

whitelist_no.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_oc.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_pl.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_pt-BR.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_pt-PT.json

New Crowdin translations (#11799)

2019-09-16 15:11:01 +02:00

whitelist_ro.json

Weblate translations (2018-09-01) (#8561)

2018-09-02 03:14:46 +02:00

whitelist_ru.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_sc.json

New Crowdin translations (#13398)

2020-05-13 22:35:20 +02:00

whitelist_sk.json

Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)

2018-01-03 21:00:39 +09:00

whitelist_sl.json

Weblate translations (2018-05-10) (#7438)

2018-05-10 14:48:26 +02:00

whitelist_sq.json

Weblate translations (2019-02-11) (#10007)

2019-02-11 07:41:35 +01:00

whitelist_sr-Latn.json

Fix RFC 5646 Regular Expression (#6190)

2018-01-05 04:43:50 +01:00

whitelist_sr.json

Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)

2018-01-03 21:00:39 +09:00

whitelist_sv.json

Add Japanese translations (#5810)

2017-11-25 03:39:57 +01:00

whitelist_szl.json

New Crowdin translations (#13749)

2020-07-02 00:45:15 +02:00

whitelist_ta.json

Weblate translations (2018-09-02) (#8577)

2018-09-02 18:20:26 +02:00

whitelist_tai.json

New Crowdin translations (#13749)

2020-07-02 00:45:15 +02:00

whitelist_te.json

Add el and te (#7332)

2018-05-03 15:54:10 +02:00

whitelist_th.json

Add th.json. (#3588)

2017-06-05 17:02:41 +02:00

whitelist_tr.json

Fix duplicated values in nl.json (#2931)

2017-05-09 14:12:35 +02:00

whitelist_ug.json

New Crowdin updates (#14197)

2020-07-10 20:57:21 +02:00

whitelist_uk.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_ur.json

New Crowdin translations (#12146)

2019-11-13 23:24:55 +01:00

whitelist_vi.json

New Crowdin translations (#12378)

2020-01-12 15:18:03 +01:00

whitelist_zh-CN.json

Add final newline to locale files (#2890)

2017-05-07 19:55:47 +02:00

whitelist_zh-HK.json

Fix regular expression for RFC 5646 (regression from #3604) (#4133)

2017-07-10 14:02:18 +02:00

whitelist_zh-TW.json

Add zh-TW.json (#3459)

2017-05-30 23:09:02 +02:00

zh-CN.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

zh-HK.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00

zh-TW.json

New Crowdin updates (#14335)

2020-07-24 12:46:46 +02:00