me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16259 commits 2 branches 0 tags 429 MiB
Commit graph

16259 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ariadne Conill
0b552e9cf6 th: Revert "Add prefers-color-scheme based theme" 
This reverts commit 25b2f53580.
 2022-11-10 07:05:56 +00:00
Ariadne Conill
dec249457b th: try to fix compile 2022-11-10 06:41:02 +00:00
Ariadne Conill
a02334ab96 th: Merge pull request 'Add prefers-color-scheme based theme' (#6) from hamptonmoore/mastodon:system-theme into main 
Reviewed-on: https://gitea.treehouse.systems/treehouse/mastodon/pulls/6
 2022-11-10 06:10:04 +00:00
Ariadne Conill
9c45f75fc4 th: Merge pull request 'Replace default mastodon icons with treehouse icons' (#5) from favicon-fix into main 
Reviewed-on: https://gitea.treehouse.systems/treehouse/mastodon/pulls/5
 2022-11-10 06:06:10 +00:00
Hampton Moore
25b2f53580 Add prefers-color-scheme based theme 2022-11-09 14:33:12 -05:00
Rin
3da724dc15 th: Update favicons to use proper rounded-rect 2022-11-09 19:12:14 +11:00
Rin
4f6ef403f0 th: Update favicons to treehouse favicons 2022-11-09 19:11:36 +11:00
Rin
93e802e50b th: restore treehouse favicon 2022-11-09 17:24:22 +11:00
Ariadne Conill
fb4d07fbcc th: config: production: traefik does not support sendfile mode 2022-11-08 09:59:32 +00:00
Ariadne Conill
f7cd01d158 th: version: change to +glitch+th for client compatibility 2022-11-08 07:16:56 +00:00
Ariadne Conill
9e11d8be5f th: version: change +glitch suffix to +th, since we have local modifications 2022-11-07 23:24:11 +00:00
Ariadne Conill
4a8fae94bf th: Merge https://gitea.treehouse.systems/treehouse/mastodon-glitch into rebase/4.0.0rc2 2022-11-07 23:20:04 +00:00
Claire
e517bffb13 Merge pull request #1903 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-07 21:07:01 +01:00
Claire
d4a1711d5a [Glitch] Add aria-expanded to content warning toggle button 
Port b2a132bf9c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-07 20:04:31 +01:00
Claire
99cdfec05e Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 19:53:30 +01:00
Claire
2ed7a4124b Fix filter handling in status cache hydration (#19963) 2022-11-07 19:47:48 +01:00
Ariadne Conill
716858b8c7 th: fix autocomplete 2022-11-07 17:32:46 +00:00
Ariadne Conill
f28a74d014 th: config: CSP: add unsafe-eval for scripts 2022-11-07 17:30:16 +00:00
Postmodern
41d43a1e1f Micro-optimization: only split acct into two Strings (#19901) 
* Since `acct` is split by `@` and assigned to `username` and `domain`, we only need to split `acct` into two Strings.
 2022-11-07 16:17:55 +01:00
Eugen Rochko
3f108bf80b New Crowdin updates (#19771) 
* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Icelandic)

* New translations en.yml (Japanese)

* New translations en.yml (Armenian)

* New translations en.yml (German)

* New translations en.yml (Czech)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Ido)

* New translations en.json (Esperanto)

* New translations en.yml (Turkish)

* New translations en.yml (Albanian)

* New translations en.yml (Ukrainian)

* New translations en.yml (Romanian)

* New translations en.yml (Hungarian)

* New translations en.yml (Bulgarian)

* New translations en.yml (Catalan)

* New translations en.yml (Danish)

* New translations en.yml (Greek)

* New translations en.yml (Frisian)

* New translations en.yml (Basque)

* New translations en.json (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Irish)

* New translations en.yml (Hebrew)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

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

* New translations en.yml (Sinhala)

* New translations en.yml (Cornish)

* New translations en.yml (Kannada)

* New translations en.yml (Asturian)

* New translations en.yml (Occitan)

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

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

* New translations en.yml (Corsican)

* New translations en.yml (Malayalam)

* New translations en.yml (Sardinian)

* New translations en.yml (Sanskrit)

* New translations en.yml (Kabyle)

* New translations en.yml (Taigi)

* New translations en.yml (Silesian)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations simple_form.en.yml (French)

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

* New translations en.yml (Burmese)

* New translations en.yml (Breton)

* New translations en.yml (Tatar)

* New translations en.yml (Indonesian)

* New translations en.yml (Kazakh)

* New translations en.yml (Persian)

* New translations en.yml (Tamil)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Bengali)

* New translations en.yml (Marathi)

* New translations en.yml (Croatian)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Estonian)

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

* New translations en.json (Latvian)

* New translations en.yml (Latvian)

* New translations en.yml (Hindi)

* New translations en.yml (Malay)

* New translations en.yml (Telugu)

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

* New translations en.yml (Welsh)

* New translations en.yml (Esperanto)

* New translations en.yml (Uyghur)

* New translations en.yml (Igbo)

* New translations en.json (Czech)

* New translations en.json (Dutch)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Dutch)

