Skip to content

Commit ef56b11

Browse files
committed
Merge branch 'main' of github.com:dbarzin/deming
2 parents 58f26f9 + 45bd8e8 commit ef56b11

File tree

5 files changed

+4
-3
lines changed

5 files changed

+4
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ According to ISO 27001, chapter 9.1, it is imperative to assess security perform
6969
[<img src="public/screenshots/pilotage2.en.png" width="400">](public/screenshots/pilotage2.en.png)
7070

7171

72-
## :classical_building: Referentials supproted
72+
## :classical_building: Referentials supported
7373

7474
| File | Description |
7575
|--------------------------------------|--------------------------------------------------------------------------------|

ROADMAP.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This document contains the evolutions planned in 2024 / 2025.
1212
* [x] Groups management
1313
* [x] Automatically remove measurements after a defined number of months
1414
* [ ] Export set of controls for audit
15+
* [ ] Send notifications to Slack with Laravel Notification Framework : https://github.com/dbarzin/deming/discussions/540
1516
* [ ] Docker
1617
* [ ] Non-regression tests
1718

database/migrations/2024_06_27_123923_add_control_measure_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function up(): void
2626
}
2727

2828
if (DB::getDriverName() !== 'pgsql') {
29-
if (DB::getDriverName() == 'mysql')
29+
if (DB::getDriverName() == 'mysql' || DB::getDriverName() == 'mariadb')
3030
Schema::table('controls', function (Blueprint $table) {
3131
$table->dropForeign(['domain_id']);
3232
$table->dropForeign(['measure_id']);

resources/lang/fr/cruds.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
'status_rejected' => 'Rejeté',
4545
'status_all' => 'Tous',
4646
'close_date' => 'Date de clôture',
47-
'progress' => 'Etat d\'avacement',
47+
'progress' => 'Etat d\'avancement',
4848
],
4949
'types' => [
5050
'major' => 'Majeure',
23.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)