1260 Commits

Author	SHA1	Message	Date
David Yip	fa768abf5c	More ../ -> ~.	2018-01-02 00:26:44 -06:00
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	2018-01-02 00:11:41 -06:00
Akihiko Odaki	764f876953	Use const instead of let for constant (#6106)	2018-01-02 13:28:49 +09:00
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
Jenkins	fa9b7ece2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-31 09:17:15 +00:00
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	2017-12-31 17:28:20 +09:00
David Yip	d817c0a958	Merge pull request #291 from glitch-soc/merge-upstream ... Merge with upstream @ f4b80e6511	2017-12-30 18:24:38 -06:00
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	2017-12-30 17:20:07 -06:00
David Yip	e4944d065b	Switch to tootsuite's elephant friend for the drawer ... This version has a transparent background, which works better with the wave.	2017-12-30 17:17:37 -06:00
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).	2017-12-30 17:15:20 -06:00
Jeong Arm	f4b80e6511	Translate Korean (#6131) ... Relates to #6125, #6099	2017-12-30 02:44:19 +01:00
MitarashiDango	511c6f9625	bug fix (WebPush does not work) (#6120)	2017-12-28 16:20:34 +01:00
cwm	832a93e67c	Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)	2017-12-28 08:30:51 -06:00
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	2017-12-26 22:24:19 -06:00
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.	2017-12-27 03:31:30 +01:00
beatrix	7347bc7334	Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch ... Merge various small vanilla updates into glitch	2017-12-26 17:03:29 -05:00
cwm	20ad071931	Set direction style to reply indicator (tootsuite pr #6006)	2017-12-26 14:20:41 -06:00
cwm	14243bf80a	Reduce motion for boost animation (tootsuite pr #5871)	2017-12-26 14:04:52 -06:00
cwm	337c2e77ee	Fix layout for RTL (tootsuite pr #6014, #6018)	2017-12-26 13:49:53 -06:00
cwm	46565ed746	Fix focused background color of favourited direct toot (tootsuite pr #6021)	2017-12-26 13:30:23 -06:00
cwm	815524412b	Move dropdown transform origin (tootsuite pr #6091)	2017-12-26 13:28:19 -06:00
cwm	083571915f	onMuteNotifications validation (tootsuite pr #6092)	2017-12-26 13:25:43 -06:00
cwm	2bbd22e91c	Rename settingKey to settingPath (tootsuite pr #6046 & #6098)	2017-12-26 13:21:20 -06:00
cwm	cc6a2ffd0a	use 'flavours/glitch/' prefix in new imports	2017-12-26 10:41:44 -06:00
cwm	22818d2a16	Add mute, block, conversation mute actions to detailed status dropdown menu	2017-12-26 10:13:38 -06:00
Jenkins	bed13f22e2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-25 20:17:10 +00:00
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	2017-12-25 20:56:05 +01:00
MitarashiDango	a3b369337f	Additional prop name change. (#6098)	2017-12-26 00:14:06 +09:00
Jenkins	f77c47d01b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-24 15:17:12 +00:00
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	2017-12-24 17:18:45 +09:00
Nolan Lawson	a8eb0bf44f	Reduce motion for boost animation (#5871) ... * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	2017-12-24 04:48:31 +01:00
Akihiko Odaki	35fdf561be	Refactor web_push_subscription (#6047) ... * Remove onSave method in mapped properties for column_settings * Make web_push_subscription.register an action	2017-12-24 04:47:35 +01:00
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	2017-12-24 04:47:02 +01:00
cpsdqs	8528fd89d2	Move dropdown transform origin to top edge (#6091)	2017-12-24 00:53:03 +01:00
ncls7615	fb57ec41df	Update and add some translate	2017-12-22 12:22:41 +09:00
ncls7615	4694dcfe16	Add more en and ja	2017-12-22 12:11:28 +09:00
ncls7615	02db8aa3a0	Add en and ja	2017-12-22 12:01:38 +09:00
beatrix	60d415bc5e	Merge pull request #266 from chriswmartin/getting-started-improvements ... Getting started column improvements	2017-12-21 18:47:07 -05:00
ncls7615	191b625a27	Fix account header avatar	2017-12-22 07:12:49 +09:00
David Yip	7bb99ca3cf	Add data-status-by back to DetailedStatus component. Fixes #273.	2017-12-21 13:22:33 -06:00
cwm	d736739e8f	<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)	2017-12-21 13:04:40 -06:00
David Yip	dbd5f8b9a5	Wrap <Avatar> in account header in a link to that account's page. Fixes #245.	2017-12-21 05:25:16 -06:00
cwm	9042f9a813	add keyboard shortcuts to getting started (fixes #275)	2017-12-20 09:50:29 -06:00
Jenkins	6f11aa8383	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-20 08:17:15 +00:00
Akihiko Odaki	81d29e4126	Rename settingKey in setting_toggle to settingPath (#6046)	2017-12-20 16:19:59 +09:00
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	2017-12-20 11:46:25 +09:00
Jeong Arm	e52293482e	Update Korean translation (#6050) ... * Update Korean translation * Translate Korean for javascript * Add missing translations on simple_form	2017-12-20 11:45:50 +09:00
ncls7615	d3b2677775	Add en and ja	2017-12-19 20:16:48 +09:00
cwm	14aae9c05c	missed a semicolon	2017-12-17 22:21:15 -06:00
cwm	be50e45a74	use makeMapStateToProps	2017-12-17 22:00:25 -06:00