about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-09-13Break out a separate mute modal with a hide-notifications checkbox.Surinna Curtis
2017-09-13Less gross passing of notifications flagSurinna Curtis
2017-09-13API support for muting notifications (and specs)Surinna Curtis
2017-09-13Add support for muting notifications in MuteServiceSurinna Curtis
2017-09-13specs testing that hide_notifications in mutes actually hides notificationsSurinna Curtis
2017-09-13Add specs for how mute! interacts with muting_notifications?Surinna Curtis
2017-09-13block notifications in notify_service from hard muted accountsSurinna Curtis
2017-09-13Add muting_notifications? and a notifications argument to mute!Surinna Curtis
2017-09-13Add a hide_notifications column to mutesSurinna Curtis
2017-09-10Fix a spuriously failing spec that assumed we required short bios like upstreamSurinna Curtis
2017-09-10Remove unused importsSurinna Curtis
2017-09-10Merge pull request #143 from yipdw/sync/upstreamSurinna Curtis
Merge with upstream's 1.6.0
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-10Merge pull request #142 from glitch-soc/sync/upstream-1.6.0rc4beatrix
Merge with 1.6.0rc4 STRAP IN BUCKAWOO HERE WE GO AGAIN
2017-09-10Bump to 1.6.0Eugen Rochko
2017-09-10Fix POST /api/v1/follows error when already following (#4878)Eugen Rochko
2017-09-10Fix Japanese translation (#4876)yoshipc
I translated the additional text ( added by #4871)
2017-09-10Bump version to 1.6.0rc5Eugen Rochko
2017-09-10Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)Eugen Rochko
2017-09-10Default follows for new users (#4871)Eugen Rochko
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-10Fix dimensions of loading component for compose drawer (#4872)Eugen Rochko
2017-09-09Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4David Yip
Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss
2017-09-09Merge pull request #141 from yipdw/sync/upstreambeatrix
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
2017-09-09Set fallback address when empty notification address (#4868)Yamagishi Kazutoshi
2017-09-09Add missing import (patch by @MightyPork)David Yip
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
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-09i10n minors changes for 1.6 (#4867)Quent-in
* wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes
2017-09-09Fix errors preventing UnsubscribeService from working (#4866)Eugen Rochko
2017-09-09Add script to make embedded iframes autosize (#4853)Eugen Rochko
2017-09-09Disable mouse-based pause from #4859 (#4865)Eugen Rochko
It wasn't working ideally and introduced some annoying false positivies
2017-09-09Bump version to 1.6.0rc4Eugen Rochko
2017-09-09Fix scroll behavior and others on paused timeline (#4864)unarist
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-09Fix second report (regression from 3b81baaaaf51ff1c70fb1f865eef07fdb33a5950) ↵Yamagishi Kazutoshi
(#4863)
2017-09-09Add missing reject_media check before avatar download via ActivityPub (#4862)Eugen Rochko
2017-09-09Scrollable tables in settings pages (#4857)Lynx Kotoura
* Scrollable tables in settings pages * Add space before curly brace
2017-09-09Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ↵Eugen Rochko
(#4859)
2017-09-09Fix #4852 - Check if already requested from FollowService (#4855)Eugen Rochko
2017-09-09Fix #4850 - When visibility missing from API call to toot, fallback to user ↵Eugen Rochko
preference (#4861)
2017-09-08Refresh timeline after toot while the timeline is disconnected (#4858)unarist
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-08Handle stream_entry URL correctly in ActivityPub (#4854)unarist
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-08i10n update OC and FR (#4849)Quent-in
* Missing "navigation_bar.pins" * Missing "navigation_bar.pins"
2017-09-08Fix language filter codes (#4841)Eugen Rochko
* 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"Mute conversation" option on all own toots, not just in notifications (#4844)Eugen Rochko
That way you can mute notifications for a toot before you get replies to it or boosts or favourites
2017-09-08Fetch statuses/following/followers numbers from ActivityPub collections (#4840)Eugen Rochko
2017-09-08i18n: Update Polish translation (#4845)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-07i10n OC / FR update Pinned toots (#4842)Quent-in
* 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-07Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)Eugen Rochko
2017-09-07Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)abcang
2017-09-07Use <button> instead of <div role="button"> (#4835)PFM
generated by cgit-pink (git 2.37.1) at 2024-12-25 20:35:07 +0000