Age | Commit message (Collapse) | Author |
|
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.
|
|
|
|
|
|
|
|
|
|
* version emoji-mart
* add lock file
|
|
|
|
Currently building on Heroku fails with a package error for libidn11. Since Mastodon uses idn-ruby 0.1.2 we should upgrade to libidn12
|
|
New environment variable `DISALLOW_UNAUTHENTICATED_API_ACCESS`
|
|
Fix #19646
|
|
|
|
|
|
|
|
(#19788)
|
|
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
|
* 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
|
|
|
|
* 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>
|
|
|
|
|
|
* Spare one SQL query when hydrating polls
* Improve tests
* Fix more discrepancies
* Fix possible crash when the status has no application set
|
|
- Improve tests
- Fix possible crash when application of a reblogged post isn't set
- Fix discrepancies around favourited and reblogged attributes
- Fix discrepancies around pinned attribute
- Fix polls not being hydrated
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fixes #19698
|
|
|
|
|
|
|
|
|
|
|
|
* Fix handling of duplicate notifications from streaming server
* Fix handling of duplicate and out-of-order notifications when polling/expanding
Fixes #19615
|
|
|
|
|
|
* Add tests
* Fix crash when trying to display orphaned action logs
* Add migration for older admin action logs
|
|
disabled (#19687)
* Fix being unable to withdraw follow request when unfollow confirmation modal is disabled
Fixes #19569
* Fix “unfollow” being inadequately used for withdrawing follow requests from account card
|
|
Fixes #19593
|
|
Fixes #19546
|
|
Fixes #19389
|
|
* Fix mastodon:setup not setting the admin's role properly
* Set contact username when creating admin account in mastodon:setup
|