97469efc35
fix a missing import
7 years ago
11088e5667
In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal.
7 years ago
5774861ece
satisfy eslint
7 years ago
20fd564109
make the hide/unhide notifications buttons work
7 years ago
27567d9ce9
Show whether muted users' notifications are muted in account lists
7 years ago
27ee70ba19
Put the label for the hide notifications checkbox in a label element.
7 years ago
b7227d05f8
add trailing newlines to files for Pork :)
7 years ago
9cdcd429d9
Satisfy eslint.
7 years ago
62fde4c01c
Convert profile header mute to use mute modal
7 years ago
5d43556afd
Break out a separate mute modal with a hide-notifications checkbox.
7 years ago
485de6b477
Remove unused imports
7 years ago
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
7 years ago
762ca653b6
Hide modal loading screen for media/video/boost/confirm/actions modals ( #4873 )
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
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
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
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
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
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
df9c7584c9
i10n update OC and FR ( #4849 )
...
* Missing "navigation_bar.pins"
* Missing "navigation_bar.pins"
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
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
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
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
d4e8f77a8b
Add Smartphone screen favourite back button and adjust styles ( #4813 )
...
* Feat add get-back button on favourite columnHeader
* Style adjust nice looking get-back button
* Fix delete media query and add padding right
* fix: restore padding and add lastchild style for back-button
7 years ago
add644eeb0
i18n: update Persian translation ( #4822 )
7 years ago
ddf10f52a7
fix scroll position ( #4821 )
7 years ago
3c7f76265c
fix text position of NSFW for video file ( #4819 )
7 years ago
5a27eaae7c
Adjust status embeds ( #4808 )
...
* Adjust status embeds
Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.
* Remove trailing whitespace
* Using width from the variable
7 years ago
2434169c90
Fix a problem that notification column goes to top ( #4792 )
7 years ago
20c0118cad
Make german translation more gender neutral #4755 ( #4789 )
7 years ago
9b20434874
Croatian translation - updated ( #4183 )
...
* Update hr.json
* Update hr.json
7 years ago
8d459da1f8
l10n Occitan update for Embed, cancel follow request, ... ( #4788 )
...
* Update: some missing strings
* Updates missing strings
* New string
* Update oc.json
* Update oc.yml
* Update oc.json
7 years ago
abf2179b22
Improve client-side German i18n ( #4785 )
7 years ago
e472b79b1e
i18n: Improve Polish translation ( #4783 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
23682c8593
Make "unfollow" undo pending outgoing follow request too ( #4781 )
...
* Make "unfollow" undo pending outgoing follow request too
* Add cancel button to web UI when awaiting follow request approval
* Make the hourglass button do the cancelling
7 years ago
6fcb8ac737
fix text position of NSFW in Safari (Mac/iPhone) ( #4570 )
7 years ago
ed0798ec18
Don't unconditionally call `preventDefault` and `stopPropagation` on all keyup events ( #4777 )
...
* UploadArea should only preventDefault for Escape
This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.
* Remove workaround for fixed bug in SettingToggle
SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again
7 years ago
139f297c01
i18n: Update Polish translation ( #4775 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
f13b1b67f5
Adjust settings pages ( #4765 )
...
* views: Adjust heading positions
* Adjust settings pages
Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast.
* Remove trailing whitespace
7 years ago
5a3e81e963
Add text color style for noscript link ( #4772 )
7 years ago
Surinna Curtis
David Yip
Eugen Rochko
unarist
Yamagishi Kazutoshi
Lynx Kotoura
Quent-in
m4sk1n
PFM
voidSatisfaction
Olivier Humbert
Masoud Abkenar
Clworld
abcang
Andreas Drop
May Kittens Devour Your Soul