# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1764341164 -3600
# Node ID a8d71720644953da382a4d0785bcecc485bbe967
# Parent  2981e138038c178464dc00d4376d71cc36daac83# Parent  18879a9a612cbd0a2949b4c507d3c6ae01e97568
merged default -> pg-next-699

diff -r 2981e138038c -r a8d717206449 .hgtags
--- a/.hgtags	Mon Oct 06 09:33:28 2025 +0200
+++ b/.hgtags	Fri Nov 28 15:46:04 2025 +0100
@@ -50,3 +50,4 @@
 2eca398d9676e2378343c48769a4b3938ba96005 Orthanc-1.12.7
 50097b7179ea7eb8afa339abd2f77e233183ace2 Orthanc-1.12.8
 467d73ff9c02807f8f7f3c029e209fb445f6ef8b Orthanc-1.12.9
+655347b0274bea00576ed2f647acf7ce9ee49b5c Orthanc-1.12.10
diff -r 2981e138038c -r a8d717206449 CITATION.cff
--- a/CITATION.cff	Mon Oct 06 09:33:28 2025 +0200
+++ b/CITATION.cff	Fri Nov 28 15:46:04 2025 +0100
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://orthanc.uclouvain.be/hg/orthanc/"
-version: 1.12.9
-date-released: 2025-08-11
+version: 1.12.10
+date-released: 2025-11-26
diff -r 2981e138038c -r a8d717206449 NewTests/Authorization/test_authorization.py
--- a/NewTests/Authorization/test_authorization.py	Mon Oct 06 09:33:28 2025 +0200
+++ b/NewTests/Authorization/test_authorization.py	Fri Nov 28 15:46:04 2025 +0100
@@ -349,16 +349,16 @@
             instances_ids = o.upload_file(here / "../../Database/Beaufix/IM-0001-0001.dcm")
             o_admin.instances.delete(orthanc_ids=instances_ids)
 
-            # uploader-a shall be able to upload a study through DICOMWeb too
+            # uploader-a shall be able to upload a study through DICOMweb too
             o.upload_files_dicom_web(paths = [here / "../../Database/Beaufix/IM-0001-0001.dcm"])
             o_admin.instances.delete(orthanc_ids=instances_ids)
 
         if o_admin.is_plugin_version_at_least("authorization", 0, 9, 1):
 
-            # uploader-a shall not be able to upload a study through DICOMWeb using /dicom-web/studies/<StudyInstanceUID of label_b>
+            # uploader-a shall not be able to upload a study through DICOMweb using /dicom-web/studies/<StudyInstanceUID of label_b>
             self.assert_is_forbidden(lambda: o.upload_files_dicom_web(paths = [here / "../../Database/Knix/Loc/IM-0001-0002.dcm"], endpoint=f"/dicom-web/studies/{self.label_b_study_dicom_id}"))
 
-            # uploader-a shall be able to upload a study through DICOMWeb using /dicom-web/studies/<StudyInstanceUID of label_a>
+            # uploader-a shall be able to upload a study through DICOMweb using /dicom-web/studies/<StudyInstanceUID of label_a>
             o.upload_files_dicom_web(paths = [here / "../../Database/Knix/Loc/IM-0001-0002.dcm"], endpoint=f"/dicom-web/studies/{self.label_a_study_dicom_id}")
 
             # note that, uploader-a is allowed to upload to /dicom-web/studies without checking any labels :-()
diff -r 2981e138038c -r a8d717206449 NewTests/MaxStorage/test_max_storage_reject.py
--- a/NewTests/MaxStorage/test_max_storage_reject.py	Mon Oct 06 09:33:28 2025 +0200
+++ b/NewTests/MaxStorage/test_max_storage_reject.py	Fri Nov 28 15:46:04 2025 +0100
@@ -63,7 +63,7 @@
         if self.o.get_system()["ApiVersion"] > 20:  # from Orthanc 1.12.1
             self.o.delete_all_content()
 
-            # make sure the 3rd patient does not make it into the storage (through the Rest API)
+            # make sure the 3rd patient does not make it into the storage (through the REST API)
             self.o.upload_file(here / "../../Database/Brainix/Flair/IM-0001-0001.dcm")
             self.o.upload_file(here / "../../Database/Knix/Loc/IM-0001-0001.dcm")
             with self.assertRaises(orthanc_exceptions.HttpError) as ctx:
diff -r 2981e138038c -r a8d717206449 Plugins/DicomWeb/Run.py
--- a/Plugins/DicomWeb/Run.py	Mon Oct 06 09:33:28 2025 +0200
+++ b/Plugins/DicomWeb/Run.py	Fri Nov 28 15:46:04 2025 +0100
@@ -440,7 +440,7 @@
 
         
     def test_bitbucket_issue_53(self):
-        # DICOMWeb plugin support for "limit" and "offset" parameters in QIDO-RS
+        # DICOMweb plugin support for "limit" and "offset" parameters in QIDO-RS
         # https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=53
         
         UploadInstance(ORTHANC, 'Brainix/Flair/IM-0001-0001.dcm')
diff -r 2981e138038c -r a8d717206449 Tests/Tests.py
--- a/Tests/Tests.py	Mon Oct 06 09:33:28 2025 +0200
+++ b/Tests/Tests.py	Fri Nov 28 15:46:04 2025 +0100
@@ -2607,7 +2607,7 @@
             self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
             self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
 
-            DoPost(_REMOTE, '/queries/%s/answers/1/retrieve' % a, 'ORTHANC', 'application/json') # make sure the issue #36 is fixed (query/retrieve Rest API: /retrieve route shall accept application/json content type)
+            DoPost(_REMOTE, '/queries/%s/answers/1/retrieve' % a, 'ORTHANC', 'application/json') # make sure the issue #36 is fixed (query/retrieve REST API: /retrieve route shall accept application/json content type)
             self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
             self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
             self.assertEqual(2, len(DoGet(_REMOTE, '/series')))