.version

@@ -1 +1 @@
-25.09.2
+25.09

.yarnrc.yml

@@ -1,2 +1 @@
 nodeLinker: node-modules
-enableScripts: false

CONTRIBUTORS

@@ -49,7 +49,6 @@ Sander Santema <github.com/sandersantema/>
 Thomas Brownback <https://github.com/brownbat/>
 Andrew Gaul <andrew@gaul.org>
 kenden
-Emil Hamrin <github.com/e-hamrin>
 Nickolay Yudin <kelciour@gmail.com>
 neitrinoweb <github.com/neitrinoweb/>
 Andreas Reis <github.com/nwwt>

build/runner/src/yarn.rs

@@ -28,11 +28,7 @@ pub fn setup_yarn(args: YarnArgs) {
                 .arg("--ignore-scripts"),
         );
     } else {
-        run_command(
+        run_command(Command::new(&args.yarn_bin).arg("install"));
-            Command::new(&args.yarn_bin)
-                .arg("install")
-                .arg("--immutable"),
-        );
     }
 
     std::fs::write(args.stamp, b"").unwrap();

docs/docker/Dockerfile

@@ -1,78 +1,35 @@
-# This is a user-contributed Dockerfile. No official support is available.
+# This Dockerfile uses three stages.
+#   1. Compile anki (and dependencies) and build python wheels.
+#   2. Create a virtual environment containing anki and its dependencies.
+#   3. Create a final image that only includes anki's virtual environment and required
+#      system packages.
 
+ARG PYTHON_VERSION="3.9"
 ARG DEBIAN_FRONTEND="noninteractive"
 
-FROM ubuntu:24.04 AS build
+# Build anki.
+FROM python:$PYTHON_VERSION AS build
+RUN curl -fsSL https://github.com/bazelbuild/bazelisk/releases/download/v1.7.4/bazelisk-linux-amd64 \
+    > /usr/local/bin/bazel \
+    && chmod +x /usr/local/bin/bazel \
+    # Bazel expects /usr/bin/python
+    && ln -s /usr/local/bin/python /usr/bin/python
 WORKDIR /opt/anki
