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
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
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
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
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
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
078c84fbb5
Fix POST /api/v1/follows error when already following ( #4878 )
2017-09-10 15:09:06 +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
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
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
6fb8be482b
Fetch statuses/following/followers numbers from ActivityPub collections ( #4840 )
2017-09-08 12:00:17 +02:00
1a4beb3122
i18n: Update Polish translation ( #4845 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-08 05:51:48 +09:00
cbe9eb3f2e
i10n OC / FR update Pinned toots ( #4842 )
...
* Added column.pins
New strings
* Added column.pins
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update password_change.oc.html.erb
* Update password_change.oc.text.erb
* Update reset_password_instructions.oc.html.erb
* Update reset_password_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
2017-09-07 22:07:03 +02:00
8bb036350a
Fix #4834 - Adjust Status#local and Status#remote scopes ( #4839 )
2017-09-07 20:18:34 +02:00
3c816b0a77
Use <button> instead of <div role="button"> ( #4835 )
2017-09-07 16:18:41 +02:00
d766cb0c3c
Add Pinned toot column ( #4817 )
...
* Add Pinned_toot_section
* Fix add frozen_string_literal
* Fix delete no need controller and tests
* Fix replace query strings to axios params
* Fix change value to accountId and disabling more button
2017-09-07 09:58:11 +02:00
ac63da7732
Feat add validation for report comment: characters under 1000 valid ( #4833 )
2017-09-07 09:55:42 +02:00
e489378e22
i10n update OC and FR files ( #4824 )
...
* Onboarding: corrections
Some missing letters and spaces or better wording
* Embed
Translated as Intégrer in FR / Embarcar in OC
2017-09-07 08:55:03 +09:00
Surinna Curtis