mastodon

Commit Graph

Author	SHA1	Message	Date
David Yip	d817c0a958	Merge pull request #291 from glitch-soc/merge-upstream Merge with upstream @ `f4b80e6511`	7 years ago
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/auth/confirmations_controller.rb	7 years ago
David Yip	e4944d065b	Switch to tootsuite's elephant friend for the drawer This version has a transparent background, which works better with the wave.	7 years ago
David Yip	513d982f29	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
cwm	4ce44ba470	remove unused 'saveSettings' from column_settings_container	7 years ago
cwm	0dce26b82b	web push updates (tootsuite PRs #5879 , #5941 , #6047 )	7 years ago
Jeong Arm	f4b80e6511	Translate Korean (#6131 ) Relates to #6125, #6099	7 years ago
MitarashiDango	511c6f9625	bug fix (WebPush does not work) (#6120 )	7 years ago
cwm	832a93e67c	Fix GIF avatars not autoplaying (fixes #287 , tootsuite pr #6000 )	7 years ago
David Yip	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
Akihiko Odaki	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
beatrix	7347bc7334	Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch Merge various small vanilla updates into glitch	7 years ago
cwm	20ad071931	Set direction style to reply indicator (tootsuite pr #6006 )	7 years ago
cwm	14243bf80a	Reduce motion for boost animation (tootsuite pr #5871 )	7 years ago
cwm	337c2e77ee	Fix layout for RTL (tootsuite pr #6014 , #6018 )	7 years ago
cwm	46565ed746	Fix focused background color of favourited direct toot (tootsuite pr #6021 )	7 years ago
cwm	815524412b	Move dropdown transform origin (tootsuite pr #6091 )	7 years ago
cwm	083571915f	onMuteNotifications validation (tootsuite pr #6092 )	7 years ago
cwm	2bbd22e91c	Rename settingKey to settingPath (tootsuite pr #6046 & #6098 )	7 years ago
cwm	cc6a2ffd0a	use 'flavours/glitch/' prefix in new imports	7 years ago
cwm	22818d2a16	Add mute, block, conversation mute actions to detailed status dropdown menu	7 years ago
Jenkins	bed13f22e2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Chris	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
MitarashiDango	a3b369337f	Additional prop name change. (#6098 )	7 years ago
Jenkins	f77c47d01b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Neetshin	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
Nolan Lawson	a8eb0bf44f	Reduce motion for boost animation (#5871 ) * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	7 years ago
Akihiko Odaki	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
Chris	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
cpsdqs	8528fd89d2	Move dropdown transform origin to top edge (#6091 )	7 years ago
ncls7615	fb57ec41df	Update and add some translate	7 years ago
ncls7615	4694dcfe16	Add more en and ja	7 years ago
ncls7615	02db8aa3a0	Add en and ja	7 years ago
beatrix	60d415bc5e	Merge pull request #266 from chriswmartin/getting-started-improvements Getting started column improvements	7 years ago
ncls7615	191b625a27	Fix account header avatar	7 years ago
David Yip	7bb99ca3cf	Add data-status-by back to DetailedStatus component. Fixes #273 .	7 years ago
cwm	d736739e8f	<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049 )	7 years ago
David Yip	dbd5f8b9a5	Wrap <Avatar> in account header in a link to that account's page. Fixes #245 .	7 years ago
cwm	9042f9a813	add keyboard shortcuts to getting started (fixes #275 )	7 years ago
Jenkins	6f11aa8383	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	81d29e4126	Rename settingKey in setting_toggle to settingPath (#6046 )	7 years ago
Neetshin	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
Jeong Arm	e52293482e	Update Korean translation (#6050 ) * Update Korean translation * Translate Korean for javascript * Add missing translations on simple_form	7 years ago
ncls7615	d3b2677775	Add en and ja	7 years ago
cwm	14aae9c05c	missed a semicolon	7 years ago
cwm	be50e45a74	use makeMapStateToProps	7 years ago
cwm	e4ebbf4f07	use list-ul icon in list header and web/lists	7 years ago
Jenkins	e7fa7fce25	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Peter	f38e6a14f2	Add Slovak translation (#6052 ) * Add Slovak translation * Slovak translation: i18n-normalize	7 years ago
ncls7615	9e8fa3caee	fix admin/action_logs page	7 years ago
kibigo!	e677dda07c	Fixes #244 to make search results scrollable	7 years ago
NCLS	e9a5bde9a0	Update ja.js	7 years ago
NCLS	61ed5b972c	Update ja.js	7 years ago
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Naoki Kosaka	25b0d7538e	Fix oEmbed image_modal src. (#6027 )	7 years ago
SerCom_KC	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
Jeroen	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	e5a9831a56	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Lynx Kotoura	0d3ffa691e	Fix focused background color of notifications of direct toots (#6021 )	7 years ago
Lynx Kotoura	5ad45552b3	Fix overflowing emojis on some devices (#6016 ) * Fix overflowing emojis on some devices * Quit visible and add padding	7 years ago
Olivier Humbert	dc313f27bb	1 fix + 1 translation (#6019 )	7 years ago
Jenkins	10f800ab46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	3487460f00	Fix regression from #6014 (#6018 )	7 years ago
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Quenty31	72314d26ae	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
Eugen Rochko	cc75d47926	Fix layout for RTL (#6014 )	7 years ago
Lynx Kotoura	8bf4cc72b6	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
Lynx Kotoura	0aeec0390b	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
Eugen Rochko	fef6625496	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
SerCom_KC	775c3056b6	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
Yamagishi Kazutoshi	07b4427865	Set direction style to reply indicator (#6006 )	7 years ago
Eugen Rochko	155e211dd0	Fix GIF avatars not autoplaying when GIF autoplay is enabled (#6000 )	7 years ago
cwm	17e53b931c	code style fixes	7 years ago
cwm	9719983f2d	move list items into an array, don't unnecessarily concat misc nav item	7 years ago
Eugen Rochko	71965cbef2	Adjust empty list timeline message (#5997 )	7 years ago
Eugen Rochko	0128b86d30	Use streaming API for standalone timelines on /about and /tag pages (#5998 )	7 years ago
Neetshin	0c8b1eb577	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
cwm	b6ded7119e	travis fixes	7 years ago
beatrix	504c3d650f	Merge pull request #264 from KnzkDev/add-ja i18n: Add ja translate	7 years ago
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
cwm	9b7208f4b4	readded connect for onboarding modal	7 years ago
cwm	b358483ef2	remove unneeded imports from getting_started_misc	7 years ago
cwm	37ced4c903	add components to getting started column	7 years ago
ncls7615	b93ad3d0e8	add ja	7 years ago
beatrix	771b950feb	Merge pull request #254 from glitch-soc/new-theme-ux New flavour/skin UX	7 years ago
ncls7615	9d5ecdbf41	remove picture	7 years ago
kibigo!	ed7231947c	Added styling	7 years ago
kibigo!	bdca1614d5	Screenshot support for themes	7 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	7 years ago
beatrix	08b0861b96	Merge pull request #250 from chriswmartin/fav-confirm-modal add favourite confirmation modal	7 years ago
ncls7615	d420e2f047	add comma	7 years ago
ncls7615	279231c5dd	" => '	7 years ago
ncls7615	a98b0a47ef	Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles # Conflicts: # app/javascript/glitch/locales/ja.json	7 years ago
cwm	0466aa8d08	use single quotes in locale entry	7 years ago
cwm	072ab191cc	pulled master, moved locale entry to new location	7 years ago
cwm	eec5d350fd	removed unneeded actions_modal div	7 years ago
kibigo!	cd107e92cb	Move ja localization to new locaiton	7 years ago
kibigo!	6b7085a33e	Linting fixes	7 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	7 years ago
kibigo!	d08d0f9f33	Ruby intl8n for themes	7 years ago

1 2 3 4 5 ...

1306 Commits (b75a1ce326908392ad833ac71709263f0d0a12d5)