Commit Graph

16516 Commits (open-quote-links-in-same-window)

Author SHA1 Message Date
kouhai dev 6b7b80a892 update account request question prompt 2022-11-06 18:22:00 +00:00
Ariadne Conill a82113dbd9 vanilla: emoji: use 63x63 grid for emoji 2022-11-06 18:21:57 +00:00
Ariadne Conill 728ed66f8a glitch: emoji: set sprite sheet to 63x63 2022-11-06 18:21:52 +00:00
Ariadne Conill 117d2ed9c7 dockerfile: implement emoji-mart patch 2022-11-06 18:20:15 +00:00
Ariadne Conill 4c38a2d32c update emoji-mart sprite sheet for emoji 13.1 2022-11-06 18:20:15 +00:00
Ariadne Conill c01750a3dd add emoji 13.1 data for emoji-mart 2022-11-06 18:20:15 +00:00
Claire 54101563bb
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-11-06 18:49:46 +01:00
Claire 21d6bc1689 Fix status cache hydration discrepancy 2022-11-06 17:29:04 +01:00
Claire 0be6da42d3 Change glitch-soc composer classes to match upstream 2022-11-06 17:29:04 +01:00
Eugen Rochko c199387558 [Glitch] Fix colors in light theme
Port 20aa8881dc to glitch-soc
2022-11-06 17:29:04 +01:00
Eugen Rochko cbfa5ad5dd [Glitch] Fix wrong colors in the high-contrast theme
Port 1c3192df6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko c883799a1f [Glitch] Change design of link footer
Port 2d9a85db6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko d29172a682 [Glitch] Fix missing interpolation of domain in disabled account banner in web UI
Port a442f481f8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Claire b6c0ef70a2 [Glitch] Change sign-in banner to reflect disabled or moved account status
Port 312d616371 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Eugen Rochko 0437159056 [Glitch] Fix showing profile's featured tags on individual statuses
Port bfafb114a2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Claire fa293f03fa [Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
Port 7c8e2b9859 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Yamagishi Kazutoshi bd220c32f1
Update SECURITY.md (#19869) 2022-11-06 16:13:53 +01:00
Eugen Rochko 01e0cb1cd5 [Glitch] Add assets from Twemoji 14.0
Port e02812d5b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:50:23 +01:00
Sunny Ripert 8368f4857c [Glitch] Fix JavaScript console warning when loading notifications
Port 887976814a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:47:31 +01:00
Sunny Ripert 93ccb4a29e [Glitch] Fix JavaScript console error on upload editing status
Port c95d9aab56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:46:03 +01:00
Eugen Rochko 81334e2bfb [Glitch] Fix limited account hint referencing "your" server when logged out
Port 139ea4c981 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:45:00 +01:00
Claire 6b498fae46 [Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled (#19687)
Port cbb440bbc2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:43:18 +01:00
Claire e42875d195 [Glitch] Fix edits not being immediately reflected
Port 74d40c7d8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 10:42:15 +01:00
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
kouhai dev 0ae6ca72de update account request question prompt 2022-11-06 01:36:06 -07:00
Eugen Rochko 5187e4e758
Bump version to 4.0.0rc2 (#19831) 2022-11-06 06:59:56 +01:00
Eugen Rochko 3151b260e2
Fix not using GIN index for account search queries (#19830) 2022-11-06 06:16:34 +01:00
Eugen Rochko 58fc889c6f
Update changelog for 4.0.0rc1 (#19814) 2022-11-05 23:24:07 +01:00
Eugen Rochko ca8d52c2a4
Change design of new list form in web UI (#19801) 2022-11-05 23:06:32 +01:00
Justin Thomas 18ac5f1cc8
version emoji-mart (#19715)
* version emoji-mart

* add lock file
2022-11-05 23:02:41 +01:00
Eugen Rochko b5b1a202cc
Fix missing string in admin UI (#19809) 2022-11-05 23:00:48 +01:00
Hayden c8bf6192e4
Heroku fix (#19807)
Currently building on Heroku fails with a package error for libidn11. Since Mastodon uses idn-ruby 0.1.2 we should upgrade to libidn12
2022-11-05 22:57:58 +01:00
Eugen Rochko 3a41fccc43
Change `AUTHORIZED_FETCH` to not block unauthenticated REST API access (#19803)
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
2022-11-05 22:56:03 +01:00
Eugen Rochko d0c9ac3919
Fix indexing scheduler trying to index when Elasticsearch is disabled (#19805)
Fix #19646
2022-11-05 22:31:52 +01:00
Eugen Rochko d54e7ee61e
Fix n+1 queries when rendering initial state JSON (#19795) 2022-11-05 21:51:01 +01:00
Moritz Hedtke c64be9758f
helm: Add documentation to run tootctl commands (#19791) 2022-11-05 21:19:25 +01:00
Eugen Rochko d1de7fb7fa
Fix rendering empty avatar in web UI (#19798) 2022-11-05 21:18:57 +01:00
Eugen Rochko a442f481f8
Fix missing interpolation of domain in disabled account banner in web UI (#19788) 2022-11-05 21:11:35 +01:00
Eugen Rochko 7c65f52692
Change design of moved account banner in web UI (#19790) 2022-11-05 21:11:24 +01:00
eai04191 30e786225e
Remove word-break:keep-all from Dismissable banner message (#19799) 2022-11-05 21:03:58 +01:00
Claire 312d616371
Change sign-in banner to reflect disabled or moved account status (#19773) 2022-11-05 18:28:13 +01:00
Alex Nordlund 0498b106c9
Add S3 existing secret to sidekiq (#19778) 2022-11-05 17:29:20 +01:00
Yarden Shoham 29604763d7
Remove broken link references to bug bounty program (#19779)
The link https://app.intigriti.com/programs/mastodon/mastodonio/detail no longer works

* Closes #19491

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
2022-11-05 17:27:44 +01:00
Sunny Ripert 887976814a
Fix JavaScript console warning when loading notifications (#19772) 2022-11-05 13:45:06 +01:00
Sunny Ripert c95d9aab56
Fix JavaScript console error on upload editing status (#19769) 2022-11-05 13:43:47 +01:00
Claire 9616f5bb22
Fix compose form submission reloading web interface (#19762)
* Fix compose form submission reloading web interface

Fix regression introduced by #19742

* Fix various compose form buttons being handled like submit buttons

* Fix coding style issue

* Fix missing onClick prop check
2022-11-05 13:43:37 +01:00
Claire 2f8fb49d13
Fix users not being able to change their hide_followers_count setting (#1889) 2022-11-05 11:55:25 +01:00
Eugen Rochko 1e7ea50f4c
New Crowdin updates (#19627)
* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Traditional)

* New translations en.json (Urdu (Pakistan))

* New translations en.json (Vietnamese)

* New translations en.json (Galician)

* New translations en.json (Armenian)

* New translations en.yml (Irish)

* New translations en.json (Thai)

* New translations en.json (Sinhala)

* New translations en.json (Bulgarian)

* New translations en.json (Ido)

* New translations en.json (German)

* New translations en.json (Tamil)

* New translations en.json (Esperanto)

* New translations en.json (Czech)

* New translations en.json (Dutch)

* New translations en.json (Albanian)

* New translations en.json (Japanese)

* New translations en.json (Indonesian)

* New translations en.json (Romanian)

* New translations en.json (Irish)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Afrikaans)

* New translations en.json (Arabic)

* New translations en.json (Catalan)

* New translations en.json (Danish)

* New translations en.json (Greek)

* New translations en.json (Frisian)

* New translations en.json (Basque)

* New translations en.json (Finnish)

* New translations en.json (Icelandic)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Corsican)

* New translations en.json (Kannada)

* New translations en.json (Scottish Gaelic)

* New translations en.json (Asturian)

* New translations en.json (Occitan)

* New translations en.json (Serbian (Latin))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Sorani (Kurdish))

* New translations en.json (Sardinian)

* New translations en.json (Breton)

* New translations en.json (Sanskrit)

* New translations en.json (Taigi)

* New translations en.json (Silesian)

* New translations en.json (Standard Moroccan Tamazight)

* New translations activerecord.en.yml (Spanish, Mexico)

* New translations en.json (Burmese)

* New translations en.json (Cornish)

* New translations en.json (Malayalam)

* New translations en.json (Persian)

* New translations en.json (Estonian)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.json (Marathi)

* New translations en.json (Croatian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Kazakh)

* New translations en.json (Latvian)

* New translations en.json (Tatar)

* New translations en.json (Hindi)

* New translations en.json (Malay)

* New translations en.json (Telugu)

* New translations en.json (English, United Kingdom)

* New translations en.json (Welsh)

* New translations en.json (Uyghur)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Japanese)

* New translations en.json (Finnish)

* New translations en.json (Irish)

* New translations en.yml (Irish)

* New translations en.json (Portuguese)

* New translations en.json (Chinese Simplified)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Irish)

* New translations en.json (Irish)

* New translations doorkeeper.en.yml (Irish)

* New translations activerecord.en.yml (Irish)

* New translations devise.en.yml (Irish)

* New translations en.json (Greek)

* New translations en.json (Irish)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Chinese Traditional)

* New translations en.json (Galician)

* New translations en.json (French)

* New translations en.yml (French)

* New translations en.json (Italian)

* New translations en.json (Vietnamese)

* New translations en.json (Latvian)

* New translations simple_form.en.yml (Korean)

* New translations en.json (Esperanto)

* New translations en.json (Albanian)

* New translations en.json (Indonesian)

* New translations en.json (Icelandic)

* New translations en.yml (Indonesian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.yml (Norwegian Nynorsk)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

* New translations en.json (Slovenian)

* New translations en.json (Turkish)

* New translations en.json (Vietnamese)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (German)

* New translations simple_form.en.yml (Finnish)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.json (Breton)

* New translations en.json (Dutch)

* New translations en.json (Spanish)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Norwegian)

* New translations simple_form.en.yml (Hungarian)

* New translations en.json (French)

* New translations simple_form.en.yml (Italian)

* New translations simple_form.en.yml (Japanese)

* New translations simple_form.en.yml (Georgian)

* New translations simple_form.en.yml (Korean)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Slovak)

* New translations simple_form.en.yml (Slovenian)

* New translations simple_form.en.yml (Albanian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations simple_form.en.yml (Swedish)

* New translations simple_form.en.yml (Turkish)

* New translations simple_form.en.yml (Hebrew)

* New translations simple_form.en.yml (Armenian)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Afrikaans)

* New translations en.json (Catalan)

* New translations simple_form.en.yml (Dutch)

* New translations simple_form.en.yml (Polish)

* New translations simple_form.en.yml (Basque)

* New translations simple_form.en.yml (Romanian)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Arabic)

* New translations simple_form.en.yml (Bulgarian)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Frisian)

* New translations simple_form.en.yml (Indonesian)

* New translations simple_form.en.yml (Portuguese, Brazilian)

* New translations simple_form.en.yml (Icelandic)

* New translations simple_form.en.yml (Galician)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (Sinhala)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Persian)

* New translations simple_form.en.yml (Tamil)

* New translations simple_form.en.yml (Corsican)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Asturian)

* New translations simple_form.en.yml (Occitan)

* New translations simple_form.en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Sorani (Kurdish))

* New translations simple_form.en.yml (Sardinian)

* New translations simple_form.en.yml (Breton)

* New translations simple_form.en.yml (Kabyle)

* New translations simple_form.en.yml (Ido)

* New translations simple_form.en.yml (Standard Moroccan Tamazight)

* New translations simple_form.en.yml (Malayalam)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Estonian)

* New translations simple_form.en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Bengali)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Croatian)

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Kazakh)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Tatar)

* New translations simple_form.en.yml (Welsh)

* New translations simple_form.en.yml (Esperanto)

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)

* New translations en.json (Persian)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Italian)

* New translations en.yml (Catalan)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Ukrainian)

* New translations en.json (Irish)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Ukrainian)

* New translations activerecord.en.yml (Irish)

* New translations en.json (Polish)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Slovenian)

* New translations simple_form.en.yml (Asturian)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations en.yml (Swedish)

* New translations simple_form.en.yml (Polish)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations en.yml (Dutch)

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations simple_form.en.yml (Swedish)

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations simple_form.en.yml (Swedish)

* New translations doorkeeper.en.yml (Swedish)

* New translations activerecord.en.yml (Swedish)

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations simple_form.en.yml (Swedish)

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Swedish)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.json (Afrikaans)

* New translations en.yml (Afrikaans)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Norwegian Nynorsk)

* New translations simple_form.en.yml (Afrikaans)

* New translations simple_form.en.yml (Japanese)

* New translations simple_form.en.yml (Korean)

* New translations en.json (Norwegian Nynorsk)

* New translations en.yml (Swedish)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Polish)

* New translations en.json (Swedish)

* New translations en.yml (Swedish)

* New translations simple_form.en.yml (Icelandic)

* New translations en.json (Czech)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-05 19:54:26 +09:00
prplecake 34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI (#1888) 2022-11-05 08:12:04 +01:00
Eugen Rochko c4b92b1aee
Fix n+1 query during status removal (#19753) 2022-11-05 00:09:52 +01:00