86007e913d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
0fa691d2a9
Fix RFC 5646 Regular Expression ( #6190 )
7 years ago
796a39a283
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
fb3a2ddd24
Small translation fixes for Serbian (and sr@Latn too) ( #6188 )
7 years ago
22e3acfd56
Improve Traditional Chinese translation ( #6166 )
...
* Improve Traditional Chinese translations
* Sort alphabetically
7 years ago
b080a07550
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
a7b8cb9493
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
bd82de325e
l10n OC language ( #6169 )
...
* new strings: hashtag+unlisted, mute, block
* Add confirmation step for email changes
* Add more instance stats APIs
7 years ago
b83fb8b107
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
d50d61a90c
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
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
653d9b1721
Fix newlines-to-spaces functionality ( #6158 )
...
yay for regexes, amirite
7 years ago
b42cdedfc3
Display a warning when composing unlisted toots with something looking like a hashtag ( #6132 )
7 years ago
5d02615063
Rename key to path in actions and reducers for settings ( #6105 )
7 years ago
1c4142da5b
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
ed572490c1
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
7549f264e6
Use const instead of let for constant ( #6106 )
7 years ago
5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
34a90dc266
Adding Serbian translation ( #6133 )
...
* Adding Serbian translation
* i18n-tasks normalize
7 years ago
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
fc8c2c9b4a
Translate Korean ( #6131 )
...
Relates to #6125 , #6099
7 years ago
a52820a7fd
bug fix (WebPush does not work) ( #6120 )
7 years ago
f722fcb5a6
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
093af89c43
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
2bd6532e63
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1f0ae8d173
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
b4047027d4
Additional prop name change. ( #6098 )
7 years ago
503e7fb4d8
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
fad20b7830
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
3f52d12a4c
Refactor web_push_subscription ( #6047 )
...
* Remove onSave method in mapped properties for column_settings
* Make web_push_subscription.register an action
7 years ago
65cabbe8ef
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
33f2976c84
Update and add some translate
7 years ago
0d900416f7
Add more en and ja
7 years ago
43b9a78f1d
Add en and ja
7 years ago
034617cac1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
73b5392cb2
Rename settingKey in setting_toggle to settingPath ( #6046 )
7 years ago
163da9770c
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
7df9864429
Update Korean translation ( #6050 )
...
* Update Korean translation
* Translate Korean for javascript
* Add missing translations on simple_form
7 years ago
9dd76b5b41
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c9c63c2232
Add Slovak translation ( #6052 )
...
* Add Slovak translation
* Slovak translation: i18n-normalize
7 years ago
601f0fe4a3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7da34ff0a3
Fix oEmbed image_modal src. ( #6027 )
7 years ago
19a2ed9a04
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
0cadfd35a5
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
e3d8c010b1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
4621fd6461
1 fix + 1 translation ( #6019 )
7 years ago
ac183e024b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1010831783
Fix regression from #6014 ( #6018 )
7 years ago
1366e96a02
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
10c0745c8f
l10n OC and FR updates ( #6017 )
...
* 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
7 years ago
Jenkins
Yamagishi Kazutoshi
Branko Kokanovic
muan
Akihiko Odaki
Quenty31
Marcin Mikołajczak
Noiob
ThibG
David Yip
Jeong Arm
MitarashiDango
Chris
Neetshin
ncls7615
Peter
Naoki Kosaka
SerCom_KC
Jeroen
Olivier Humbert
Eugen Rochko