-ENV PYTHON_VERSION="3.13"
+COPY . .
-
+# Build python wheels.
-
-# System deps
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    curl \
-    git \
-    build-essential \
-    pkg-config \
-    libssl-dev \
-    libbz2-dev \
-    libreadline-dev \
-    libsqlite3-dev \
-    libffi-dev \
-    zlib1g-dev \
-    liblzma-dev \
-    ca-certificates \
-    ninja-build \
-    rsync \
-    libglib2.0-0 \
-    libgl1 \
-    libx11-6 \
-    libxext6 \
-    libxrender1 \
-    libxkbcommon0 \
-    libxkbcommon-x11-0 \
-    libxcb1 \
-    libxcb-render0 \
-    libxcb-shm0 \
-    libxcb-icccm4 \
-    libxcb-image0 \
-    libxcb-keysyms1 \
-    libxcb-randr0 \
-    libxcb-shape0 \
-    libxcb-xfixes0 \
-    libxcb-xinerama0 \
-    libxcb-xinput0 \
-    libsm6 \
-    libice6 \
-    && rm -rf /var/lib/apt/lists/*
-
-# install rust with rustup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install uv and Python 3.13 with uv
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
-    && ln -s /root/.local/bin/uv /usr/local/bin/uv
-ENV PATH="/root/.local/bin:${PATH}"
-
-RUN uv python install ${PYTHON_VERSION} --default
-
-COPY . . 
-
 RUN ./tools/build
 
-
 # Install pre-compiled Anki.
-FROM python:3.13-slim AS installer
+FROM python:${PYTHON_VERSION}-slim as installer
 WORKDIR /opt/anki/
-COPY --from=build /opt/anki/out/wheels/ wheels/
+COPY --from=build /opt/anki/wheels/ wheels/
 # Use virtual environment.
 RUN python -m venv venv \
     && ./venv/bin/python -m pip install --no-cache-dir setuptools wheel \
     && ./venv/bin/python -m pip install --no-cache-dir /opt/anki/wheels/*.whl
 
-
 # We use another build stage here so we don't include the wheels in the final image.
-FROM python:3.13-slim AS final
+FROM python:${PYTHON_VERSION}-slim as final
 COPY --from=installer /opt/anki/venv /opt/anki/venv
 ENV PATH=/opt/anki/venv/bin:$PATH
 # Install run-time dependencies.
@@ -102,9 +59,9 @@ RUN apt-get update \
     libxrender1 \
     libxtst6 \
     && rm -rf /var/lib/apt/lists/*
-
 # Add non-root user.
 RUN useradd --create-home anki
 USER anki
 WORKDIR /work
-ENTRYPOINT ["/opt/anki/venv/bin/anki"]
+ENTRYPOINT ["/opt/anki/venv/bin/anki"]
+LABEL maintainer="Jakub Kaczmarzyk <jakub.kaczmarzyk@gmail.com>"

ftl/core-repo

@@ -1 +1 @@
-Subproject commit 480ef0da728c7ea3485c58529ae7ee02be3e5dba
+Subproject commit 6552c95a81d162422b2a50126547cc7f1b50c2fd

ftl/core/studying.ftl

@@ -46,20 +46,6 @@ studying-type-answer-unknown-field = Type answer: unknown field { $val }
 studying-unbury = Unbury
 studying-what-would-you-like-to-unbury = What would you like to unbury?
 studying-you-havent-recorded-your-voice-yet = You haven't recorded your voice yet.
-studying-card-studied-in-minute =
-    { $cards ->
-        [one] { $cards } card
-       *[other] { $cards } cards
-    } studied in
-    { $minutes ->
-        [one] { $minutes } minute.
-       *[other] { $minutes } minutes.
-    }
-studying-question-time-elapsed = Question time elapsed
-studying-answer-time-elapsed = Answer time elapsed
-
-## OBSOLETE; you do not need to translate this
-
 studying-card-studied-in =
     { $count ->
         [one] { $count } card studied in
@@ -70,3 +56,5 @@ studying-minute =
         [one] { $count } minute.
        *[other] { $count } minutes.
     }
+studying-question-time-elapsed = Question time elapsed
+studying-answer-time-elapsed = Answer time elapsed

ftl/qt-repo

@@ -1 +1 @@
-Subproject commit fd5f984785ad07a0d3dbd893ee3d7e3671eaebd6
+Subproject commit dad4e2736a2b53dcdb52d79b5703dd464c05d666

proto/anki/frontend.proto

@@ -27,9 +27,6 @@ service FrontendService {
   rpc deckOptionsRequireClose(generic.Empty) returns (generic.Empty);
   // Warns python that the deck option web view is ready to receive requests.
   rpc deckOptionsReady(generic.Empty) returns (generic.Empty);
-
-  // Save colour picker's custom colour palette
-  rpc SaveCustomColours(generic.Empty) returns (generic.Empty);
 }
 
 service BackendFrontendService {}

qt/aqt/browser/previewer.py

@@ -13,7 +13,7 @@ import aqt.browser
 from anki.cards import Card
 from anki.collection import Config
 from anki.tags import MARKED_TAG
-from aqt import AnkiQt, gui_hooks, is_mac
+from aqt import AnkiQt, gui_hooks
 from aqt.qt import (
     QCheckBox,
     QDialog,
@@ -81,15 +81,10 @@ class Previewer(QDialog):
         qconnect(self.finished, self._on_finished)
         self.silentlyClose = True
         self.vbox = QVBoxLayout()
-        spacing = 6
         self.vbox.setContentsMargins(0, 0, 0, 0)
-        self.vbox.setSpacing(spacing)
         self._web: AnkiWebView | None = AnkiWebView(kind=AnkiWebViewKind.PREVIEWER)
         self.vbox.addWidget(self._web)
         self.bbox = QDialogButtonBox()
-        self.bbox.setContentsMargins(
-            spacing, spacing if is_mac else 0, spacing, spacing
-        )
         self.bbox.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
 
         gui_hooks.card_review_webview_did_init(self._web, AnkiWebViewKind.PREVIEWER)

qt/aqt/editor.py

@@ -151,7 +151,6 @@ class Editor:
         self.add_webview()
         self.setupWeb()
         self.setupShortcuts()
-        self.setupColourPalette()
         gui_hooks.editor_did_init(self)
 
     # Initial setup
@@ -350,14 +349,6 @@ require("anki/ui").loaded.then(() => require("anki/NoteEditor").instances[0].too
                 keys, fn, _ = row
             QShortcut(QKeySequence(keys), self.widget, activated=fn)  # type: ignore
 
-    def setupColourPalette(self) -> None:
-        if not (colors := self.mw.col.get_config("customColorPickerPalette")):
-            return
-        for i, colour in enumerate(colors[: QColorDialog.customCount()]):
-            if not QColor.isValidColorName(colour):
-                continue
-            QColorDialog.setCustomColor(i, QColor.fromString(colour))
-
     def _addFocusCheck(self, fn: Callable) -> Callable:
         def checkFocus() -> None:
             if self.currentField is None:

qt/aqt/mediasrv.py

@@ -599,15 +599,6 @@ def deck_options_ready() -> bytes:
     return b""
 
 
-def save_custom_colours() -> bytes:
-    colors = [
-        QColorDialog.customColor(i).name(QColor.NameFormat.HexArgb)
-        for i in range(QColorDialog.customCount())
-    ]
-    aqt.mw.col.set_config("customColorPickerPalette", colors)
-    return b""
-
-
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -623,7 +614,6 @@ post_handler_list = [
     search_in_browser,
     deck_options_require_close,
     deck_options_ready,
-    save_custom_colours,
 ]
 
 

qt/aqt/reviewer.py

@@ -17,7 +17,6 @@ import aqt.browser
 import aqt.operations
 from anki.cards import Card, CardId
 from anki.collection import Config, OpChanges, OpChangesWithCount
-from anki.lang import with_collapsed_whitespace
 from anki.scheduler.base import ScheduleCardsAsNew
 from anki.scheduler.v3 import (
     CardAnswer,
@@ -967,15 +966,11 @@ timerStopped = false;
         elapsed = self.mw.col.timeboxReached()
         if elapsed:
             assert not isinstance(elapsed, bool)
-            cards_val = elapsed[1]
+            part1 = tr.studying_card_studied_in(count=elapsed[1])
-            minutes_val = int(round(elapsed[0] / 60))
+            mins = int(round(elapsed[0] / 60))
-            message = with_collapsed_whitespace(
+            part2 = tr.studying_minute(count=mins)
-                tr.studying_card_studied_in_minute(
-                    cards=cards_val, minutes=str(minutes_val)
-                )
-            )
             fin = tr.studying_finish()
-            diag = askUserDialog(message, [tr.studying_continue(), fin])
+            diag = askUserDialog(f"{part1} {part2}", [tr.studying_continue(), fin])
             diag.setIcon(QMessageBox.Icon.Information)
             if diag.run() == fin:
                 self.mw.moveToState("deckBrowser")

qt/aqt/stylesheets.py

@@ -180,7 +180,7 @@ class CustomStyles:
     QPushButton {{
         margin: 1px;
     }}
-    QPushButton:focus, QPushButton:default:hover {{
+    QPushButton:focus {{
         border: 2px solid {tm.var(colors.BORDER_FOCUS)};
         outline: none;
         margin: 0px;
@@ -199,6 +199,9 @@ class CustomStyles:
             )
         };
     }}
+    QPushButton:default:hover {{
+        border-width: 2px;
+    }}
     QPushButton:pressed,
     QPushButton:checked,
     QSpinBox::up-button:pressed,

rslib/src/scheduler/fsrs/params.rs

@@ -174,7 +174,7 @@ impl Collection {
             }
         }
 
-        let health_check_passed = if health_check && input.train_set.len() > 300 {
+        let health_check_passed = if health_check {
             let fsrs = FSRS::new(None)?;
             fsrs.evaluate_with_time_series_splits(input, |_| true)
                 .ok()

ts/editor/editor-toolbar/ColorPicker.svelte

@@ -4,7 +4,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
 <script lang="ts">
     import Shortcut from "$lib/components/Shortcut.svelte";
-    import { saveCustomColours } from "@generated/backend";
 
     export let keyCombination: string | null = null;
     export let value: string;
@@ -12,15 +11,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     let inputRef: HTMLInputElement;
 </script>
 
-<input
+<input bind:this={inputRef} tabindex="-1" type="color" bind:value on:input on:change />
-    bind:this={inputRef}
-    tabindex="-1"
-    type="color"
-    bind:value
-    on:input
-    on:change
-    on:click={() => saveCustomColours({})}
-/>
 
 {#if keyCombination}
     <Shortcut {keyCombination} on:action={() => inputRef.click()} />

ts/editor/editor-toolbar/HighlightColorButton.svelte

@@ -19,7 +19,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ColorPicker from "./ColorPicker.svelte";
     import { context as editorToolbarContext } from "./EditorToolbar.svelte";
     import WithColorHelper from "./WithColorHelper.svelte";
-    import { saveCustomColours } from "@generated/backend";
 
     export let color: string;
 
@@ -135,10 +134,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 color = setColor(event);
                 bridgeCommand(`lastHighlightColor:${color}`);
             }}
-            on:change={() => {
+            on:change={() => setTextColor()}
-                setTextColor();
-                saveCustomColours({});
-            }}
         />
     </IconButton>
 </WithColorHelper>

ts/editor/editor-toolbar/TextColorButton.svelte

@@ -22,7 +22,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import ColorPicker from "./ColorPicker.svelte";
     import { context as editorToolbarContext } from "./EditorToolbar.svelte";
     import WithColorHelper from "./WithColorHelper.svelte";
-    import { saveCustomColours } from "@generated/backend";
 
     export let color: string;
 
@@ -159,7 +158,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                 setTimeout(() => {
                     setTextColor();
                 }, 200);
-                saveCustomColours({});
             }}
         />
     </IconButton>

ts/reviewer/images.ts

@@ -10,9 +10,6 @@ export function allImagesLoaded(): Promise<void[]> {
 }
 
 function imageLoaded(img: HTMLImageElement): Promise<void> {
-    if (!img.getAttribute("decoding")) {
-        img.decoding = "async";
-    }
     return img.complete
         ? Promise.resolve()
         : new Promise((resolve) => {

yarn.lock

@@ -6939,8 +6939,8 @@ __metadata:
   linkType: hard
 
 "vite@npm:6":
-  version: 6.3.6
+  version: 6.3.5
-  resolution: "vite@npm:6.3.6"
+  resolution: "vite@npm:6.3.5"
   dependencies:
     esbuild: "npm:^0.25.0"
     fdir: "npm:^6.4.4"
@@ -6989,7 +6989,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/add701f1e72596c002275782e38d0389ab400c1be330c93a3009804d62db68097a936ca1c53c3301df3aaacfe5e328eab547060f31ef9c49a277ae50df6ad4fb
+  checksum: 10c0/df70201659085133abffc6b88dcdb8a57ef35f742a01311fc56a4cfcda6a404202860729cc65a2c401a724f6e25f9ab40ce4339ed4946f550541531ced6fe41c
   languageName: node
   linkType: hard