1424 Commits (a90d0419d97db50cca034b9d30969f3d161a69b1)

Author	SHA1	Message	Date
David Yip	48d79007f6	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	8 years ago
Norayr Chilingarian	48cd6dc6ca	armenian translations initial commit (#6320) ... * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	8 years ago
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	8 years ago
codl	cfd2b06821	fix filter search index being too strict when looking for line breaks (#6318)	8 years ago
Eugen Rochko	31d1485887	Display number of follow requests in getting started menu, and (#6313) ... if notifications column is not mounted, also display number of unread notifications there.	8 years ago
David Yip	e7a0840f8c	Merge pull request #336 from ThibG/glitch-soc/features/tag-warning ... Display a warning when composing unlisted toots with something looking like a hashtag	8 years ago
David Yip	24b6e4121f	Merge pull request #342 from glitch-soc/merge-upstream ... Merge upstream	8 years ago
David Yip	3cae362214	Merge new onboarding styles; delete refs to PNGs.	8 years ago
David Yip	38f6d8130d	Eliminate stray conflict markers.	8 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	8 years ago
SerCom_KC	80b3ca0f6f	Update Simplified Chinese translations (#6306) ... * i18n: (zh-CN) Add translations of #6251 * i18n: (zh-CN) Improve translations for #6291 * Fix en.json * i18n: (zh-CN) Update translations for #6303 * i18n: (zh-CN) Add translations of #6273 with minor adjustment * Minor fix * Minor fix	8 years ago
Eugen Rochko	79b34a0fa2	Restore onboarding modal (#6303) ... * Restore onboarding modal Revert 5ba8b3a396 * Change greeting elephant graphic, fix up some design issues * Fix wrong link color in onboarding modal	8 years ago
Eugen Rochko	872a0d5bd8	Improve HTML e-mails based on Litmus tests (#6301) ... * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	8 years ago
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	8 years ago
Thibaut Girka	1619efd735	Do not discard statuses obtained via websocket when API request finishes ... This backports 0b888acfd4	8 years ago
ThibG	0b888acfd4	Do not throw away statuses obtained via websocket when API request finishes (#6302)	8 years ago
Eugen Rochko	540b3f37ae	Replace drawer elephant graphic with a vector image (#6286) ... * Replace drawer elephant graphic with a vector image * Replace wave graphic with SVG * Remove unused elephant graphic	8 years ago
Thibaut Girka	1287b2782b	Display a warning when composing unlisted toots with something looking like a hashtag ... This is a backport of b6af88192f to the glitch flavour.	8 years ago
David Yip	26ecee79bf	Merge pull request #332 from glitch-soc/merge-upstream ... Merge in home feed regeneration changes from upstream	8 years ago
Eugen Rochko	d799921c75	Replace tutorial modal with welcome e-mail (#6273) ... * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	8 years ago
David Yip	766d6aac44	Strip trailing whitespace on win95.scss	8 years ago
David Yip	d3f64812a6	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update ... Conflicts: app/javascript/styles/win95.scss config/themes.yml	8 years ago
David Yip	3896cd5d79	Use absolute paths for new working/not-found SVGs ... This allows these component styles to be used in i.e. the win95 skin.	8 years ago
David Yip	bcd86404da	Port 7badad7797 to glitch frontend	8 years ago
David Yip	e27eedbd08	Merge branch 'gs-master' into merge-upstream	8 years ago
David Yip	708ec07e27	Style fixes to make eslint happier, hopefully	8 years ago
David Yip	201e82686f	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	8 years ago
Eugen Rochko	7badad7797	Fix home regeneration (#6251) ... * Fix regeneration marker not being removed after completion * Return HTTP 206 from /api/v1/timelines/home if regeneration in progress Prioritize RegenerationWorker by putting it into default queue * Display loading indicator and poll home timeline while it regenerates * Add graphic to regeneration message * Make "not found" indicator consistent with home regeneration	8 years ago
Renato "Lond" Cerqueira	59797ee233	Weblate translations (#6284) ... * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (527 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (528 of 529 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% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 37.2% (197 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Russian) Currently translated at 99.0% (526 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Catalan) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (530 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 75.8% (47 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Polish) Currently translated at 77.4% (48 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Slovak) Currently translated at 38.3% (204 of 532 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Russian) Currently translated at 96.8% (525 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Japanese) Currently translated at 99.0% (537 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Polish) Currently translated at 99.8% (541 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Japanese) Currently translated at 99.0% (538 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 97.4% (529 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	8 years ago
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	0a103c7749	Upgrade ESLint to version 4.x (#6276)	8 years ago
SerCom_KC	fb16c37d2a	Update Simplified Chinese translations (#6280) ... * i18n: (zh-CN) Update translation for #6252 * e-mail -> email * i18n: (zh-CN) Update translations for #6256 * i18n: (zh-CN) Minor Improvements * i18n: (zh-CN) Update translations for #6263 * i18n: (zh-CN) Update translations for #6279	8 years ago
Eugen Rochko	6f244ba82c	Use better reblog icon and improve contrast in HTML e-mails (#6272)	8 years ago
Eugen Rochko	02194838dd	HTML e-mails for NotificationMailer (#6263) ... * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	8 years ago
kibi!	60ff086960	Fixed improper mailer import	8 years ago
kibi!	cda845ae0e	Fix mailer to use webpack core	8 years ago
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	8 years ago
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	8 years ago
Eugen Rochko	7861c5f108	Surround mid-text display names with bdi tags (#6257) ... * Fix #1095 - Surround mid-text display names with bdi tags * Update jest snapshot	8 years ago
Eugen Rochko	3987bd18a4	Fix #6128 - Display unfollow button even if account moved (#6258)	8 years ago
Jenkins	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
neetshin	2091ae92be	Make columns-area unscrollable when modal opened (#6241) ... * 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 * Make columns-area unscrollable when modal opend * Make columns-area unscrollable when modal opened	8 years ago
Gô Shoemake	08e4c78e78	Fix column headers accessibility (#6199) ... * Fix accessibility of column headers As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed: * Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling. * There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks. * I didn't even realize there was a Settings toggle until I made this change. Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands. Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks! * Styling fixes * Fixed overflow issue	8 years ago
kibi!	8ee6ed358f	Increase priority of favstar gold	8 years ago
kibi!	1ee0e91fb6	Fixes to notification styling	8 years ago
kibi!	b9f4896830	Fixes to drawer and CWs	8 years ago
beatrix	cd6674606f	Merge pull request #329 from KnzkDev/scss-refactor ... SCSS Refactor	8 years ago
beatrix	39f231f3da	Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend ... Add glitchy elephant friend	8 years ago
kibi!	0fb3bd09e9	Oops this should have been a part of last commit	8 years ago
kibi!	1fa03e026a	Fixes onboarding modal (#318)	8 years ago