Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
Fixes manifest.json not being loaded because of CSP violation
h/t https://vulpine.club/@binary/100662852252438648
|
|
If the current logged-in user is an admin, add quick links to the admin
interface in account and toot dropdown menu. Suggestion by @ashkitten
|
|
|
|
|
|
Port a060beee726de5295e1f608231975a90b7709a0a to glitch-soc
|
|
Port 7c12c7b1246b991c68f4b51573538e02b3968beb to glitch-soc
|
|
Port 1bfe735d574fdbb01b1aea07db6c69fb3a32b90f to glitch-soc
|
|
|
|
Merge upstream changes
|
|
Conflicts:
README.md
Discarded upstream changes to the README, kept our version.
|
|
Fixes #700
|
|
To avoid error due to nginx proxy caching the webfinger response
|
|
|
|
* Enable ro and ta locales in Rails
* Add Tamil and Romanian to language dropdown
|
|
* Translated using Weblate (Serbian)
Currently translated at 72.4% (499 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/
* Translated using Weblate (Serbian)
Currently translated at 77.6% (535 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Corsican)
Currently translated at 99.7% (687 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Korean)
Currently translated at 100.0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Serbian)
Currently translated at 72.3% (60 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/
* Translated using Weblate (German)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Serbian)
Currently translated at 92.8% (77 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/
* Translated using Weblate (Serbian)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/
Језик писања? Нисам сигуран
* Translated using Weblate (Corsican)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Serbian)
Currently translated at 98.8% (330 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/
* Translated using Weblate (Serbian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/
Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод.
* Translated using Weblate (Occitan)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100,0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/
* Translated using Weblate (Serbian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/
Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод.
* Translated using Weblate (German)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 99.7% (687 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Serbian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/
* Translated using Weblate (Serbian)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/
* i18n-tasks noramlize && yarn manage:translations
|
|
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
|
Fix #8573
|
|
Add link to quick start guide, link to general documentation, fix link to list of servers, remove Liberapay
|
|
* Translated using Weblate (Polish)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Translated using Weblate (Korean)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/
* Translated using Weblate (Czech)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Added translation using Weblate (Tamil)
* Translated using Weblate (Greek)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Persian)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Romanian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/
* Added translation using Weblate (Romanian)
* Added translation using Weblate (Romanian)
* Added translation using Weblate (Romanian)
* i18n-tasks normalize && yarn manage:translations
* Fix ro YML files
|
|
* Reorder docker-compose's sidekiq queues to match config/sidekiq.yml
* Make the ̀“mailers” queue higher priority than “pull”
|
|
|
|
|
|
|
|
* Added translation for the following sections:
• Empty followers, mutes, boosts etc. lists
• Keyboard shortcuts
• "About"
• Plurals for statuses, users and subscribers counters
• Relays, Custom CSS and suspensions settings.
• Remote interactions
• Other misc stuff
* i18n-tasks normalize
|
|
* Translated using Weblate (German)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (Japanese)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Dutch)
Currently translated at 100,0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Greek)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Arabic)
Currently translated at 98.1% (676 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (French)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Persian)
Currently translated at 99.7% (687 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Welsh)
Currently translated at 7.3% (6 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Welsh)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (Welsh)
Currently translated at 15.5% (107 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Welsh)
Currently translated at 1.6% (1 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/
* Translated using Weblate (Welsh)
Currently translated at 15.8% (109 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (French)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Occitan)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (Occitan)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Danish)
Currently translated at 100,0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Occitan)
Currently translated at 99.7% (333 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Czech)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Added translation using Weblate (Romanian)
* Translated using Weblate (Romanian)
Currently translated at 47.9% (160 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/
* i18n-tasks normalize && yarn manage:translations
|
|
Bug in #8559
|
|
If an unresolved report for the same target account already exists,
no new notification is generated
|
|
Mastodon converts all Emoji to images, whether they have a VS15 after
them or not, but leaves the VS15 in the string, which is displayed as
a black box in Safari.
|
|
|
|
Merge upstream changes
|
|
|
|
|
|
|
|
|
|
* Fix the display of missing lists
See #6786 -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions.
* import ColumnBackButton
missed the import with the first commit
|
|
Fix #8527
|
|
Merge upstream changes
|
|
This restores the logic from before the public profile redesign. Fixes #8503
|
|
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml
Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
|
|
Fixes #678
|
|
|
|
|
|
Port 025fbb8285cdedf495d9e4d015db611b0c622cbb to glitch-soc
|
|
|
|
|