722b3f567f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
93555182c3
Do not display elephant friend in single-column layout ( #6222 )
7 years ago
c2e1bfd9ae
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c4d36d024c
Update Simplified Chinese translations ( #6215 )
...
* i18n: (zh-CN) Add translations of #6125
* i18n: (zh-CN) Add translations of #6132
* i18n: (zh-CN) Add translations of #6099
* i18n: (zh-CN) Add translations of #6071
* i18n: (zh-CN) Improve translations
7 years ago
bcbdd4f88d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
9e97fbf0af
Translate Korean ( #6212 )
7 years ago
f6adb409fd
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
9a61b0ef22
Fix RFC 5646 Regular Expression ( #6190 )
7 years ago
c69a23ae46
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
d872902997
Small translation fixes for Serbian (and sr@Latn too) ( #6188 )
7 years ago
89daeb43a8
Improve Traditional Chinese translation ( #6166 )
...
* Improve Traditional Chinese translations
* Sort alphabetically
7 years ago
256c2b1de0
Rearrange items in Getting Started navigation ( #6126 )
...
Though the subsections are representing features such as navigation and
settings, they are categorized by the ways how they are implemented
(internal navigation or external links.) They are irrelevant and some
arrangements were confusing because of that. (It is nonsense that instance
information is in settings subsection, for example.)
This fixes the issue by rearranging.
7 years ago
fc884d015a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
d907d4352e
l10n OC language ( #6169 )
...
* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs
7 years ago
53d99ebf4f
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
1001922156
Add Japanese translations #5997 , #6003 , #6004 , #6071 , #6099 , #6125 and #6132 ( #6167 )
...
* yarn manage:translations
* Add Japanese translation for #5997
* Add Japanese translation for #6003
* Add Japanese translation for #6004
* Add Japanese translation for #6071
* Add Japanese translation for #6099
* Add Japanese translation for #6125
* Add Japanese translation for #6132
7 years ago
933840bebf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
94230fe565
Fix newlines-to-spaces functionality ( #6158 )
...
yay for regexes, amirite
7 years ago
b6af88192f
Display a warning when composing unlisted toots with something looking like a hashtag ( #6132 )
7 years ago
3ba7cde38d
Rename key to path in actions and reducers for settings ( #6105 )
7 years ago
21b9da6418
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
7 years ago
54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
7 years ago
764f876953
Use const instead of let for constant ( #6106 )
7 years ago
fa9b7ece2e
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7d376e41be
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
7 years ago
4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
f4b80e6511
Translate Korean ( #6131 )
...
Relates to #6125 , #6099
7 years ago
511c6f9625
bug fix (WebPush does not work) ( #6120 )
7 years ago
7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/images/mastodon-drawer.png
app/javascript/styles/mastodon/components.scss
7 years ago
65f30f65a2
Move the mastodon on Getting Started column to drawer column ( #6109 )
...
Getting Started column obtained many links, and it became much taller.
Because of its height, Getting Started column required long scrolling on
devices with small screen, such as 4 inch phones and 10 inch laptops.
This change moves the mastodon which took large space on the column to
drawer column. The drawer column has only the compose form and has more
space.
7 years ago
bed13f22e2
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1e5d1fa5c8
Add mute, block, conversation mute actions to detailed status dropdown menu ( #6099 )
...
* removed references to hideOnMobile in column_link and getting_started
* add mute, block, conversationMute actions to detailed status dropdown (fixes #1226 )
* remove unused withDismiss in detailed status
7 years ago
a3b369337f
Additional prop name change. ( #6098 )
7 years ago
f77c47d01b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7e6214b869
Add validation for onMuteNotifications ( #6092 )
...
* 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
* Add validation for onMuteNotifications
7 years ago
35fdf561be
Refactor web_push_subscription ( #6047 )
...
* Remove onSave method in mapped properties for column_settings
* Make web_push_subscription.register an action
7 years ago
081956742c
removed references to hideOnMobile in column_link and getting_started ( #6082 )
...
* removed references to hideOnMobile in column_link and getting_started
* move keyboard shortcuts back below blocked users
7 years ago
fb57ec41df
Update and add some translate
7 years ago
4694dcfe16
Add more en and ja
7 years ago
02db8aa3a0
Add en and ja
7 years ago
6f11aa8383
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
81d29e4126
Rename settingKey in setting_toggle to settingPath ( #6046 )
7 years ago
c11a52d888
Replace <code> to <kbd> in KeyboardShortcuts component ( #6049 )
...
* 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
7 years ago
e52293482e
Update Korean translation ( #6050 )
...
* Update Korean translation
* Translate Korean for javascript
* Add missing translations on simple_form
7 years ago
e7fa7fce25
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
f38e6a14f2
Add Slovak translation ( #6052 )
...
* Add Slovak translation
* Slovak translation: i18n-normalize
7 years ago
37254c4f5d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
25b0d7538e
Fix oEmbed image_modal src. ( #6027 )
7 years ago
573414f728
Improve Chinese (Simplified) Translations ( #6024 )
...
* 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
7 years ago
aa273a2718
Last minute Dutch string updates ( #6025 )
...
* 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
7 years ago
Jenkins
Eugen Rochko
SerCom_KC
Jeong Arm
Yamagishi Kazutoshi
Branko Kokanovic
muan
Akihiko Odaki
Quenty31
Marcin Mikołajczak
Noiob
ThibG
David Yip
MitarashiDango
Chris
Neetshin
ncls7615
Peter
Naoki Kosaka
SerCom_KC
Jeroen