mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2017-09-13	Tweak title text for mute notifications toggle to be clearer	Surinna Curtis

2017-09-13	fix typos in the migration	Surinna Curtis

2017-09-13	Add migration to default Mute#hide_notifications? to true	Surinna Curtis

2017-09-13	Fixed a typo that was breaking the account mute API endpoint	Surinna Curtis

2017-09-13	minor code style fixes oops	Surinna Curtis

2017-09-13	Refactor handling of default params for muting to make code cleaner	Surinna Curtis

2017-09-13	add an explanatory comment to AccountInteractions	Surinna Curtis

2017-09-13	fix a missing import	Surinna Curtis

2017-09-13	In probably dead code, replace a dispatch of muteAccount that was skipping ↵	Surinna Curtis
	the modal with launching the mute modal.
2017-09-13	satisfy eslint	Surinna Curtis

2017-09-13	make the hide/unhide notifications buttons work	Surinna Curtis

2017-09-13	Allow modifying the hide_notifications of a mute with the ↵	Surinna Curtis
	/api/v1/accounts/:id/mute endpoint
2017-09-13	Show whether muted users' notifications are muted in account lists	Surinna Curtis

2017-09-13	Expose whether a mute hides notifications in the api/v1/relationships endpoint	Surinna Curtis

2017-09-13	Add more specs for the /api/v1/mutes/details endpoint	Surinna Curtis

2017-09-13	Define a serializer for /api/v1/mutes/details	Surinna Curtis

2017-09-13	Add a /api/v1/mutes/details route that just returns the array of mutes.	Surinna Curtis

2017-09-13	Put the label for the hide notifications checkbox in a label element.	Surinna Curtis

2017-09-13	add trailing newlines to files for Pork :)	Surinna Curtis

2017-09-13	specs for MuteService notifications params	Surinna Curtis

2017-09-13	Satisfy eslint.	Surinna Curtis

2017-09-13	Convert profile header mute to use mute modal	Surinna Curtis

2017-09-13	Break out a separate mute modal with a hide-notifications checkbox.	Surinna Curtis

2017-09-13	Less gross passing of notifications flag	Surinna Curtis

2017-09-13	API support for muting notifications (and specs)	Surinna Curtis

2017-09-13	Add support for muting notifications in MuteService	Surinna Curtis

2017-09-13	specs testing that hide_notifications in mutes actually hides notifications	Surinna Curtis

2017-09-13	Add specs for how mute! interacts with muting_notifications?	Surinna Curtis

2017-09-13	block notifications in notify_service from hard muted accounts	Surinna Curtis

2017-09-13	Add muting_notifications? and a notifications argument to mute!	Surinna Curtis

2017-09-13	Add a hide_notifications column to mutes	Surinna Curtis

2017-09-10	Fix a spuriously failing spec that assumed we required short bios like upstream	Surinna Curtis

2017-09-10	Remove unused imports	Surinna Curtis

2017-09-10	Merge pull request #143 from yipdw/sync/upstream	Surinna Curtis
	Merge with upstream's 1.6.0
2017-09-10	Merge tag 'v1.6.0' into sync/upstream	David Yip

2017-09-10	Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4	beatrix
	Merge with 1.6.0rc4 STRAP IN BUCKAWOO HERE WE GO AGAIN
2017-09-10	Bump to 1.6.0	Eugen Rochko

2017-09-10	Fix POST /api/v1/follows error when already following (#4878)	Eugen Rochko

2017-09-10	Fix Japanese translation (#4876)	yoshipc
	I translated the additional text ( added by #4871)
2017-09-10	Bump version to 1.6.0rc5	Eugen Rochko

2017-09-10	Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)	Eugen Rochko

2017-09-10	Default follows for new users (#4871)	Eugen Rochko
	When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)
2017-09-10	Fix dimensions of loading component for compose drawer (#4872)	Eugen Rochko

2017-09-09	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	David Yip
	Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss
2017-09-09	Merge pull request #141 from yipdw/sync/upstream	beatrix
	Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
2017-09-09	Set fallback address when empty notification address (#4868)	Yamagishi Kazutoshi

2017-09-09	Add missing import (patch by @MightyPork)	David Yip

2017-09-09	Merge tag 'v1.6.0rc3' into sync/upstream	David Yip

2017-09-09	Merge branch 'origin/master' into sync/upstream	David Yip
	Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09	i10n minors changes for 1.6 (#4867)	Quent-in
	* wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes