Skip to content

Commit 58fffdf

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev and bump version number ahead of master.
2 parents 92ad0fa + 7dc01c7 commit 58fffdf

File tree

10 files changed

+16
-9
lines changed

10 files changed

+16
-9
lines changed

Readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# STACK 4.8.3
1+
# STACK 4.9.0
22

33
STACK is an assessment system for mathematics, science and related disciplines. STACK is a question type for the Moodle learning management system, and also the ILIAS learning management system. STACK has an API for stand-alone integration into other 3rd party systems.
44

api/config_sample.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ $CFG->inputmustverify = 1;
9595
$CFG->inputshowvalidation = 1;
9696

9797
// These should match the version of goemaxima in docker-compose.
98-
$CFG->stackmaximaversion = "2025012100";
99-
$CFG->version = "2025012100";
98+
$CFG->stackmaximaversion = "2025030700";
99+
$CFG->version = "2025030700";
100100

101101
// Do not change this setting.
102102
$CFG->mathsdisplay = 'api';

api/docker/docker-compose.dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "4.0"
22
services:
33
maxima:
4-
image: mathinstitut/goemaxima:2025012100-latest
4+
image: mathinstitut/goemaxima:2025030700-latest
55
tmpfs:
66
- "/tmp"
77
restart: unless-stopped

api/docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "4.0"
22
services:
33
maxima:
4-
image: mathinstitut/goemaxima:2025012100-latest
4+
image: mathinstitut/goemaxima:2025030700-latest
55
tmpfs:
66
- "/tmp"
77
restart: unless-stopped

doc/en/Authoring/Answer_Tests/Results/Equiv.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2447,7 +2447,7 @@ stacklet(x+i*y,a),stacklet(r+i
24472447
</tr>
24482448
<tr class="pass">
24492449
<td class="cell c0"><td colspan="2"></td></td>
2450-
<td class="cell c1"><td colspan="4">\[\begin{array}{lll} &a^\star\cdot b^\star& \cr &\text{Let }a = x+\mathrm{i}\cdot y& \cr &\text{Let }b = r+\mathrm{i}\cdot s& \cr \color{green}{\checkmark}&=\left(x+\mathrm{i}\cdot y\right)^\star\cdot \left(r+\mathrm{i}\cdot s\right)^\star& \cr \color{green}{\checkmark}&=\left(x-\mathrm{i}\cdot y\right)\cdot \left(r-\mathrm{i}\cdot s\right)& \cr \color{green}{\checkmark}&=x\cdot r-y\cdot s-\mathrm{i}\cdot \left(y\cdot r+x\cdot s\right)& \cr \color{green}{\checkmark}&=\left(x\cdot r-y\cdot s+\mathrm{i}\cdot \left(y\cdot r+x\cdot s\right)\right)^\star& \cr \color{green}{\checkmark}&=\left(\left(x+\mathrm{i}\cdot y\right)\cdot \left(r+\mathrm{i}\cdot s\right)\right)^\star& \cr &\text{Let }x+\mathrm{i}\cdot y = a& \cr &\text{Let }r+\mathrm{i}\cdot s = b& \cr \color{green}{\checkmark}&=\left(a\cdot b\right)^\star& \cr \end{array}\]</td></td>
2450+
<td class="cell c1"><td colspan="4">\[\begin{array}{lll} &a^{\ast}\cdot b^{\ast}& \cr &\text{Let }a = x+\mathrm{i}\cdot y& \cr &\text{Let }b = r+\mathrm{i}\cdot s& \cr \color{green}{\checkmark}&={\left(x+\mathrm{i}\cdot y\right)}^{\ast}\cdot {\left(r+\mathrm{i}\cdot s\right)}^{\ast}& \cr \color{green}{\checkmark}&=\left(x-\mathrm{i}\cdot y\right)\cdot \left(r-\mathrm{i}\cdot s\right)& \cr \color{green}{\checkmark}&=x\cdot r-y\cdot s-\mathrm{i}\cdot \left(y\cdot r+x\cdot s\right)& \cr \color{green}{\checkmark}&={\left(x\cdot r-y\cdot s+\mathrm{i}\cdot \left(y\cdot r+x\cdot s\right)\right)}^{\ast}& \cr \color{green}{\checkmark}&={\left(\left(x+\mathrm{i}\cdot y\right)\cdot \left(r+\mathrm{i}\cdot s\right)\right)}^{\ast}& \cr &\text{Let }x+\mathrm{i}\cdot y = a& \cr &\text{Let }r+\mathrm{i}\cdot s = b& \cr \color{green}{\checkmark}&={\left(a\cdot b\right)}^{\ast}& \cr \end{array}\]</td></td>
24512451
</tr>
24522452
<tr class="pass">
24532453
<td class="cell c0">Equiv</td>

doc/en/Developer/Development_history.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
For current and future plans, see [Development track](Development_track.md) and [Future plans](Future_plans.md).
44

5+
## Version 4.8.5
6+
7+
Released March 2025.
8+
9+
Bring forward bug fixes to include in an official release.
10+
511
## Version 4.8.3
612

713
Released January 2025.

doc/en/Installation/STACK_versions.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ when releasing.
99

1010
Release | Version number | Supported Maxima versions
1111
--------|----------------|--------------------------
12+
4.8.5 | 2025030700 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0
1213
4.8.3 | 2025012100 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0
1314
4.8.0 | 2024111500 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0
1415
4.7.0 | 2024072400 | 5.40.0, 5.41.0, 5.42.0, 5.42.1, 5.42.2, 5.43.0, 5.43.1, 5.43.2, 5.44.0, 5.46.0, 5.47.0

doc/en/Installation/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Direct connection to Maxima on windows/MS is not supported. On windows/MS pleas
1010

1111
## 0. Set up PHP with mbstring
1212

13-
STACK v4.3 and later require the PHP `mbstring` library. While this is included in many distros, it is not yet included by default in all.
13+
STACK v4.3 and later require the PHP `mbstring` library.
1414

1515
On an existing Moodle site navigate to
1616

stack/maxima/stackmaxima.mac

+1-1
Original file line numberDiff line numberDiff line change
@@ -3506,4 +3506,4 @@ is_lang(code):=ev(is(%_STACK_LANG=code),simp=true)$
35063506

35073507
/* Stack expects some output with the version number the output happens at */
35083508
/* maximalocal.mac after additional library loading */
3509-
stackmaximaversion:2025012200$
3509+
stackmaximaversion:2025030700$

version.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
defined('MOODLE_INTERNAL') || die();
2626

27-
$plugin->version = 2025012200;
27+
$plugin->version = 2025030700;
2828
$plugin->requires = 2022041900;
2929
$plugin->cron = 0;
3030
$plugin->component = 'qtype_stack';

0 commit comments

Comments
 (0)