mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2017-12-30	Merge pull request #291 from glitch-soc/merge-upstream	David Yip
	Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
2017-12-30	Merge remote-tracking branch 'origin/master' into merge-upstream	David Yip
	Conflicts: app/controllers/auth/confirmations_controller.rb
2017-12-30	Switch to tootsuite's elephant friend for the drawer	David Yip
	This version has a transparent background, which works better with the wave.
2017-12-30	Use ~ notation in components for image references	David Yip
	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	Translate Korean (#6131)	Jeong Arm
	Relates to #6125, #6099
2017-12-28	bug fix (WebPush does not work) (#6120)	MitarashiDango

2017-12-28	Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)	cwm

2017-12-26	Merge remote-tracking branch 'origin/master' into merge-upstream	David Yip
	Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss
2017-12-27	Move the mastodon on Getting Started column to drawer column (#6109)	Akihiko Odaki
	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-26	Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch	beatrix
	Merge various small vanilla updates into glitch
2017-12-26	Set direction style to reply indicator (tootsuite pr #6006)	cwm

2017-12-26	Reduce motion for boost animation (tootsuite pr #5871)	cwm

2017-12-26	Fix layout for RTL (tootsuite pr #6014, #6018)	cwm

2017-12-26	Fix focused background color of favourited direct toot (tootsuite pr #6021)	cwm

2017-12-26	Move dropdown transform origin (tootsuite pr #6091)	cwm

2017-12-26	onMuteNotifications validation (tootsuite pr #6092)	cwm

2017-12-26	Rename settingKey to settingPath (tootsuite pr #6046 & #6098)	cwm

2017-12-26	use 'flavours/glitch/' prefix in new imports	cwm

2017-12-26	Add mute, block, conversation mute actions to detailed status dropdown menu	cwm

2017-12-25	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-25	Add mute, block, conversation mute actions to detailed status dropdown menu ↵	Chris
	(#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-26	Additional prop name change. (#6098)	MitarashiDango

2017-12-24	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-24	Add validation for onMuteNotifications (#6092)	Neetshin
	* 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	Reduce motion for boost animation (#5871)	Nolan Lawson
	* Reduce motion for boost animation Fixes #5833 * Fix ternary expression
2017-12-24	Refactor web_push_subscription (#6047)	Akihiko Odaki
	* Remove onSave method in mapped properties for column_settings * Make web_push_subscription.register an action
2017-12-24	removed references to hideOnMobile in column_link and getting_started (#6082)	Chris
	* removed references to hideOnMobile in column_link and getting_started * move keyboard shortcuts back below blocked users
2017-12-24	Move dropdown transform origin to top edge (#6091)	cpsdqs

2017-12-22	Update and add some translate	ncls7615

2017-12-22	Add more en and ja	ncls7615

2017-12-22	Add en and ja	ncls7615

2017-12-21	Merge pull request #266 from chriswmartin/getting-started-improvements	beatrix
	Getting started column improvements
2017-12-22	Fix account header avatar	ncls7615

2017-12-21	Add data-status-by back to DetailedStatus component. Fixes #273.	David Yip

2017-12-21	<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)	cwm

2017-12-21	Wrap <Avatar> in account header in a link to that account's page. Fixes #245.	David Yip

2017-12-20	add keyboard shortcuts to getting started (fixes #275)	cwm

2017-12-20	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-20	Rename settingKey in setting_toggle to settingPath (#6046)	Akihiko Odaki

2017-12-20	Replace <code> to <kbd> in KeyboardShortcuts component (#6049)	Neetshin
	* 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	Update Korean translation (#6050)	Jeong Arm
	* Update Korean translation * Translate Korean for javascript * Add missing translations on simple_form
2017-12-19	Add en and ja	ncls7615

2017-12-17	missed a semicolon	cwm

2017-12-17	use makeMapStateToProps	cwm

2017-12-17	use list-ul icon in list header and web/lists	cwm

2017-12-17	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	Jenkins

2017-12-17	Add Slovak translation (#6052)	Peter
	* Add Slovak translation * Slovak translation: i18n-normalize
2017-12-16	fix admin/action_logs page	ncls7615

2017-12-15	Fixes #244 to make search results scrollable	kibigo!

2017-12-15	Update ja.js	NCLS