Surinna Curtis
f55b76afba
Apply white-space: nowrap to account relationships icons
2017-09-14 07:37:39 -05:00
Surinna Curtis
7de500297b
Tweak title text for mute notifications toggle to be clearer
2017-09-13 22:54:14 -05:00
Surinna Curtis
5c5416aa7a
fix typos in the migration
2017-09-13 22:35:48 -05:00
Surinna Curtis
c872ae6e76
Fixed a typo that was breaking the account mute API endpoint
2017-09-13 21:47:30 -05:00
Surinna Curtis
3688a48100
Refactor handling of default params for muting to make code cleaner
2017-09-13 21:47:30 -05:00
Surinna Curtis
d6b0f5fb2c
add an explanatory comment to AccountInteractions
2017-09-13 21:47:30 -05:00
Surinna Curtis
97469efc35
fix a missing import
2017-09-13 21:47:30 -05:00
Surinna Curtis
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
Surinna Curtis
5774861ece
satisfy eslint
2017-09-13 21:47:30 -05:00
Surinna Curtis
20fd564109
make the hide/unhide notifications buttons work
2017-09-13 21:47:30 -05:00
Surinna Curtis
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
Surinna Curtis
27567d9ce9
Show whether muted users' notifications are muted in account lists
2017-09-13 21:47:30 -05:00
Surinna Curtis
d629e90628
Expose whether a mute hides notifications in the api/v1/relationships endpoint
2017-09-13 21:47:30 -05:00
Surinna Curtis
8a90d61de0
Define a serializer for /api/v1/mutes/details
2017-09-13 21:47:30 -05:00
Surinna Curtis
2bd218dfdb
Add a /api/v1/mutes/details route that just returns the array of mutes.
2017-09-13 21:47:30 -05:00
Surinna Curtis
27ee70ba19
Put the label for the hide notifications checkbox in a label element.
2017-09-13 21:47:30 -05:00
Surinna Curtis
b7227d05f8
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
Surinna Curtis
9cdcd429d9
Satisfy eslint.
2017-09-13 21:47:30 -05:00
Surinna Curtis
62fde4c01c
Convert profile header mute to use mute modal
2017-09-13 21:47:30 -05:00
Surinna Curtis
5d43556afd
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
Surinna Curtis
277f0e69a8
Less gross passing of notifications flag
2017-09-13 21:47:30 -05:00
Surinna Curtis
1e69cc4228
API support for muting notifications (and specs)
2017-09-13 21:47:30 -05:00
Surinna Curtis
06a7000498
Add support for muting notifications in MuteService
2017-09-13 21:47:30 -05:00
Surinna Curtis
b4ffe602a5
block notifications in notify_service from hard muted accounts
2017-09-13 21:47:30 -05:00
Surinna Curtis
0d5ce9d8e6
Add muting_notifications? and a notifications argument to mute!
2017-09-13 21:47:30 -05:00
Surinna Curtis
2f872fc0aa
Fix a spuriously failing spec that assumed we required short bios like upstream
2017-09-10 19:43:52 -05:00
Surinna Curtis
485de6b477
Remove unused imports
2017-09-10 16:00:26 -05:00
David Yip
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
Eugen Rochko
078c84fbb5
Fix POST /api/v1/follows error when already following ( #4878 )
2017-09-10 15:09:06 +02:00
Eugen Rochko
762ca653b6
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
2017-09-10 10:26:01 +02:00
Eugen Rochko
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
Eugen Rochko
63cb303a66
Fix dimensions of loading component for compose drawer ( #4872 )
2017-09-10 08:48:11 +02:00
David Yip
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
David Yip
bee4cdc8d2
Add missing import (patch by @MightyPork)
2017-09-09 14:28:20 -05:00
David Yip
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
David Yip
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
Quent-in
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
Eugen Rochko
86cf6905cc
Fix errors preventing UnsubscribeService from working ( #4866 )
2017-09-09 17:36:27 +02:00
Eugen Rochko
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
Eugen Rochko
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
unarist
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
Yamagishi Kazutoshi
f551b2ca7a
Fix second report (regression from 2cc31b3194
) ( #4863 )
2017-09-09 13:42:48 +02:00
Eugen Rochko
dfd9eed84c
Add missing reject_media check before avatar download via ActivityPub ( #4862 )
2017-09-09 13:41:45 +02:00
Lynx Kotoura
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
Eugen Rochko
f79eba1650
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ( #4859 )
2017-09-09 02:26:41 +02:00
Eugen Rochko
1a5442204b
Fix #4852 - Check if already requested from FollowService ( #4855 )
2017-09-09 02:02:44 +02:00
Eugen Rochko
cc4bc2709d
Fix #4850 - When visibility missing from API call to toot, fallback to user preference ( #4861 )
2017-09-09 02:02:29 +02:00
unarist
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
unarist
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
Quent-in
df9c7584c9
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
2017-09-08 13:55:47 +02:00