Age | Commit message (Collapse) | Author |
|
Conflicts:
- `app/models/custom_emoji.rb`:
Not a real conflict, just upstream changing a line too close to
a glitch-soc-specific validation.
Applied upstream changes.
- `app/models/public_feed.rb`:
Not a real conflict, just upstream changing a line too close to
a glitch-soc-specific parameter documentation.
Applied upstream changes.
|
|
|
|
|
|
|
|
(#20299)
Change profile picture click to open profile picture in modal in web UI
|
|
|
|
* New translations en.json (Telugu)
* New translations en.yml (Telugu)
* New translations en.yml (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.yml (Kabyle)
* New translations en.json (Igbo)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Frisian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Silesian)
* New translations en.json (Silesian)
* New translations en.yml (Taigi)
* New translations en.json (Taigi)
* New translations en.json (Kabyle)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Sanskrit)
* New translations en.json (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.json (Sardinian)
* New translations en.yml (Corsican)
* New translations en.json (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Igbo)
* New translations en.json (Hebrew)
* New translations en.json (Polish)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Latvian)
* New translations en.json (Icelandic)
* New translations en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.json (Slovenian)
* New translations en.json (Russian)
* New translations en.json (Italian)
* New translations en.json (German)
* New translations en.yml (Hebrew)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.yml (Danish)
* New translations en.json (Afrikaans)
* New translations en.json (Spanish)
* New translations en.json (French)
* New translations en.json (Dutch)
* New translations simple_form.en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations en.json (Spanish, Argentina)
* New translations activerecord.en.yml (Hebrew)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Occitan)
* New translations en.json (Welsh)
* New translations en.yml (Chinese Traditional)
* New translations en.json (German)
* New translations en.json (Chinese Traditional)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese)
* New translations en.yml (Hebrew)
* New translations en.json (Finnish)
* New translations en.json (Japanese)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Thai)
* New translations en.json (Greek)
* New translations en.yml (Hebrew)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Occitan)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Thai)
* New translations en.json (Catalan)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Polish)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations en.json (Irish)
* New translations activerecord.en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (Danish)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Czech)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Albanian)
* New translations en.json (Arabic)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Bulgarian)
* New translations en.json (Macedonian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Bulgarian)
* New translations devise.en.yml (Polish)
* New translations en.json (Bulgarian)
* New translations en.json (Hungarian)
* New translations en.yml (Japanese)
* New translations en.json (Norwegian)
* New translations en.json (Bulgarian)
* New translations en.json (Korean)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (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.json (Bulgarian)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Esperanto)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Vietnamese)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.yml (Romanian)
* New translations en.yml (Frisian)
* New translations en.json (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Norwegian)
* New translations en.json (Swedish)
* New translations en.json (Occitan)
* New translations en.json (Afrikaans)
* New translations en.json (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Swedish)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Welsh)
* New translations en.yml (Esperanto)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (French)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Norwegian)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (Norwegian)
* New translations activerecord.en.yml (Norwegian)
* New translations devise.en.yml (Norwegian)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Norwegian)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations doorkeeper.en.yml (English, United Kingdom)
* New translations activerecord.en.yml (English, United Kingdom)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.json (Bulgarian)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.json (Bulgarian)
* New translations en.yml (Irish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (Bulgarian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Igbo)
* New translations en.json (Thai)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Irish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations en.json (Esperanto)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Breton)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations en.yml (Czech)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Esperanto)
* New translations en.json (Breton)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Bulgarian)
* New translations en.json (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Occitan)
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
This commit removes aria-pressed attribute from all elements which
contents or other descriptive attributes change in active state,
effectively replacing the meaning of the button, in which case
aria-pressed, an attribute specified whether the button is currently
pressed, would create a confusion. (Spoiler: it's everywhere).
See https://github.com/mastodon/mastodon/issues/13545#issuecomment-1304886969
|
|
Port 782b6835f786385c41c6455f2a251d1925b19eb5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
the top
Port 608343c135c087ab7fa9bd401dce8a705720fdb8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 0beb095a4bfbcce55acb016eaaa54b5e93a56023 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
(#19983)
Fixes #19915
|
|
* Updating status__content__spoiler-link css for mastodon-light theme to ensure correct rendering precedence
* Adding focus css selector to status__content__spoiler-link mastodon-light theme
* reformatting code to match convention of having css selectors on separate lines
* fixing code format for scss linting issue
|
|
Port 622f603ac73e40a9e41c254fa90079eeecfe1e02 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
* 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>
|
|
Fixes #19920
|
|
* Add form element on focal point modal
* Add type="button" for detection button
|
|
(#1902)
* Fix favourite modal styling in glitch-soc light theme
* Fix unnecessary difference between glitch-soc's light theme and upstream's
|
|
Port 4b7f32a2a668b7068ede7ac8eb2ac087883ba213 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port ffe735344bb47ad2af743ad97729db9ea9c11f60 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>
|
|
Port 34c269310d2017c3164d57c1e8631f9423092ee3 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
|
|
* 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>
|
|
|
|
|
|
Port 20aa8881dc98264e5875fa37fc2dbf18e3f2baac to glitch-soc
|
|
Port 1c3192df6bf48eb4c3613f2a8744c809f6eeeec0 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 2d9a85db6efe0c9ccfda1420551ce3d6025bc27e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
web UI
Port a442f481f850d857544eafdd0725142ed8656552 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 312d616371096235f1f317041300b8220c447613 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port bfafb114a2135b1f21ba7e6d54ee13e8da75b629 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 7c8e2b9859f2e206110accb74d19ec4591d79780 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port e02812d5b63b4909fff9c0c7246e80745c4c703e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 887976814a2639a666896ae94b14c64e2834e26d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port c95d9aab56dcde8c183f15d565cd1e8746d42c48 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 139ea4c981f563e51d80ec3ec407d6265e29cb70 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
is disabled (#19687)
Port cbb440bbc2de7c805f687c886b32ab7dbafde07f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 74d40c7d8fac3ccc263af29c622f4481e18e8c59 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
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.
|
|
|
|
|
|
(#19788)
|
|
|
|
|
|
|
|
|