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
c268118e5b
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
2017-09-09 02:26:58 +02:00
f79eba1650
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ( #4859 )
2017-09-09 02:26:41 +02:00
1a5442204b
Fix #4852 - Check if already requested from FollowService ( #4855 )
2017-09-09 02:02:44 +02:00
cc4bc2709d
Fix #4850 - When visibility missing from API call to toot, fallback to user preference ( #4861 )
2017-09-09 02:02:29 +02:00
d29f2a30e4
Refresh timeline after toot while the timeline is disconnected ( #4858 )
...
To reflect status posting immediately, we've inserted the status into timelines directly. However, status insertion changes "latest status", and it means next timeline refresh only fetches statuses since the inserted status. This behavior is very bad for disconnected timeline and mobile views.
After this patch, it refreshes timeline for disconnected timelines, instead of direct insertion.
2017-09-08 21:43:34 +02:00
05ef0ead4a
Handle stream_entry URL correctly in ActivityPub ( #4854 )
...
In before, the method uses stream_entry id as status id, so replied status was wrongly selected.
This PR uses StatusFinder which was introduced with `Api::Web::EmbedsController`.
2017-09-08 18:20:03 +02:00
df9c7584c9
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
2017-09-08 13:55:47 +02:00
a27821f725
Fix language filter codes ( #4841 )
...
* Fix language filter codes
CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)
* Fix zh name
2017-09-08 12:32:22 +02:00
904ab54cf3
"Mute conversation" option on all own toots, not just in notifications ( #4844 )
...
That way you can mute notifications for a toot before you get replies
to it or boosts or favourites
2017-09-08 12:00:30 +02:00
Surinna Curtis