e6a8692d0e
minor code style fixes oops
7 years ago
3688a48100
Refactor handling of default params for muting to make code cleaner
7 years ago
d6b0f5fb2c
add an explanatory comment to AccountInteractions
7 years ago
97469efc35
fix a missing import
7 years ago
11088e5667
In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.
7 years ago
5774861ece
satisfy eslint
7 years ago
20fd564109
make the hide/unhide notifications buttons work
7 years ago
b2ba83bbda
Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
7 years ago
27567d9ce9
Show whether muted users' notifications are muted in account lists
7 years ago
d629e90628
Expose whether a mute hides notifications in the api/v1/relationships endpoint
7 years ago
86d02930c7
Add more specs for the /api/v1/mutes/details endpoint
7 years ago
8a90d61de0
Define a serializer for /api/v1/mutes/details
7 years ago
2bd218dfdb
Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
27ee70ba19
Put the label for the hide notifications checkbox in a label element.
7 years ago
b7227d05f8
add trailing newlines to files for Pork :)
7 years ago
5fa430ba7c
specs for MuteService notifications params
7 years ago
9cdcd429d9
Satisfy eslint.
7 years ago
62fde4c01c
Convert profile header mute to use mute modal
7 years ago
5d43556afd
Break out a separate mute modal with a hide-notifications checkbox.
7 years ago
277f0e69a8
Less gross passing of notifications flag
7 years ago
1e69cc4228
API support for muting notifications (and specs)
7 years ago
06a7000498
Add support for muting notifications in MuteService
7 years ago
6221116794
specs testing that hide_notifications in mutes actually hides notifications
7 years ago
8a965eba19
Add specs for how mute! interacts with muting_notifications?
7 years ago
b4ffe602a5
block notifications in notify_service from hard muted accounts
7 years ago
0d5ce9d8e6
Add muting_notifications? and a notifications argument to mute!
7 years ago
df04a52a4d
Add a hide_notifications column to mutes
7 years ago
2f872fc0aa
Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
485de6b477
Remove unused imports
7 years ago
d817a53479
Merge pull request #143 from yipdw/sync/upstream
...
Merge with upstream's 1.6.0
7 years ago
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
7 years ago
6f7e7a8f2c
Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4
...
Merge with 1.6.0rc4
STRAP IN BUCKAWOO HERE WE GO AGAIN
7 years ago
6d13a61ea8
Bump to 1.6.0
7 years ago
078c84fbb5
Fix POST /api/v1/follows error when already following ( #4878 )
7 years ago
92bdd78105
Fix Japanese translation ( #4876 )
...
I translated the additional text ( added by #4871 )
7 years ago
0e213d4b1a
Bump version to 1.6.0rc5
7 years ago
762ca653b6
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
7 years ago
6628ea4a82
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)
7 years ago
63cb303a66
Fix dimensions of loading component for compose drawer ( #4872 )
7 years ago
017738c604
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
7 years ago
e7779adc0d
Merge pull request #141 from yipdw/sync/upstream
...
Sync with upstream @ v1.6.0rc3
ohhhhhhhhhhh heck here we go
7 years ago
4c0a563c0c
Set fallback address when empty notification address ( #4868 )
7 years ago
bee4cdc8d2
Add missing import (patch by @MightyPork)
7 years ago
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
da3f22ee7d
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
7 years ago
899e7ad811
i10n minors changes for 1.6 ( #4867 )
...
* wrong preposition + typo
* wrong preposition + typo
* Typo
* Typo
* minor changes
* minor changes
7 years ago
86cf6905cc
Fix errors preventing UnsubscribeService from working ( #4866 )
7 years ago
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
7 years ago
d8bbe7cf7c
Disable mouse-based pause from #4859 ( #4865 )
...
It wasn't working ideally and introduced some annoying false positivies
7 years ago
fafd9d8bae
Bump version to 1.6.0rc4
7 years ago
Surinna Curtis
David Yip
beatrix
Eugen Rochko
yoshipc
Yamagishi Kazutoshi
Quent-in