0a207be99d
add trailing newlines to files for Pork :)
2017-09-13 21:47:30 -05:00
500c465226
specs for MuteService notifications params
2017-09-13 21:47:30 -05:00
2ea9b164d3
Satisfy eslint.
2017-09-13 21:47:30 -05:00
b1576c52df
Convert profile header mute to use mute modal
2017-09-13 21:47:30 -05:00
4612f7caea
Break out a separate mute modal with a hide-notifications checkbox.
2017-09-13 21:47:30 -05:00
0c547faf92
Less gross passing of notifications flag
2017-09-13 21:47:30 -05:00
eaaf2170fe
API support for muting notifications (and specs)
2017-09-13 21:47:30 -05:00
6f7d00bfdd
Add support for muting notifications in MuteService
2017-09-13 21:47:30 -05:00
5c2e1869f0
specs testing that hide_notifications in mutes actually hides notifications
2017-09-13 21:47:30 -05:00
0f2af2a974
Add specs for how mute! interacts with muting_notifications?
2017-09-13 21:47:30 -05:00
27f8d7069b
block notifications in notify_service from hard muted accounts
2017-09-13 21:47:30 -05:00
44207b6af6
Add muting_notifications? and a notifications argument to mute!
2017-09-13 21:47:30 -05:00
27e55da853
Add a hide_notifications column to mutes
2017-09-13 21:47:30 -05:00
3cac5bc2c3
Fix a spuriously failing spec that assumed we required short bios like upstream
2017-09-10 19:43:52 -05:00
29c44fa5fa
Remove unused imports
2017-09-10 16:00:26 -05:00
7a9c7d4e0b
Merge pull request #143 from yipdw/sync/upstream
...
Merge with upstream's 1.6.0
2017-09-10 14:10:30 -05:00
932571fa22
Merge tag 'v1.6.0' into sync/upstream
2017-09-10 13:04:27 -05:00
c9df53044a
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
ab71cf4593
Bump to 1.6.0
2017-09-10 15:10:03 +02:00
c450ddb613
Fix POST /api/v1/follows error when already following ( #4878 )
2017-09-10 15:09:06 +02:00
15b886a6f0
Fix Japanese translation ( #4876 )
...
I translated the additional text ( added by #4871 )
2017-09-10 20:34:15 +09:00
4819e2913d
Bump version to 1.6.0rc5
2017-09-10 10:26:51 +02:00
72e662bb0d
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
2017-09-10 10:26:01 +02:00
7d7844a47f
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
f2cbfb2eb3
Fix dimensions of loading component for compose drawer ( #4872 )
2017-09-10 08:48:11 +02:00
67ad453373
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
3dff74eecf
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
3f333a8d31
Set fallback address when empty notification address ( #4868 )
2017-09-09 21:31:48 +02:00
14e1fb8d36
Add missing import (patch by @MightyPork)
2017-09-09 14:28:20 -05:00
514fc908a3
Merge tag 'v1.6.0rc3' into sync/upstream
2017-09-09 14:28:08 -05:00
b9f7bc149b
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
bc077018b8
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
90712d4293
Fix errors preventing UnsubscribeService from working ( #4866 )
2017-09-09 17:36:27 +02:00
6867681c7c
Add script to make embedded iframes autosize ( #4853 )
2017-09-09 16:23:44 +02:00
bdc8b4fd91
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
2ff7146b6d
Bump version to 1.6.0rc4
2017-09-09 14:53:49 +02:00
c7908e2d09
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
c9d04f1c39
Fix second report (regression from 3b81baaaaf) ( #4863 )
2017-09-09 13:42:48 +02:00
9e15eeec63
Add missing reject_media check before avatar download via ActivityPub ( #4862 )
2017-09-09 13:41:45 +02:00
3c45d3963a
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
2017-09-09 02:26:58 +02:00
baa8b82179
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ( #4859 )
2017-09-09 02:26:41 +02:00
4b460bc571
Fix #4852 - Check if already requested from FollowService ( #4855 )
2017-09-09 02:02:44 +02:00
7ca173be47
Fix #4850 - When visibility missing from API call to toot, fallback to user preference ( #4861 )
2017-09-09 02:02:29 +02:00
1ae5d49a71
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
a12572e074
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
dabc309ca3
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
2017-09-08 13:55:47 +02:00
1caf11ddcc
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
95f018a3d4
"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
a4caa7eb62
Fetch statuses/following/followers numbers from ActivityPub collections ( #4840 )
2017-09-08 12:00:17 +02:00
7c2d84910c
i18n: Update Polish translation ( #4845 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-08 05:51:48 +09:00
Surinna Curtis
David Yip
beatrix
Eugen Rochko
yoshipc
Yamagishi Kazutoshi
Quent-in
unarist
Lynx Kotoura
m4sk1n