about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-12-20Set packs on 2FA-related pages. Fixes #271.David Yip
Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor
2017-12-20Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-20Rename settingKey in setting_toggle to settingPath (#6046)Akihiko Odaki
2017-12-20Replace <code> to <kbd> in KeyboardShortcuts component (#6049)Neetshin
* Add aria-autocomplete='list' in Textaria ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete * Make detect empty string brefore assign upload description * Change code elements in keyboard-shortcuts component to kbd
2017-12-20Update Korean translation (#6050)Jeong Arm
* Update Korean translation * Translate Korean for javascript * Add missing translations on simple_form
2017-12-19Merge pull request #272 from KnzkDev/add-en-jabeatrix
i18n: Update some locale files
2017-12-19Add en and jancls7615
2017-12-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-17Add Slovak translation (#6052)Peter
* Add Slovak translation * Slovak translation: i18n-normalize
2017-12-16Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-16Merge pull request #253 from glitch-soc/prevent-local-only-federationbeatrix
prevent federation of local-only statuses
2017-12-16Merge pull request #270 from KnzkDev/fix/action_logsbeatrix
Fix admin/action_logs page
2017-12-16fix admin/action_logs pagencls7615
2017-12-15Fixes #244 to make search results scrollablekibigo!
2017-12-15Remove period from the version number (#6039)Daigo 3 Dango
2.1.0. -> 2.1.0
2017-12-15Merge branch 'gs-master' into prevent-local-only-federationDavid Yip
Conflicts: db/schema.rb
2017-12-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-15Bump version to 2.1.0 🎆Eugen Rochko
2017-12-15Merge pull request #269 from ncls7615/patch-1beatrix
Update ja.js
2017-12-15Update ja.jsNCLS
2017-12-15Update ja.jsNCLS
2017-12-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-15Bump version to 2.1.0rc6Eugen Rochko
2017-12-15Do not hide statuses from silenced accounts from other silenced accounts (#6030)Eugen Rochko
2017-12-14Fix oEmbed image_modal src. (#6027)Naoki Kosaka
2017-12-14Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)Eugen Rochko
2017-12-14Improve Chinese (Simplified) Translations (#6024)SerCom_KC
* i18n: (zh-CN) Change `工作人员` (staff) to `管理人员` Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109 * i18n: (zh-CN) Change `协管` to `监察员` * i18n: (zh-CN) Fix all "Are you" questions * i18n: (zh-CN) Various improvements * i18n: (zh-CN) Final clean-up * i18n: (zh-CN) Change translation for 500 * i18n: (zh-CN) Remove spaces between time distances * i18n: (zh-CN) Improve translations
2017-12-14Last minute Dutch string updates (#6025)Jeroen
* Last minute Dutch strinfupdate * Last minute Dutch strings update * Fixing Weblate output errors * Fixing Weblate output errors * Fixing more Weblate rubish Weblate is also changing some " to ' - I think that is not a problem * Fixing more weblate stuff * Fixing * Update nl.yml
2017-12-14Examples for Status.as_public_timeline.David Yip
Also adjust the examples for Status.as_tag_timeline to match the nomenclature used in .as_public_timeline (e.g. "account" -> "viewer").
2017-12-14Examples for Status#set_locality and .as_tag_timeline.David Yip
This commit also: - exposes the local-only emoji so that it can be used in examples - allows local_only to be set explicitly, i.e. for timeline filtering specs
2017-12-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-14Fix focused background color of notifications of direct toots (#6021)Lynx Kotoura
2017-12-13Fix overflowing emojis on some devices (#6016)Lynx Kotoura
* Fix overflowing emojis on some devices * Quit visible and add padding
2017-12-131 fix + 1 translation (#6019)Olivier Humbert
2017-12-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-13Bump version to 2.1.0rc5Eugen Rochko
2017-12-13Fix regression from #6014 (#6018)Eugen Rochko
2017-12-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-14l10n OC and FR updates (#6017)Quenty31
* Adjust empty list timeline message (#5997) * Adjust empty list timeline message (#5997) * Add filters to admin UI for custom emojis (#6003) + #6004 * Update fr.yml
2017-12-13Fix layout for RTL (#6014)Eugen Rochko
2017-12-13Excahnge the order of spoiler-input and unlocked warning (#6015)Lynx Kotoura
* Excahnge the order of spoiler-input and unlocked warning * Fix trailing whitespace
2017-12-13Update FR translation (#6012)Olivier Humbert
2017-12-13Redesign tootbox (#5919)Lynx Kotoura
* Redesign tootbox * Move counter into compose-form__buttons-wrapper Change font and remove shadow Refactor sass codes of compose-form
2017-12-13Weblate translations (#6011)Eugen Rochko
* Translated using Weblate (Dutch) Currently translated at 100.0% (522 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.8% (521 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.4% (519 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 99.4% (519 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.6% (520 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Arabic) Currently translated at 40.0% (209 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Polish) Currently translated at 99.8% (521 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Added translation using Weblate (Galician) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.0% (517 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Galician) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 22.6% (17 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Portuguese) Currently translated at 66.0% (37 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Japanese) Currently translated at 99.6% (520 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (520 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 48.8% (21 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 73.2% (41 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * i18n-tasks normalize && yarn manage:translations * Restore wrongfully deleted files
2017-12-13Update Chinese (Simplified) translations (#6005)SerCom_KC
* i18n: (zh-CN) Remove spaces in time distances * i18n: (zh-CN) Update translations for #5997 * i18n: (zh-CN) Add translation for #6004 also change translation of `staff` from `管理员` to `工作人员` * i18n: (zh-CN) Add translations for #6003 * i18n: (zh-CN) Normalization
2017-12-13Make sure call `done();` in the listener of public timeline for anonymous ↵nullkal
connection (#6009)
2017-12-13Fix the condition in streaming listener (#6008)nullkal
2017-12-13Add filters to admin UI for custom emojis (#6003)Eugen Rochko
2017-12-13Bump version to 2.1.0rc4Eugen Rochko
2017-12-13Change streaming API URL when remote development (#5942)Yamagishi Kazutoshi
* Change streaming API URL when remote development * Use STREAMING_API_BASE_URL when dev env
generated by cgit-pink (git 2.37.1) at 2024-12-27 15:23:01 +0000