hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,287 Commits
7 Branches
0 Tags
179 MiB
Commit Graph

4287 Commits (79d891111671a5a5fd67d0446659f7d7712484b1)

Author SHA1 Message Date
Surinna Curtis 79d8911116 Fixed a typo that was breaking the account mute API endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis d880b3182b minor code style fixes oops 2017-09-13 21:47:30 -05:00
Surinna Curtis f9d7b8a94f Refactor handling of default params for muting to make code cleaner 2017-09-13 21:47:30 -05:00
Surinna Curtis 211f0a9513 add an explanatory comment to AccountInteractions 2017-09-13 21:47:30 -05:00
Surinna Curtis 4a527154b7 fix a missing import 2017-09-13 21:47:30 -05:00
Surinna Curtis df71eadaae In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. 2017-09-13 21:47:30 -05:00
Surinna Curtis 323d437a09 satisfy eslint 2017-09-13 21:47:30 -05:00
Surinna Curtis 3278c08c29 make the hide/unhide notifications buttons work 2017-09-13 21:47:30 -05:00
Surinna Curtis 0284fd723b Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis 0e0703dbd8 Show whether muted users' notifications are muted in account lists 2017-09-13 21:47:30 -05:00
Surinna Curtis 7dbcc7ed3d Expose whether a mute hides notifications in the api/v1/relationships endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis 83b3a0389c Add more specs for the /api/v1/mutes/details endpoint 2017-09-13 21:47:30 -05:00
Surinna Curtis af2d793398 Define a serializer for /api/v1/mutes/details 2017-09-13 21:47:30 -05:00
Surinna Curtis 70592cdaba Add a /api/v1/mutes/details route that just returns the array of mutes. 2017-09-13 21:47:30 -05:00
Surinna Curtis 30b5254a5d Put the label for the hide notifications checkbox in a label element. 2017-09-13 21:47:30 -05:00
Surinna Curtis 0a207be99d add trailing newlines to files for Pork :) 2017-09-13 21:47:30 -05:00
Surinna Curtis 500c465226 specs for MuteService notifications params 2017-09-13 21:47:30 -05:00
Surinna Curtis 2ea9b164d3 Satisfy eslint. 2017-09-13 21:47:30 -05:00
Surinna Curtis b1576c52df Convert profile header mute to use mute modal 2017-09-13 21:47:30 -05:00
Surinna Curtis 4612f7caea Break out a separate mute modal with a hide-notifications checkbox. 2017-09-13 21:47:30 -05:00
Surinna Curtis 0c547faf92 Less gross passing of notifications flag 2017-09-13 21:47:30 -05:00
Surinna Curtis eaaf2170fe API support for muting notifications (and specs) 2017-09-13 21:47:30 -05:00
Surinna Curtis 6f7d00bfdd Add support for muting notifications in MuteService 2017-09-13 21:47:30 -05:00
Surinna Curtis 5c2e1869f0 specs testing that hide_notifications in mutes actually hides notifications 2017-09-13 21:47:30 -05:00
Surinna Curtis 0f2af2a974 Add specs for how mute! interacts with muting_notifications? 2017-09-13 21:47:30 -05:00
Surinna Curtis 27f8d7069b block notifications in notify_service from hard muted accounts 2017-09-13 21:47:30 -05:00
Surinna Curtis 44207b6af6 Add muting_notifications? and a notifications argument to mute! 2017-09-13 21:47:30 -05:00
Surinna Curtis 27e55da853 Add a hide_notifications column to mutes 2017-09-13 21:47:30 -05:00
Surinna Curtis 3cac5bc2c3 Fix a spuriously failing spec that assumed we required short bios like upstream 2017-09-10 19:43:52 -05:00
Surinna Curtis 29c44fa5fa Remove unused imports 2017-09-10 16:00:26 -05:00
Surinna Curtis 7a9c7d4e0b Merge pull request #143 from yipdw/sync/upstream 
Merge with upstream's 1.6.0
 2017-09-10 14:10:30 -05:00
David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream 2017-09-10 13:04:27 -05:00
beatrix c9df53044a Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4 
Merge with 1.6.0rc4

STRAP IN BUCKAWOO HERE WE GO AGAIN
 2017-09-10 13:34:14 -04:00
Eugen Rochko ab71cf4593 Bump to 1.6.0 2017-09-10 15:10:03 +02:00
Eugen Rochko c450ddb613 Fix POST /api/v1/follows error when already following (#4878) 2017-09-10 15:09:06 +02:00
yoshipc 15b886a6f0 Fix Japanese translation (#4876) 
I translated the additional text ( added by #4871)
 2017-09-10 20:34:15 +09:00
Eugen Rochko 4819e2913d Bump version to 1.6.0rc5 2017-09-10 10:26:51 +02:00
Eugen Rochko 72e662bb0d Hide modal loading screen for media/video/boost/confirm/actions modals (#4873) 2017-09-10 10:26:01 +02:00
Eugen Rochko 7d7844a47f Default follows for new users (#4871) 
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 09:58:38 +02:00
Eugen Rochko f2cbfb2eb3 Fix dimensions of loading component for compose drawer (#4872) 2017-09-10 08:48:11 +02:00
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
 2017-09-09 23:56:21 -05:00
beatrix 3dff74eecf Merge pull request #141 from yipdw/sync/upstream 
Sync with upstream @ v1.6.0rc3

ohhhhhhhhhhh heck here we go
 2017-09-09 20:11:48 -04:00
Yamagishi Kazutoshi 3f333a8d31 Set fallback address when empty notification address (#4868) 2017-09-09 21:31:48 +02:00
David Yip 14e1fb8d36 Add missing import (patch by @MightyPork) 2017-09-09 14:28:20 -05:00
David Yip 514fc908a3 Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
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 14:27:47 -05:00
Quent-in bc077018b8 i10n minors changes for 1.6 (#4867) 
* wrong preposition + typo

* wrong preposition + typo

* Typo

* Typo

* minor changes

* minor changes
 2017-09-09 18:22:56 +02:00
Eugen Rochko 90712d4293 Fix errors preventing UnsubscribeService from working (#4866) 2017-09-09 17:36:27 +02:00
Eugen Rochko 6867681c7c Add script to make embedded iframes autosize (#4853) 2017-09-09 16:23:44 +02:00
Eugen Rochko bdc8b4fd91 Disable mouse-based pause from #4859 (#4865) 
It wasn't working ideally and introduced some annoying false positivies
 2017-09-09 15:09:50 +02:00