* New translations en.yml (Polish)

* New translations en.yml (Swedish)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.json (Dutch)

* New translations en.yml (Ukrainian)

* New translations en.yml (Swedish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations simple_form.en.yml (Irish)

* New translations simple_form.en.yml (Asturian)

* New translations devise.en.yml (Asturian)

* New translations en.json (Slovenian)

* New translations en.yml (Slovenian)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Asturian)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Asturian)

* New translations activerecord.en.yml (Asturian)

* New translations devise.en.yml (Asturian)

* New translations en.json (Japanese)

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

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.json (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations doorkeeper.en.yml (Vietnamese)

* New translations en.json (Afrikaans)

* New translations en.json (Galician)

* New translations en.yml (Turkish)

* New translations en.json (Afrikaans)

* New translations en.yml (Afrikaans)

* New translations en.yml (Galician)

* New translations simple_form.en.yml (Afrikaans)

* New translations en.json (Albanian)

* New translations en.yml (Albanian)

* New translations en.yml (French)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.json (Slovenian)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Albanian)

* New translations activerecord.en.yml (French)

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

* New translations devise.en.yml (French)

* New translations en.json (Norwegian Nynorsk)

* New translations en.yml (Occitan)

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

* New translations simple_form.en.yml (Occitan)

* New translations doorkeeper.en.yml (Occitan)

* New translations activerecord.en.yml (Occitan)

* New translations en.yml (Spanish)

* New translations en.yml (Japanese)

* New translations en.json (Occitan)

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

* New translations simple_form.en.yml (Japanese)

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

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

* New translations doorkeeper.en.yml (Occitan)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations en.json (Irish)

* New translations en.json (Slovenian)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

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

* New translations simple_form.en.yml (Irish)

* New translations doorkeeper.en.yml (Irish)

* New translations simple_form.en.yml (Thai)

* New translations en.json (Thai)

* New translations en.json (German)

* New translations en.yml (Spanish)

* New translations en.json (Greek)

* New translations en.json (Slovenian)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Asturian)

* New translations simple_form.en.yml (Thai)

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

* New translations devise.en.yml (Asturian)

* New translations en.json (Danish)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Asturian)

* New translations simple_form.en.yml (Korean)

* New translations en.json (French)

* New translations en.json (Danish)

* New translations en.yml (Danish)

* New translations en.json (Ukrainian)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Ukrainian)

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

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

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

* New translations en.json (German)

* New translations en.json (Catalan)

* New translations en.json (Danish)

* New translations en.yml (Danish)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Spanish, Mexico)

* New translations en.json (Asturian)

* New translations en.json (Occitan)

* New translations doorkeeper.en.yml (Catalan)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

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

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

* New translations en.json (German)

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

* New translations en.json (Asturian)

* New translations en.yml (Asturian)

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

* New translations en.json (French)

* New translations en.yml (Dutch)

* New translations en.json (Welsh)

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

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

* New translations en.json (Dutch)

* New translations en.json (French)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations doorkeeper.en.yml (Dutch)

* New translations en.json (Irish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (German)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

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

* New translations simple_form.en.yml (Arabic)

* New translations en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (Ukrainian)

* New translations doorkeeper.en.yml (Ukrainian)

* New translations activerecord.en.yml (Ukrainian)

* New translations en.json (Russian)

* New translations en.json (Bulgarian)

* New translations en.json (Hebrew)

* New translations en.json (Bulgarian)

* New translations en.json (Japanese)

* New translations en.yml (Finnish)

* New translations simple_form.en.yml (Japanese)

* New translations devise.en.yml (Finnish)

* New translations en.json (Hebrew)

* New translations en.yml (German)

* New translations en.json (Bulgarian)

* New translations en.yml (Polish)

* New translations simple_form.en.yml (Japanese)

* New translations activerecord.en.yml (Arabic)

* New translations activerecord.en.yml (Hebrew)

* New translations en.json (Bulgarian)

* New translations en.json (German)

* New translations en.json (Danish)

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

* New translations en.json (Bulgarian)

* New translations en.json (Frisian)

* New translations en.json (Russian)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Russian)

* New translations devise.en.yml (Frisian)

* New translations en.yml (Czech)

* New translations en.json (Bulgarian)

* New translations en.json (Czech)

* New translations en.json (Frisian)

* New translations en.json (Italian)

