97469efc35
fix a missing import
2017-09-13 21:47:30 -05:00
11088e5667
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
5774861ece
satisfy eslint
2017-09-13 21:47:30 -05:00
20fd564109
make the hide/unhide notifications buttons work
2017-09-13 21:47:30 -05:00
b2ba83bbda
Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint
2017-09-13 21:47:30 -05:00
27567d9ce9
Show whether muted users' notifications are muted in account lists
2017-09-13 21:47:30 -05:00
d629e90628
Expose whether a mute hides notifications in the api/v1/relationships endpoint
2017-09-13 21:47:30 -05:00
86d02930c7
Add more specs for the /api/v1/mutes/details endpoint
2017-09-13 21:47:30 -05:00
8a90d61de0
Define a serializer for /api/v1/mutes/details
2017-09-13 21:47:30 -05:00
2bd218dfdb
Add a /api/v1/mutes/details route that just returns the array of mutes.
2017-09-13 21:47:30 -05:00
27ee70ba19
Put the label for the hide notifications checkbox in a label element.
2017-09-13 21:47:30 -05:00
b7227d05f8
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
5fa430ba7c
specs for MuteService notifications params
2017-09-13 21:47:30 -05:00
9cdcd429d9
Satisfy eslint.
2017-09-13 21:47:30 -05:00
62fde4c01c
Convert profile header mute to use mute modal
2017-09-13 21:47:30 -05:00
5d43556afd
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
277f0e69a8
Less gross passing of notifications flag
2017-09-13 21:47:30 -05:00
1e69cc4228
API support for muting notifications (and specs)
2017-09-13 21:47:30 -05:00
06a7000498
Add support for muting notifications in MuteService
2017-09-13 21:47:30 -05:00
6221116794
specs testing that hide_notifications in mutes actually hides notifications
2017-09-13 21:47:30 -05:00
8a965eba19
Add specs for how mute! interacts with muting_notifications?
2017-09-13 21:47:30 -05:00
b4ffe602a5
block notifications in notify_service from hard muted accounts
2017-09-13 21:47:30 -05:00
0d5ce9d8e6
Add muting_notifications? and a notifications argument to mute!
2017-09-13 21:47:30 -05:00
df04a52a4d
Add a hide_notifications column to mutes
2017-09-13 21:47:30 -05:00
2f872fc0aa
Fix a spuriously failing spec that assumed we required short bios like upstream
2017-09-10 19:43:52 -05:00
485de6b477
Remove unused imports
2017-09-10 16:00:26 -05:00
d817a53479
Merge pull request #143 from yipdw/sync/upstream
...
Merge with upstream's 1.6.0
2017-09-10 14:10:30 -05:00
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
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
2017-09-10 13:34:14 -04:00
6d13a61ea8
Bump to 1.6.0
2017-09-10 15:10:03 +02:00
078c84fbb5
Fix POST /api/v1/follows error when already following ( #4878 )
2017-09-10 15:09:06 +02:00
92bdd78105
Fix Japanese translation ( #4876 )
...
I translated the additional text ( added by #4871 )
2017-09-10 20:34:15 +09:00
0e213d4b1a
Bump version to 1.6.0rc5
2017-09-10 10:26:51 +02:00
762ca653b6
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
2017-09-10 10:26:01 +02:00
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)
2017-09-10 09:58:38 +02:00
63cb303a66
Fix dimensions of loading component for compose drawer ( #4872 )
2017-09-10 08:48:11 +02:00
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
2017-09-09 23:56:21 -05:00
e7779adc0d
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
4c0a563c0c
Set fallback address when empty notification address ( #4868 )
2017-09-09 21:31:48 +02:00
bee4cdc8d2
Add missing import (patch by @MightyPork)
2017-09-09 14:28:20 -05:00
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
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
2017-09-09 14:27:47 -05:00
899e7ad811
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
86cf6905cc
Fix errors preventing UnsubscribeService from working ( #4866 )
2017-09-09 17:36:27 +02:00
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
d8bbe7cf7c
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
fafd9d8bae
Bump version to 1.6.0rc4
2017-09-09 14:53:49 +02:00
64eb868c4a
Fix scroll behavior and others on paused timeline ( #4864 )
...
Resolved:
* Lot of redundant renders while mouse moving
* Scroll jumping when timeline loaded
* Scroll position isn't kept when statuses below the scrollTop was deleted then new status arrived
Unresolved:
* Scroll position isn't kept when statuses over the scrollTop was deleted then new status arrived
-> It needs to know which statuses are over the scrollTop
* New status indicator should be active when new statuses arrived while mouse moved recently
-> It needs a) update indicator in ScrollableList, or b) set scrollTop status while mouse moving
2017-09-09 14:16:11 +02:00
f551b2ca7a
Fix second report (regression from 2cc31b3194) ( #4863 )
2017-09-09 13:42:48 +02:00
dfd9eed84c
Add missing reject_media check before avatar download via ActivityPub ( #4862 )
2017-09-09 13:41:45 +02:00
Surinna Curtis