about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2017-09-13fix a missing importSurinna Curtis
2017-09-13In probably dead code, replace a dispatch of muteAccount that was skipping ↵Surinna Curtis
the modal with launching the mute modal.
2017-09-13satisfy eslintSurinna Curtis
2017-09-13make the hide/unhide notifications buttons workSurinna Curtis
2017-09-13Show whether muted users' notifications are muted in account listsSurinna Curtis
2017-09-13Put the label for the hide notifications checkbox in a label element.Surinna Curtis
2017-09-13add trailing newlines to files for Pork :)Surinna Curtis
2017-09-13Satisfy eslint.Surinna Curtis
2017-09-13Convert profile header mute to use mute modalSurinna Curtis
2017-09-13Break out a separate mute modal with a hide-notifications checkbox.Surinna Curtis
2017-09-10Remove unused importsSurinna Curtis
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-10Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)Eugen Rochko
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-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-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-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-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-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-08i10n update OC and FR (#4849)Quent-in
* Missing "navigation_bar.pins" * Missing "navigation_bar.pins"
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-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-07Use <button> instead of <div role="button"> (#4835)PFM
2017-09-07Add Pinned toot column (#4817)voidSatisfaction
* 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
2017-09-07i10n update OC and FR files (#4824)Quent-in
* Onboarding: corrections Some missing letters and spaces or better wording * Embed Translated as Intégrer in FR / Embarcar in OC
2017-09-06Update fr.json (#4830)Olivier Humbert
typo
2017-09-06Add Smartphone screen favourite back button and adjust styles (#4813)voidSatisfaction
* 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
2017-09-06i18n: update Persian translation (#4822)Masoud Abkenar
2017-09-06fix scroll position (#4821)Clworld
2017-09-06fix text position of NSFW for video file (#4819)PFM
2017-09-05Adjust status embeds (#4808)Lynx Kotoura
* 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
2017-09-03Fix a problem that notification column goes to top (#4792)abcang
2017-09-03Make german translation more gender neutral #4755 (#4789)Andreas Drop
2017-09-03Croatian translation - updated (#4183)May Kittens Devour Your Soul
* Update hr.json * Update hr.json
2017-09-03l10n Occitan update for Embed, cancel follow request, ... (#4788)Quent-in
* Update: some missing strings * Updates missing strings * New string * Update oc.json * Update oc.yml * Update oc.json
2017-09-02Improve client-side German i18n (#4785)Eugen Rochko
2017-09-02i18n: Improve Polish translation (#4783)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02Make "unfollow" undo pending outgoing follow request too (#4781)Eugen Rochko
* 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
2017-09-02fix text position of NSFW in Safari (Mac/iPhone) (#4570)PFM
2017-09-02Don't unconditionally call `preventDefault` and `stopPropagation` on all ↵Surinna Curtis
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
2017-09-02i18n: Update Polish translation (#4775)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-02Adjust settings pages (#4765)Lynx Kotoura
* 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
2017-09-02Add text color style for noscript link (#4772)Yamagishi Kazutoshi