Skip to content

Commit fd27693

Browse files
authored
Merge branch 'Combodo:develop' into issue/8838-fix_backup_status_mysqldir_not_usable
2 parents 8527eec + dd82950 commit fd27693

File tree

2,874 files changed

+124128
-96366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,874 files changed

+124128
-96366
lines changed
1.53 MB
Loading

.doc/itop-version-history.md

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# iTop version history
2+
3+
```mermaid
4+
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
5+
'git0': 'lawngreen',
6+
'git3': 'dodgerblue',
7+
'git4': 'grey',
8+
'git5': 'grey',
9+
'git6': 'grey',
10+
'git7': 'grey'
11+
}, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
12+
gitGraph
13+
commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
14+
branch support/2.3 order: 900
15+
commit id: "2016-07-08" tag: "2.3.1"
16+
commit id: "2016-12-22" tag: "2.3.3"
17+
commit id: "2017-04-14" tag: "2.3.4"
18+
checkout develop
19+
commit id: "2017-07-12" tag: "2.4.0-beta" type: REVERSE
20+
commit id: "2017-11-16" tag: "2.4.0" type: HIGHLIGHT
21+
branch support/2.4 order: 890
22+
commit id: "2018-02-14" tag: "2.4.1"
23+
checkout develop
24+
commit id: "2018-04-25" tag: "2.5.0-beta" type: REVERSE
25+
checkout support/2.4
26+
commit id: "2018-06-14" tag: "2.4.2"
27+
checkout develop
28+
commit id: "2018-06-27" tag: "2.5.0" type: HIGHLIGHT
29+
branch support/2.5 order: 880
30+
checkout develop
31+
commit id: "2019-01-09" tag: "2.6.0" type: HIGHLIGHT
32+
branch support/2.6 order: 870
33+
commit id: "2019-03-28" tag: "2.6.1"
34+
checkout develop
35+
commit id: "2019-12-18" tag: "2.7.0-beta" type: REVERSE
36+
checkout support/2.5
37+
commit id: "2020-01-22" tag: "2.5.4"
38+
checkout support/2.6
39+
commit id: "2020-01-23" tag: "2.6.3"
40+
checkout develop
41+
commit id: "2020-01-29" tag: "2.7.0-beta2" type: REVERSE
42+
commit id: "2020-04-01" tag: "2.7.0-1" type: HIGHLIGHT
43+
checkout support/2.6
44+
commit id: "2020-04-22" tag: "2.6.4"
45+
checkout develop
46+
branch support/2.7 order: 860
47+
commit id: "2020-06-26" tag: "2.7.1"
48+
checkout support/2.7
49+
commit id: "2020-12-09" tag: "2.7.3"
50+
commit id: "2021-03-31" tag: "2.7.4"
51+
checkout develop
52+
commit id: "2021-04-06" tag: "3.0.0-beta" type: REVERSE
53+
checkout support/2.7
54+
commit id: "2021-07-05" tag: "2.7.5"
55+
checkout develop
56+
commit id: "2021-07-05." tag: "3.0.0-beta2" type: REVERSE
57+
checkout support/2.7
58+
commit id: "2021-12-17" tag: "2.7.6"
59+
checkout develop
60+
commit id: "2022-01-04" tag: "3.0.0" type: HIGHLIGHT
61+
branch support/3.0 order: 850
62+
commit id: "2022-04-08" tag: "3.0.1"
63+
checkout support/2.7
64+
commit id: "2022-07-11" tag: "2.7.7"
65+
checkout support/3.0
66+
commit id: "2022-09-12" tag: "3.0.2-1"
67+
checkout develop
68+
checkout support/2.7
69+
commit id: "2022-12-28" tag: "2.7.8"
70+
checkout support/3.0
71+
commit id: "2023-04-12" tag: "3.0.3"
72+
checkout develop
73+
commit id: "2023-06-19" tag: "3.1.0-beta" type: REVERSE
74+
commit id: "2023-07-26" tag: "3.1.0-1" type: HIGHLIGHT
75+
branch support/3.1 order: 840
76+
checkout support/3.1
77+
commit id: "2023-08-09" tag: "3.1.0-2"
78+
checkout support/2.7
79+
commit id: "2023-08-10" tag: "2.7.9"
80+
checkout support/3.1
81+
commit id: "2023-12-20" tag: "3.1.1"
82+
checkout develop
83+
commit id: "2024-01-15" tag: "Start 3.2" type: HIGHLIGHT
84+
branch support/3.2 order: 830
85+
checkout support/2.7
86+
commit id: "2024-01-17a" tag: "2.7.10"
87+
checkout support/3.0
88+
commit id: "2024-01-17b" tag: "3.0.4"
89+
checkout support/3.2
90+
commit id: "2024-06-25" tag: "3.2.0-beta1" type: REVERSE
91+
commit id: "2024-08-07" tag: "3.2.0"
92+
commit id: "2024-09-13" tag: "3.2.0-2"
93+
checkout support/3.1
94+
commit id: "2024-09-27" tag: "3.1.2"
95+
checkout support/2.7
96+
commit id: "2024-09-28" tag: "2.7.11"
97+
checkout support/2.7
98+
commit id: "2025-02-25" tag: "2.7.12"
99+
checkout support/3.1
100+
commit id: "2025-02-25 " tag: "3.1.3"
101+
checkout support/3.2
102+
commit id: "2025-02-25 " tag: "3.2.1"
103+
commit id: "2025-04-08" tag: "3.2.1-1"
104+
commit id: "2025-08-19" tag: "3.2.2-1"
105+
checkout support/2.7
106+
commit id: "2025-10-07" tag: "2.7.13"
107+
```
108+
109+
To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).

.make/release/changelog.php

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,34 @@
2525

2626

2727
if (count($argv) === 1) {
28-
echo '⚠ You must pass the base tag/sha1 as parameter';
28+
echo "⚠ You must pass the base tag/sha1 as parameter\n";
2929
exit(1);
3030
}
3131
$sBaseReference = $argv[1];
3232

3333

34+
/**
35+
* Replace the Github emojis codes by their UTF-8 character equivalent
36+
*/
37+
function ReplaceGitmojis(string $sLine)
38+
{
39+
static $aGitmojis = null;
40+
41+
if ($aGitmojis === null) {
42+
$aRawGitmojis = json_decode(trim(file_get_contents(__DIR__.'/gitmojis.json')), true);
43+
if ($aRawGitmojis === false) {
44+
echo "\nFailed to parse ".__DIR__."/gitmojis.json, emoji codes will not be replaced by their unicode equivalent.\n";
45+
} else {
46+
foreach($aRawGitmojis["gitmojis"] as $aGitmoji) {
47+
$aGitmojis[$aGitmoji['code']] = $aGitmoji['emoji'];
48+
}
49+
}
50+
}
51+
if (is_array($aGitmojis)) {
52+
return str_replace(array_keys($aGitmojis), array_values($aGitmojis), $sLine);
53+
}
54+
}
55+
3456
//--- Get log
3557
$sGitLogCommand = 'git log --decorate --pretty="%h;%s" --date-order --no-merges '.$sBaseReference.'..HEAD';
3658
$sGitLogRaw = shell_exec($sGitLogCommand);
@@ -73,5 +95,5 @@
7395
echo "# Logs line without bug referenced\n";
7496
echo "sha1;subject\n";
7597
foreach ($aLogLineNoBug as $sLogLine) {
76-
echo "$sLogLine\n";
77-
}
98+
echo ReplaceGitmojis($sLogLine)."\n";
99+
}

0 commit comments

Comments
 (0)