8a965eba19
Add specs for how mute! interacts with muting_notifications?
7 years ago
b4ffe602a5
block notifications in notify_service from hard muted accounts
7 years ago
0d5ce9d8e6
Add muting_notifications? and a notifications argument to mute!
7 years ago
df04a52a4d
Add a hide_notifications column to mutes
7 years ago
2f872fc0aa
Fix a spuriously failing spec that assumed we required short bios like upstream
7 years ago
485de6b477
Remove unused imports
7 years ago
d817a53479
Merge pull request #143 from yipdw/sync/upstream
...
Merge with upstream's 1.6.0
7 years ago
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
7 years ago
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
7 years ago
6d13a61ea8
Bump to 1.6.0
7 years ago
078c84fbb5
Fix POST /api/v1/follows error when already following ( #4878 )
7 years ago
92bdd78105
Fix Japanese translation ( #4876 )
...
I translated the additional text ( added by #4871 )
7 years ago
0e213d4b1a
Bump version to 1.6.0rc5
7 years ago
762ca653b6
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
7 years ago
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)
7 years ago
63cb303a66
Fix dimensions of loading component for compose drawer ( #4872 )
7 years ago
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
7 years ago
e7779adc0d
Merge pull request #141 from yipdw/sync/upstream
...
Sync with upstream @ v1.6.0rc3
ohhhhhhhhhhh heck here we go
7 years ago
4c0a563c0c
Set fallback address when empty notification address ( #4868 )
7 years ago
bee4cdc8d2
Add missing import (patch by @MightyPork)
7 years ago
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
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
7 years ago
899e7ad811
i10n minors changes for 1.6 ( #4867 )
...
* wrong preposition + typo
* wrong preposition + typo
* Typo
* Typo
* minor changes
* minor changes
7 years ago
86cf6905cc
Fix errors preventing UnsubscribeService from working ( #4866 )
7 years ago
2303725f7d
Add script to make embedded iframes autosize ( #4853 )
7 years ago
d8bbe7cf7c
Disable mouse-based pause from #4859 ( #4865 )
...
It wasn't working ideally and introduced some annoying false positivies
7 years ago
fafd9d8bae
Bump version to 1.6.0rc4
7 years ago
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
7 years ago
f551b2ca7a
Fix second report (regression from 2cc31b3194) ( #4863 )
7 years ago
dfd9eed84c
Add missing reject_media check before avatar download via ActivityPub ( #4862 )
7 years ago
c268118e5b
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
7 years ago
f79eba1650
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ( #4859 )
7 years ago
1a5442204b
Fix #4852 - Check if already requested from FollowService ( #4855 )
7 years ago
cc4bc2709d
Fix #4850 - When visibility missing from API call to toot, fallback to user preference ( #4861 )
7 years ago
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.
7 years ago
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`.
7 years ago
df9c7584c9
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
7 years ago
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
7 years ago
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
7 years ago
6fb8be482b
Fetch statuses/following/followers numbers from ActivityPub collections ( #4840 )
7 years ago
1a4beb3122
i18n: Update Polish translation ( #4845 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
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
7 years ago
8bb036350a
Fix #4834 - Adjust Status#local and Status#remote scopes ( #4839 )
7 years ago
0080804f44
Enable UniqueRetryJobMiddleware even when called from sidekiq worker ( #4836 )
7 years ago
3c816b0a77
Use <button> instead of <div role="button"> ( #4835 )
7 years ago
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
7 years ago
ac63da7732
Feat add validation for report comment: characters under 1000 valid ( #4833 )
7 years ago
c69b143264
Use casecmp() instead of casecmp?() for now ( #4832 )
...
* Use casecmp() instead of casecmp?() for now
casecmp?() is only available in ruby 2.4.0. Users running earlier ruby versions
would see errors, e.g., running
RAILS_ENV=production rails mastodon:maintenance:remove_deprecated_preview_cards.
* Correctly check whether casecmp() returns 0
7 years ago
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
7 years ago
efef36447f
Update fr.json ( #4830 )
...
typo
7 years ago
Surinna Curtis
David Yip
beatrix
Eugen Rochko
yoshipc
Yamagishi Kazutoshi
Quent-in
unarist
Lynx Kotoura
m4sk1n
abcang
PFM
voidSatisfaction
Joseph Mingrone
Olivier Humbert