Jeremy Kescher
1661561640
Merge branch 'reactions' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/locales/de.js
# app/javascript/flavours/glitch/locales/en.js
# app/javascript/flavours/glitch/locales/es.js
# app/javascript/flavours/glitch/locales/fr.js
# app/javascript/flavours/glitch/locales/ja.js
# app/javascript/flavours/glitch/locales/ko.js
# app/javascript/flavours/glitch/locales/pl.js
# app/javascript/flavours/glitch/locales/zh-CN.js
# app/javascript/mastodon/actions/interactions.js
# app/javascript/mastodon/locales/fr.json
# db/migrate/20221124114030_create_status_reactions.rb
2022-12-22 00:18:36 +01:00
Jeremy Kescher
2379efb52f
Merge remote-tracking branch 'upstream/main' into reactions
...
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
# app/javascript/flavours/glitch/locales/en.js
# app/javascript/flavours/glitch/locales/fr.js
# app/javascript/mastodon/actions/interactions.js
# app/javascript/mastodon/locales/fr.json
# config/locales-glitch/de.yml
# config/locales-glitch/fr.yml
# config/locales-glitch/simple_form.de.yml
# config/locales-glitch/simple_form.fr.yml
2022-12-21 23:45:28 +01:00
Claire
b248aa4d3e
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-21 15:59:39 +01:00
fef
6cad7718eb
fix 404 when reacting with Keycap Number Sign
...
The Unicode sequence for this emoji starts with an
ASCII # character, which the browser's URI parser
truncates before sending the request to the
backend.
2022-12-20 18:27:56 +01:00
fef
c739d89b0c
fix status action bar after upstream changes
2022-12-20 18:27:56 +01:00
fef
18e408c6af
properly disable reactions when not logged in
2022-12-20 18:27:56 +01:00
fef
a556d81cde
also disable reaction buttons in vanilla flavour
2022-12-20 18:27:55 +01:00
fef
47ac7a2e50
fix image for new custom emoji reactions
2022-12-20 18:27:55 +01:00
fef
a2db70b3c8
rename nop handler to handleNoOp
...
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
2022-12-20 18:27:53 +01:00
fef
a9bb743db7
cleanup JS imports and other minor stuff
2022-12-20 18:27:53 +01:00
fef
04467e8f6d
remove unnecessary parameter
2022-12-20 18:27:53 +01:00
fef
a0d7cadcfd
change reaction api to match other interactions
...
Status reactions had an API similar to that of
announcement reactions, using PUT and DELETE at a
single endpoint. I believe that for statuses, it
makes more sense to follow the convention of the
other interactions and use separate POST endpoints
for create and destroy respectively.
2022-12-20 18:27:52 +01:00
fef
f580ffb127
remove outdated comments
2022-12-20 18:27:52 +01:00
fef
e405eb76f4
clean up new imports in vanilla flavour
2022-12-20 18:27:52 +01:00
fef
7cbe6dc3e8
rebase with upstream
2022-12-20 18:27:51 +01:00
Eugen Rochko
de21695162
New Crowdin updates ( #22354 )
...
* 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 (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* 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 (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Galician)
* New translations en.json (Spanish)
* New translations en.json (Belarusian)
* New translations en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Greek)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Slovenian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.json (Spanish)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Estonian)
* New translations en.json (Welsh)
* New translations en.yml (Spanish)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.json (Faroese)
* New translations en.json (Latin)
* New translations en.json (Catalan)
* New translations en.json (Vietnamese)
* New translations en.yml (Bulgarian)
* New translations en.yml (Serbian (Latin))
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Latvian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Catalan)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (German)
* New translations en.json (German)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (German)
* New translations en.json (Latin)
* New translations simple_form.en.yml (Frisian)
* New translations en.json (French)
* New translations en.json (Hungarian)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Latin)
* New translations en.yml (Portuguese)
* New translations doorkeeper.en.yml (Portuguese)
* New translations en.json (Albanian)
* New translations en.yml (Hebrew)
* New translations en.yml (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations en.json (Norwegian)
* New translations en.json (Russian)
* New translations en.json (Thai)
* New translations en.yml (Bulgarian)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Thai)
* New translations en.json (Asturian)
* New translations en.yml (Norwegian)
* New translations en.json (Danish)
* New translations en.json (Finnish)
* New translations en.json (Occitan)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations en.yml (Thai)
* New translations en.json (Persian)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations en.yml (Bulgarian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.yml (Korean)
* New translations en.json (Japanese)
* New translations en.json (Turkish)
* New translations en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* New translations en.json (Czech)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Thai)
* New translations en.json (German)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Indonesian)
* New translations en.json (Estonian)
* New translations en.yml (Indonesian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Polish)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Basque)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Estonian)
* New translations en.yml (Basque)
* New translations en.yml (Estonian)
* New translations en.json (French)
* New translations en.json (Estonian)
* New translations en.yml (French)
* New translations en.yml (Bulgarian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (German)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (Bengali)
* New translations en.json (Estonian)
* New translations en.yml (Swedish)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Swedish)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Bulgarian)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.yml (Bulgarian)
* New translations en.yml (Korean)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Japanese)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Japanese)
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.json (Norwegian Nynorsk)
* New translations en.yml (Bulgarian)
* New translations en.yml (Thai)
* New translations en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Estonian)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Estonian)
* New translations en.json (Serbian (Latin))
* New translations en.yml (Polish)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.yml (Bulgarian)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Czech)
* New translations en.json (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Frisian)
* New translations en.yml (Bulgarian)
* Normalize
* New translations en.yml (Serbian (Cyrillic))
* Normalize
* New translations en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations en.yml (Bulgarian)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-12-20 23:02:47 +09:00
Nick Schonning
06b68490d1
Enable eslint:recommended ruleset ( #22433 )
...
* Enable ESLint recommended ruleset
* Disable failing ESLint recommended rules
* Remove rules shadowed by eslint:recommended
2022-12-19 00:51:37 +09:00
Jeremy Kescher
0406f173cf
Merge remote-tracking branch 'reactions/main' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/locales/de.js
2022-12-17 11:09:32 +01:00
Jeremy Kescher
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2022-12-16 17:53:33 +01:00
Eugen Rochko
2889c68610
New Crowdin updates ( #22182 )
...
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Malayalam)
* New translations en.json (Breton)
* New translations simple_form.en.yml (Breton)
* New translations activerecord.en.yml (Breton)
* New translations devise.en.yml (Breton)
* New translations doorkeeper.en.yml (Breton)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations simple_form.en.yml (French, Quebec)
* New translations activerecord.en.yml (French, Quebec)
* New translations devise.en.yml (French, Quebec)
* New translations doorkeeper.en.yml (French, Quebec)
* New translations en.json (Sinhala)
* New translations simple_form.en.yml (Sinhala)
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations devise.en.yml (Kannada)
* 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 simple_form.en.yml (Asturian)
* New translations activerecord.en.yml (Asturian)
* New translations devise.en.yml (Asturian)
* New translations simple_form.en.yml (Aragonese)
* New translations activerecord.en.yml (Aragonese)
* New translations devise.en.yml (Aragonese)
* New translations doorkeeper.en.yml (Aragonese)
* New translations simple_form.en.yml (Occitan)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations doorkeeper.en.yml (Corsican)
* New translations en.json (Sardinian)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations simple_form.en.yml (Kabyle)
* New translations activerecord.en.yml (Kabyle)
* New translations devise.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Kabyle)
* New translations en.json (Ido)
* New translations simple_form.en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Punjabi)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Tamil)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Kazakh)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Burmese)
* New translations en.json (Uyghur)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Asturian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Arabic)
* New translations en.yml (Belarusian)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Greek)
* New translations en.yml (Frisian)
* New translations en.yml (Basque)
* New translations en.yml (Finnish)
* New translations en.yml (Hungarian)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Korean)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Polish)
* New translations en.yml (Portuguese)
* New translations en.yml (Russian)
* New translations en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Vietnamese)
* New translations en.yml (Galician)
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Thai)
* 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 (Malay)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Esperanto)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Latin)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Aragonese)
* New translations en.yml (Occitan)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Latin)
* New translations simple_form.en.yml (French, Quebec)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Latin)
* New translations devise.en.yml (Frisian)
* New translations devise.en.yml (Latin)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Frisian)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Latin)
* New translations en.json (Belarusian)
* New translations en.json (Catalan)
* New translations en.json (Danish)
* New translations en.json (Finnish)
* New translations en.json (Turkish)
* New translations en.yml (Belarusian)
* New translations en.yml (Catalan)
* New translations en.yml (Danish)
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations doorkeeper.en.yml (Danish)
* Normalize locale files
* New translations en.json (German)
* New translations en.json (Swedish)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Welsh)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.yml (Latvian)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Czech)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Traditional)
* New translations en.json (Estonian)
* New translations en.yml (Swedish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Catalan)
* New translations en.json (Slovenian)
* New translations en.json (Faroese)
* New translations en.json (Asturian)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Slovenian)
* New translations en.yml (Faroese)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Faroese)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (Greek)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-12-16 12:46:39 +09:00
Claire
f3a4d57be1
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
Claire
70415714f1
Add follow request banner on account header ( #20785 )
...
* Add requested_by to relationship maps
* Display whether an account has requested to follow you on their profile
2022-12-15 18:50:11 +01:00
Holden Foreman
c761e7a5ef
Fix language surrounding disability in prompts for alt text and other media descriptions ( #20923 )
2022-12-15 18:46:13 +01:00
Bramus!
7fbc17afa2
Fix media markup ( #21420 )
...
This brings the markup of the MediaItem component on par with the Item component from media_gallery.
Co-authored-by: Effy Elden <effy@effy.space>
2022-12-15 18:37:47 +01:00
Claire
ebf1d74e40
Fix being stuck in edit mode when deleting the edited status ( #22126 )
2022-12-15 17:47:43 +01:00
Rens Groothuijsen
726c7dea31
Display search popout at fixed screen position ( #16463 )
...
* Display search popout at fixed screen position
* Attach search popout to search box
2022-12-15 17:38:50 +01:00
Arnout Engelen
9f63c428e1
Don't autofocus the compose form ( #16517 )
...
When opening a page such as /web/timelines/home in a desktop browser, the
cursor was automatically placed in the textarea of the compose form.
When using the keyboard for navigation (using a browser plugin like vimium or
vim vixen, or just to hit 'space' to scroll down a page), you have remember to
leave the field before using that.
Since you only visit the page to write a new post some of the time, this PR
attempts to have nothing focused initially (and require the user to click or
e.g. use 'tab' to focus the textarea).
Tested:
* /web/timeslines/home no longer autofocuses the compose box
* pressing the 'n' hotkey still focuses the compose box
* clicking 'reply' for a post still focuses the compose box
* replying to a CW'ed post still focuses the compose box
* introducing the CW field still focuses the CW field
* introducing the CW field for a reply still focuses the CW field
* removing the CW field still focuses the compose box
* /web/statuses/new still autofocuses the compose box
fixes #15862
2022-12-15 17:37:05 +01:00
Meisam
059d64a59e
set activation for tag follow button ( #21629 )
...
Co-authored-by: meisam <meisam@noreply.codeberg.org>
2022-12-15 17:04:52 +01:00
Nick Schonning
72a8af8088
Fix typo in handler function call name ( #21829 )
2022-12-15 16:37:17 +01:00
Francis Murillo
c50e9d078a
Render current day formats in the client timezone ( #21878 )
...
* Fix remaining plain %time to %time.formatted
* Add %time.relative-formatted to client format dates on the current day
* Add missing comma dangle to formats
* Use client side message format instead of the server
* Add fallback message to relatve_format.today
* Remove unused translation key and fix js lint issue
Co-authored-by: Effy Elden <effy@effy.space>
2022-12-15 16:35:25 +01:00
Yamagishi Kazutoshi
58200132d0
FormattedMessage
must be used directly (#20982 )
...
* `FormattedMessage` must be used directly
* rollback
2022-12-15 16:20:46 +01:00
Pleclown
3a59ffde8d
Adding 12 hours option for polls ( #21131 )
...
* Adding 12 hours option for polls
Adding 12 hours option for polls
* Adding 12 hours option for polls
Missing > on a line
2022-12-15 16:20:34 +01:00
Alex Stine
903e5a3f45
Fix hidden label causing accessibility issue for search inputs ( #21275 )
...
* Try unhiding search label.
* Use aria-label. Remove label as empty labels are useless.
* Remove addition of package-lock.json.
2022-12-15 16:20:21 +01:00
Jeremy Kescher
04c611daa1
Fix being unable to react with the keycap number sign emoji ( #22231 )
...
#⃣
This bug is caused by the emoji consisting of:
U+23 #
U+FE0F
U+20E3 ⃣
Because it starts with a #, it's interpreted as an anchor link, which is not passed to the API. Therefore, the API sees no emoji to react with and answers correctly with a 404.
2022-12-15 16:18:39 +01:00
Claire
fe9eab51d1
Change dropdown menu to contain “Copy link to post” even for non-public posts ( #21316 )
...
Fixes #21244
2022-12-15 15:43:16 +01:00
Claire
1f762f4271
Fix wasteful request to /api/v1/custom_emojis when not logged in ( #22326 )
2022-12-15 14:07:34 +01:00
Claire
47c75c29da
Merge branch 'main' into glitch-soc/merge-upstream
2022-12-14 09:10:49 +01:00
cadars
52a50c5e43
Make handle more easily selectable on profile page ( #21479 )
...
* Make handle more easily selectable on profile page
* Wrap handle in a span
* Add `user-select: all` to span
* remove whitespace
2022-12-13 19:43:03 +01:00
Claire
f70bdba926
Change default reply language to be default language when replying to a translated reply ( #22272 )
...
Fixes #22250
2022-12-13 19:41:53 +01:00
fef
c957eb758c
fix 404 when reacting with Keycap Number Sign
...
The Unicode sequence for this emoji starts with an
ASCII # character, which the browser's URI parser
truncates before sending the request to the
backend.
2022-12-11 14:29:26 +01:00
Jeremy Kescher
3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop
2022-12-09 23:46:41 +01:00
fef
1d43e6b9b0
fix status action bar after upstream changes
2022-12-09 23:08:45 +01:00
fef
66ade5c1fd
properly disable reactions when not logged in
2022-12-09 23:08:45 +01:00
fef
55ba8f9c92
also disable reaction buttons in vanilla flavour
2022-12-09 23:08:44 +01:00
fef
e6c9206f5c
fix image for new custom emoji reactions
2022-12-09 23:08:44 +01:00
fef
6aa7d7fb12
rename nop handler to handleNoOp
...
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
2022-12-09 23:08:42 +01:00
fef
7187d6f9cf
cleanup JS imports and other minor stuff
2022-12-09 23:08:42 +01:00
fef
14561a05c8
remove unnecessary parameter
2022-12-09 23:08:42 +01:00
fef
e3f97f60a6
change reaction api to match other interactions
...
Status reactions had an API similar to that of
announcement reactions, using PUT and DELETE at a
single endpoint. I believe that for statuses, it
makes more sense to follow the convention of the
other interactions and use separate POST endpoints
for create and destroy respectively.
2022-12-09 23:08:42 +01:00
fef
029097a1a0
remove outdated comments
2022-12-09 23:08:41 +01:00