0c547faf92
Less gross passing of notifications flag
7 years ago
eaaf2170fe
API support for muting notifications (and specs)
7 years ago
6f7d00bfdd
Add support for muting notifications in MuteService
7 years ago
5c2e1869f0
specs testing that hide_notifications in mutes actually hides notifications
7 years ago
0f2af2a974
Add specs for how mute! interacts with muting_notifications?
7 years ago
27f8d7069b
block notifications in notify_service from hard muted accounts
7 years ago
44207b6af6
Add muting_notifications? and a notifications argument to mute!
7 years ago
27e55da853
Add a hide_notifications column to mutes
7 years ago
3cac5bc2c3
Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
29c44fa5fa
Remove unused imports
7 years ago
7a9c7d4e0b
Merge pull request #143 from yipdw/sync/upstream
...
Merge with upstream's 1.6.0
7 years ago
932571fa22
Merge tag 'v1.6.0' into sync/upstream
7 years ago
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
7 years ago
ab71cf4593
Bump to 1.6.0
7 years ago
c450ddb613
Fix POST /api/v1/follows error when already following ( #4878 )
7 years ago
15b886a6f0
Fix Japanese translation ( #4876 )
...
I translated the additional text ( added by #4871 )
7 years ago
4819e2913d
Bump version to 1.6.0rc5
7 years ago
72e662bb0d
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
7 years ago
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)
7 years ago
f2cbfb2eb3
Fix dimensions of loading component for compose drawer ( #4872 )
7 years ago
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
7 years ago
3dff74eecf
Merge pull request #141 from yipdw/sync/upstream
...
Sync with upstream @ v1.6.0rc3
ohhhhhhhhhhh heck here we go
7 years ago
3f333a8d31
Set fallback address when empty notification address ( #4868 )
7 years ago
14e1fb8d36
Add missing import (patch by @MightyPork )
7 years ago
514fc908a3
Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
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
7 years ago
bc077018b8
i10n minors changes for 1.6 ( #4867 )
...
* wrong preposition + typo
* wrong preposition + typo
* Typo
* Typo
* minor changes
* minor changes
7 years ago
90712d4293
Fix errors preventing UnsubscribeService from working ( #4866 )
7 years ago
6867681c7c
Add script to make embedded iframes autosize ( #4853 )
7 years ago
bdc8b4fd91
Disable mouse-based pause from #4859 ( #4865 )
...
It wasn't working ideally and introduced some annoying false positivies
7 years ago
2ff7146b6d
Bump version to 1.6.0rc4
7 years ago
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
7 years ago
c9d04f1c39
Fix second report (regression from 3b81baaaaf) ( #4863 )
7 years ago
9e15eeec63
Add missing reject_media check before avatar download via ActivityPub ( #4862 )
7 years ago
3c45d3963a
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
7 years ago
baa8b82179
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ( #4859 )
7 years ago
4b460bc571
Fix #4852 - Check if already requested from FollowService ( #4855 )
7 years ago
7ca173be47
Fix #4850 - When visibility missing from API call to toot, fallback to user preference ( #4861 )
7 years ago
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.
7 years ago
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`.
7 years ago
dabc309ca3
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
7 years ago
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
7 years ago
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
7 years ago
a4caa7eb62
Fetch statuses/following/followers numbers from ActivityPub collections ( #4840 )
7 years ago
7c2d84910c
i18n: Update Polish translation ( #4845 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
b00cc4b9bd
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
7 years ago
dd6ede554f
Fix #4834 - Adjust Status#local and Status#remote scopes ( #4839 )
7 years ago
6859d4c028
Enable UniqueRetryJobMiddleware even when called from sidekiq worker ( #4836 )
7 years ago
7d853b514a
Use <button> instead of <div role="button"> ( #4835 )
7 years ago
85c7c42098
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
7 years ago
Surinna Curtis