* New translations en.json (Polish)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-11-08 00:06:48 +09:00
Claire
b2a132bf9c Add aria-expanded to content warning toggle button (#19975) 
Fixes #19920
 2022-11-07 15:48:46 +01:00
Claire
811f8d2175 Fix crash when external auth provider has no display_name set (#19962) 
Fixes #19913
 2022-11-07 15:43:24 +01:00
Claire
9b012211d5 Fix links to the Web UI in notifications (#19981) 
Most of the old routes are broken because of the /web removal.
 2022-11-07 15:42:58 +01:00
Sunny Ripert
6dd0521788 Add form element on focal point modal (#19834) 
* Add form element on focal point modal

* Add type="button" for detection button
 2022-11-07 15:41:42 +01:00
Claire
5437dda76b Fix followers count not being updated when migrating follows (#19998) 
Fixes #19900
 2022-11-07 15:38:55 +01:00
Claire
55e949369e Fix light theme issues with the favourite modal and some background colors (#1902) 
* Fix favourite modal styling in glitch-soc light theme

* Fix unnecessary difference between glitch-soc's light theme and upstream's
 2022-11-07 10:34:18 +01:00
Claire
74b407fc3f Merge pull request #1899 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-07 08:31:36 +01:00
Sunny Ripert
7ef1d0fa29 [Glitch] Fix double button to clear emoji search input 
Port bfad78e194 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-07 07:55:44 +01:00
Sunny Ripert
906cbff923 [Glitch] Fix JavaScript console error on Getting Started column 
Port 99cf3cdb63 to glitch-soc

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-07 07:54:18 +01:00
Sunny Ripert
5baaa9f8a6 [Glitch] Fix console log error on column settings load 
Port 461d06bec8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-07 07:53:20 +01:00
Claire
495243d9ae Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 07:50:47 +01:00
Chris Rose
42657c0728 Tag the OTP field with autocomplete for password managers (#19946) 
This is modeled on #19833, and based on the attribute values documented
in https://developer.apple.com/documentation/security/password_autofill/enabling_password_autofill_on_an_html_input_element?language=objc
 2022-11-07 03:57:16 +01:00
Sunny Ripert
bfad78e194 Fix double button to clear emoji search input (#19888) 2022-11-07 03:40:54 +01:00
Jeremy Kescher
3b6c7c4878 Add null check on application in dispute viewer (#19851) 2022-11-07 03:40:17 +01:00
Sunny Ripert
99cf3cdb63 Fix JavaScript console error on Getting Started column (#19891) 
* Fix JavaScript console error on Getting Started column

* Update app/javascript/mastodon/components/column_header.js

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>

Co-authored-by: Ilias Tsangaris <iliastsangaris@gmail.com>
 2022-11-07 03:40:04 +01:00
Sunny Ripert
461d06bec8 Fix console log error on column settings load (#19886) 2022-11-07 03:39:48 +01:00
Claire
bfb8121e94 Fix crash in legacy filter creation controller (#19878) 2022-11-07 03:38:53 +01:00
nightpool
149a8246d2 Skip Webfinger cache during migrations as well (#19883) 2022-11-07 03:31:38 +01:00
Rob Petti
9cc859808e allow /api/v1/streaming to be used as per documentation (#19896) 2022-11-07 03:16:44 +01:00
rcombs
edb86217c9 Set autocomplete attr for email field on signup page (#19833) 
The email address will be used as the "username" for sign-in purposes, so it's the value that should be stored in password managers. We can inform the password manager of this by setting `autocomplete="email"`. Without this hint, password managers may instead store the `username` field, which isn't valid for sign-in (this happens with iCloud Keychain in Safari, for instance).
 2022-11-07 03:16:10 +01:00
Ariadne Conill
5b92324e54 th: app: api: base_controller: allow API access to be configurable 2022-11-06 19:13:50 +00:00
Ariadne Conill
9ee65200fd th: locales: fix YAML quoting issue 
Psych::SyntaxError: (/opt/mastodon/config/locales/simple_form.en.yml): mapping values are not allowed in this context at line 102 column 103
 2022-11-06 18:43:54 +00:00
Ariadne Conill
dfa1d7b22e Merge branch 'rebase/4.0.0rc1' 2022-11-06 18:23:41 +00:00
Kouhai
ced3e4e27c th: update account request question prompt 2022-11-06 18:22:00 +00:00
Ariadne Conill
697b1f4a2d th: vanilla: emoji: use 63x63 grid for emoji 2022-11-06 18:21:57 +00:00
Ariadne Conill
5ab9afa33f th: glitch: emoji: set sprite sheet to 63x63 2022-11-06 18:21:52 +00:00
Ariadne Conill
b17c429263 th: dockerfile: implement emoji-mart patch 2022-11-06 18:20:15 +00:00
Ariadne Conill
5ac86a2097 th: update emoji-mart sprite sheet for emoji 13.1 2022-11-06 18:20:15 +00:00
Ariadne Conill
e79855991e th: add emoji 13.1 data for emoji-mart 2022-11-06 18:20:15 +00:00
Claire
c18d61eff4 Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-06 18:49:46 +01:00