01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
f19b436c83
Switch to tootsuite's elephant friend for the drawer
...
This version has a transparent background, which works better with the
wave.
7 years ago
5ec1a9b484
Use ~ notation in components for image references
...
This uses (more or less) absolute references to external assets, which
allows imported stylesheets (like components.scss) to work from other
locations that may not have the expected path structure (e.g. the win95
theme).
7 years ago
a4ae9c4109
remove unused 'saveSettings' from column_settings_container
7 years ago
093c27fe46
web push updates (tootsuite PRs #5879 , #5941 , #6047 )
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
485dbbb9b7
Fix GIF avatars not autoplaying ( fixes #287 , tootsuite pr #6000 )
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
dde1db7efb
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
...
Merge various small vanilla updates into glitch
7 years ago
4d2ca09ae8
Set direction style to reply indicator (tootsuite pr #6006 )
7 years ago
c670d2cadd
Reduce motion for boost animation (tootsuite pr #5871 )
7 years ago
ccc14ad59b
Fix layout for RTL (tootsuite pr #6014 , #6018 )
7 years ago
44d1b30dfb
Fix focused background color of favourited direct toot (tootsuite pr #6021 )
7 years ago
f9863df926
Move dropdown transform origin (tootsuite pr #6091 )
7 years ago
4a0dd0efea
onMuteNotifications validation (tootsuite pr #6092 )
7 years ago
ab81f8414d
Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )
7 years ago
15796d0b5f
use 'flavours/glitch/' prefix in new imports
7 years ago
61aa7a385b
Add mute, block, conversation mute actions to detailed status dropdown menu
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
59a50e6489
Reduce motion for boost animation ( #5871 )
...
* Reduce motion for boost animation
Fixes #5833
* Fix ternary expression
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
7f1828166d
Move dropdown transform origin to top edge ( #6091 )
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
9ba54d457a
Merge pull request #266 from chriswmartin/getting-started-improvements
...
Getting started column improvements
7 years ago
4c682228ce
Fix account header avatar
7 years ago
d93f6b4720
Add data-status-by back to DetailedStatus component. Fixes #273 .
7 years ago
f923aeec08
<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )
7 years ago
c94a497ef6
Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .
7 years ago
ca77c18c24
add keyboard shortcuts to getting started ( fixes #275 )
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
58e3bd4d71
Add en and ja
7 years ago
5b185a0a0f
missed a semicolon
7 years ago
1dd4e3791f
use makeMapStateToProps
7 years ago
d6ca0e29a7
use list-ul icon in list header and web/lists
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
82bff179f4
fix admin/action_logs page
7 years ago
e59d124be5
Fixes #244 to make search results scrollable
7 years ago
cbc2f1ea5d
Update ja.js
7 years ago
b9d1543f7e
Update ja.js
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
d0a8463db0
Fix focused background color of notifications of direct toots ( #6021 )
7 years ago
891b03536f
Fix overflowing emojis on some devices ( #6016 )
...
* Fix overflowing emojis on some devices
* Quit visible and add padding
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
772456072e
Fix layout for RTL ( #6014 )
7 years ago
cbf6bd4e0c
Excahnge the order of spoiler-input and unlocked warning ( #6015 )
...
* Excahnge the order of spoiler-input and unlocked warning
* Fix trailing whitespace
7 years ago
d7bd1906d4
Redesign tootbox ( #5919 )
...
* Redesign tootbox
* Move counter into compose-form__buttons-wrapper
Change font and remove shadow
Refactor sass codes of compose-form
7 years ago
d4d0befb4b
Weblate translations ( #6011 )
...
* 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
7 years ago
9bef4eb4c0
Update Chinese (Simplified) translations ( #6005 )
...
* 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
7 years ago
7a5e2ffebe
Set direction style to reply indicator ( #6006 )
7 years ago
88aef653ee
Fix GIF avatars not autoplaying when GIF autoplay is enabled ( #6000 )
7 years ago
f464eefc45
code style fixes
7 years ago
430733477c
move list items into an array, don't unnecessarily concat misc nav item
7 years ago
992e8a11fe
Adjust empty list timeline message ( #5997 )
7 years ago
895e3c2e6c
Use streaming API for standalone timelines on /about and /tag pages ( #5998 )
7 years ago
9a7fb53a7f
Make detect empty string before assign image description ( #5994 )
...
* 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
7 years ago
2fa762ef0a
travis fixes
7 years ago
82ec368680
Merge pull request #264 from KnzkDev/add-ja
...
i18n: Add ja translate
7 years ago
a56c9ac5dc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
6cbf55ce7b
readded connect for onboarding modal
7 years ago
c746388452
remove unneeded imports from getting_started_misc
7 years ago
975d888f5c
add components to getting started column
7 years ago
6bfbeb1fe1
add ja
7 years ago
af0031fe1b
Merge pull request #254 from glitch-soc/new-theme-ux
...
New flavour/skin UX
7 years ago
58a133978b
remove picture
7 years ago
d9e1496990
Added styling
7 years ago
a1c79ef544
Screenshot support for themes
7 years ago
901c08a999
Moved flavour UI into own prefs tab
7 years ago
252de634bb
Merge pull request #250 from chriswmartin/fav-confirm-modal
...
add favourite confirmation modal
7 years ago
b07111ceba
add comma
7 years ago
3e6949b554
" => '
7 years ago
5cd4e577c2
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
...
# Conflicts:
# app/javascript/glitch/locales/ja.json
7 years ago
2f56e7e00d
use single quotes in locale entry
7 years ago
34630e00cb
pulled master, moved locale entry to new location
7 years ago
06c490be96
removed unneeded actions_modal div
7 years ago
bb65adc0c0
Move ja localization to new locaiton
7 years ago
b27126f1d6
Linting fixes
7 years ago
99e8710095
Javascript intl8n flavour support
7 years ago
f4c233f59f
Ruby intl8n for themes
7 years ago
188f230f1e
Refix extraspace for emojis ( #5964 )
...
Fix misalignment between emoji sizes
7 years ago
David Yip
cwm
Jeong Arm
MitarashiDango
Akihiko Odaki
beatrix
Jenkins
Chris
Neetshin
Nolan Lawson
cpsdqs
ncls7615
Peter
kibigo!
Naoki Kosaka
SerCom_KC
Jeroen
Lynx Kotoura
Olivier Humbert
Eugen Rochko
Quenty31
Yamagishi Kazutoshi