1. 06 May, 2022 2 commits
    • Jyrki's avatar
      update sidekiq-undertaker to 1.3 · 400e5a29
      Jyrki authored
      400e5a29
    • Jyrki's avatar
      Merge remote-tracking branch 'glitch-soc/main' into changes · 1150ad5b
      Jyrki authored
       Conflicts:
      	.env.production.sample
      	Gemfile.lock
      	app/controllers/auth/registrations_controller.rb
      	app/javascript/mastodon/features/account/components/header.js
      	app/javascript/mastodon/features/compose/components/compose_form.js
      	app/javascript/mastodon/features/compose/components/search_results.js
      	app/javascript/mastodon/locales/defaultMessages.json
      	app/javascript/mastodon/locales/en.json
      	app/validators/poll_validator.rb
      	app/validators/status_length_validator.rb
      	config/initializers/content_security_policy.rb
      	config/locales/ga.yml
      	config/locales/simple_form.id.yml
      	lib/mastodon/version.rb
      
      most of these conflicts are our post->awoo replacements or hCaptcha related
      which glitch-soc handles a bit differently
      1150ad5b
  2. 05 May, 2022 1 commit
  3. 04 May, 2022 9 commits
  4. 03 May, 2022 21 commits
  5. 02 May, 2022 5 commits
    • Claire's avatar
      Fix ArgumentError when processing pinned posts from Friendica (#18260) · 0597e5db
      Claire authored
      Follow-up to #18254
      0597e5db
    • Claire's avatar
      Add ability to set approval-based registration through tootctl (#18248) · bc19c083
      Claire authored
      Fixes #18235
      
      Add `tootctl settings registrations approved` with
      optional `--require-reason` switch.
      bc19c083
    • Claire's avatar
      Fix compatibility with Friendica regarding pinned posts (#18254) · 71d02ffc
      Claire authored
      * Fix multiple database queries when fetching pinned posts for remote account
      
      * Fix compatibility with Friendica regarding pinned posts
      
      Fixes #18066
      
      * Add tests
      71d02ffc
    • Eugen Rochko's avatar
      New Crowdin updates (#18213) · 6b7765a7
      Eugen Rochko authored
      
      
      * New translations activerecord.en.yml (Ido)
      
      * New translations en.json (Ido)
      
      * New translations activerecord.en.yml (Ido)
      
      * New translations en.json (Ido)
      
      * New translations en.json (Ido)
      
      * New translations en.json (Ido)
      
      * New translations en.json (Ido)
      
      * New translations en.json (Ido)
      
      * New translations en.yml (Armenian)
      
      * New translations en.json (Armenian)
      
      * New translations en.yml (Russian)
      
      * New translations en.yml (Armenian)
      
      * New translations en.json (Armenian)
      
      * New translations en.yml (Armenian)
      
      * New translations en.json (Japanese)
      
      * New translations en.json (Armenian)
      
      * New translations en.yml (Armenian)
      
      * New translations en.json (Japanese)
      
      * New translations doorkeeper.en.yml (Armenian)
      
      * New translations simple_form.en.yml (Sorani (Kurdish))
      
      * New translations simple_form.en.yml (Sorani (Kurdish))
      
      * New translations en.json (Spanish)
      
      * New translations en.json (Portuguese)
      
      * New translations en.yml (Chinese Simplified)
      
      * New translations en.json (Portuguese)
      
      * New translations devise.en.yml (Chinese Simplified)
      
      * New translations en.json (Portuguese)
      
      * New translations en.yml (Portuguese)
      
      * New translations en.yml (Portuguese)
      
      * New translations en.yml (Polish)
      
      * New translations doorkeeper.en.yml (Japanese)
      
      * New translations activerecord.en.yml (Japanese)
      
      * New translations devise.en.yml (Japanese)
      
      * New translations doorkeeper.en.yml (Japanese)
      
      * New translations simple_form.en.yml (Japanese)
      
      * New translations simple_form.en.yml (Japanese)
      
      * New translations en.json (Japanese)
      
      * New translations simple_form.en.yml (Japanese)
      
      * New translations en.json (Japanese)
      
      * New translations en.json (Galician)
      
      * New translations en.json (Japanese)
      
      * New translations en.json (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Japanese)
      
      * New translations simple_form.en.yml (Japanese)
      
      * New translations devise.en.yml (Japanese)
      
      * New translations en.yml (Scottish Gaelic)
      
      * New translations en.json (Scottish Gaelic)
      
      * New translations simple_form.en.yml (Scottish Gaelic)
      
      * New translations activerecord.en.yml (Scottish Gaelic)
      
      * New translations devise.en.yml (Scottish Gaelic)
      
      * New translations doorkeeper.en.yml (Scottish Gaelic)
      
      * New translations en.yml (Danish)
      
      * New translations en.yml (Danish)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Icelandic)
      
      * New translations en.json (Icelandic)
      
      * New translations en.json (Icelandic)
      
      * New translations en.yml (Icelandic)
      
      * New translations simple_form.en.yml (Icelandic)
      
      * New translations en.json (Icelandic)
      
      * New translations en.json (Icelandic)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Icelandic)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Icelandic)
      
      * New translations simple_form.en.yml (Icelandic)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Welsh)
      
      * New translations en.json (Czech)
      
      * New translations en.json (German)
      
      * New translations en.json (Czech)
      
      * New translations en.json (Czech)
      
      * New translations en.json (Czech)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations en.json (Icelandic)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations en.yml (Korean)
      
      * New translations en.yml (Hungarian)
      
      * New translations en.yml (Georgian)
      
      * New translations en.yml (Lithuanian)
      
      * New translations en.yml (Macedonian)
      
      * New translations en.yml (Dutch)
      
      * New translations en.yml (Norwegian)
      
      * New translations en.yml (Punjabi)
      
      * New translations en.yml (Albanian)
      
      * New translations en.yml (Basque)
      
      * New translations en.yml (Serbian (Cyrillic))
      
      * New translations en.yml (Turkish)
      
      * New translations en.yml (Ukrainian)
      
      * New translations en.yml (Chinese Traditional)
      
      * New translations en.yml (Urdu (Pakistan))
      
      * New translations en.yml (Portuguese, Brazilian)
      
      * New translations en.yml (Indonesian)
      
      * New translations en.yml (Tamil)
      
      * New translations en.yml (Spanish, Argentina)
      
      * New translations en.yml (Finnish)
      
      * New translations en.yml (Greek)
      
      * New translations en.yml (Galician)
      
      * New translations en.yml (Slovak)
      
      * New translations en.yml (Swedish)
      
      * New translations en.yml (Arabic)
      
      * New translations en.yml (French)
      
      * New translations en.yml (Spanish)
      
      * New translations en.yml (Catalan)
      
      * New translations en.yml (Hebrew)
      
      * New translations en.yml (Italian)
      
      * New translations en.yml (Slovenian)
      
      * New translations en.yml (German)
      
      * New translations en.yml (Vietnamese)
      
      * New translations en.yml (Thai)
      
      * New translations en.yml (Occitan)
      
      * New translations en.yml (Persian)
      
      * New translations en.yml (Romanian)
      
      * New translations en.yml (Afrikaans)
      
      * New translations en.yml (Bulgarian)
      
      * New translations en.yml (Czech)
      
      * New translations en.yml (Spanish, Mexico)
      
      * New translations en.yml (Bengali)
      
      * New translations en.yml (Cornish)
      
      * New translations en.yml (Irish)
      
      * New translations en.yml (Standard Moroccan Tamazight)
      
      * New translations en.yml (Silesian)
      
      * New translations en.yml (Taigi)
      
      * New translations en.yml (Ido)
      
      * New translations en.yml (Kabyle)
      
      * New translations en.yml (Sanskrit)
      
      * New translations en.yml (Sardinian)
      
      * New translations en.yml (Corsican)
      
      * New translations en.yml (Sorani (Kurdish))
      
      * New translations en.yml (Kurmanji (Kurdish))
      
      * New translations en.yml (Serbian (Latin))
      
      * New translations en.yml (Asturian)
      
      * New translations en.yml (Kannada)
      
      * New translations en.yml (Sinhala)
      
      * New translations en.yml (Marathi)
      
      * New translations en.yml (Malay)
      
      * New translations en.yml (Croatian)
      
      * New translations en.yml (Norwegian Nynorsk)
      
      * New translations en.yml (Kazakh)
      
      * New translations en.yml (Estonian)
      
      * New translations en.yml (Latvian)
      
      * New translations en.yml (Hindi)
      
      * New translations en.yml (Telugu)
      
      * New translations en.yml (Breton)
      
      * New translations en.yml (Welsh)
      
      * New translations en.yml (Esperanto)
      
      * New translations en.yml (Uyghur)
      
      * New translations en.yml (Chinese Traditional, Hong Kong)
      
      * New translations en.yml (Tatar)
      
      * New translations en.yml (Malayalam)
      
      * New translations en.yml (English, United Kingdom)
      
      * New translations en.yml (Chinese Traditional)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations en.yml (Ido)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations en.yml (Korean)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations doorkeeper.en.yml (Ido)
      
      * New translations en.yml (Japanese)
      
      * New translations en.yml (Turkish)
      
      * New translations en.yml (Chinese Simplified)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations en.json (Chinese Simplified)
      
      * New translations en.yml (Vietnamese)
      
      * New translations en.yml (Greek)
      
      * New translations en.yml (Catalan)
      
      * New translations en.yml (French)
      
      * New translations en.yml (Spanish)
      
      * New translations en.yml (Polish)
      
      * New translations doorkeeper.en.yml (Persian)
      
      * New translations en.yml (Czech)
      
      * New translations en.yml (Icelandic)
      
      * New translations en.json (Icelandic)
      
      * New translations en.yml (Russian)
      
      * New translations en.yml (Hungarian)
      
      * New translations en.yml (Swedish)
      
      * New translations en.yml (Indonesian)
      
      * New translations en.yml (Swedish)
      
      * New translations en.yml (Welsh)
      
      * New translations en.json (Swedish)
      
      * New translations en.yml (Danish)
      
      * New translations en.yml (Galician)
      
      * Run `yarn manage:translations`
      
      * Run `bundle exec i18n-tasks normalize`
      Co-authored-by: default avatarYamagishi Kazutoshi <ykzts@desire.sh>
      6b7765a7
    • Yamagishi Kazutoshi's avatar
      Add translatable string for #17431 (#18227) · fe6a5b0d
      Yamagishi Kazutoshi authored
      
      
      * Add translatable string for #17431
      
      * Update config/locales/en.yml
      Co-authored-by: default avatarEugen Rochko <eugen@zeonfederated.com>
      Co-authored-by: default avatarEugen Rochko <eugen@zeonfederated.com>
      fe6a5b0d
  6. 01 May, 2022 2 commits