about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-12-22Display deleted users' role as “Suspended” (#6080)ThibG
Deleted users are technically suspended, but the code displaying their status in the admin interface was broken and displayed a javascript object holding translations of the possible user roles instead.
2017-12-21Merge pull request #266 from chriswmartin/getting-started-improvementsbeatrix
Getting started column improvements
2017-12-21Merge pull request #278 from KnzkDev/fix/acc-header-avatarbeatrix
Fix account header avatar
2017-12-22Fix account header avatarncls7615
2017-12-21Merge pull request #277 from ↵beatrix
glitch-soc/273-add-data-status-by-to-detailed-status Add data-status-by back to DetailedStatus component. Fixes #273.
2017-12-21Add data-status-by back to DetailedStatus component. Fixes #273.David Yip
2017-12-21<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)cwm
2017-12-21remove themes.default from i18n-tasks unused checkcwm
2017-12-21Merge pull request #276 from ↵beatrix
glitch-soc/245-click-avatar-to-open-profile-in-new-tab Wrap <Avatar> in account header in a link to that account's page (fixes #245)
2017-12-21Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pagesbeatrix
Set packs on 2FA-related pages. Fixes #271.
2017-12-21Wrap <Avatar> in account header in a link to that account's page. Fixes #245.David Yip
2017-12-21Remove themes.default from i18n-tasks unused checkDavid Yip
This translation key comes in from tootsuite, but the flavours system does not use it.
2017-12-20Remove unused themes.default key in ko locale.David Yip
2017-12-20add keyboard shortcuts to getting started (fixes #275)cwm
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-17missed a semicoloncwm
2017-12-17use makeMapStateToPropscwm
2017-12-17use list-ul icon in list header and web/listscwm
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