Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase #955

Merged
merged 31 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
55885df
Merge pull request #917 from dbarzin/dev
dbarzin Oct 25, 2024
e80d59b
Merge pull request #922 from dbarzin/dev
dbarzin Oct 27, 2024
43e7049
Merge pull request #923 from dbarzin/dev
dbarzin Oct 27, 2024
5154d07
Merge pull request #925 from dbarzin/dev
dbarzin Oct 28, 2024
f0c0531
Merge pull request #926 from dbarzin/dev
dbarzin Oct 28, 2024
72fbf8c
Bump http-proxy-middleware from 2.0.6 to 2.0.7
dependabot[bot] Oct 28, 2024
577e49c
Bump elliptic from 6.5.7 to 6.6.0
dependabot[bot] Oct 28, 2024
3d3289a
Merge pull request #928 from dbarzin/dependabot/npm_and_yarn/elliptic…
dbarzin Oct 29, 2024
ed0a1a2
Merge branch 'master' into dependabot/npm_and_yarn/http-proxy-middlew…
dbarzin Oct 29, 2024
b5be70a
Merge pull request #927 from dbarzin/dependabot/npm_and_yarn/http-pro…
dbarzin Oct 29, 2024
daf7b20
Merge pull request #932 from dbarzin/dev
dbarzin Oct 29, 2024
f2eeb6e
Merge pull request #934 from dbarzin/dev
dbarzin Oct 29, 2024
a090fc8
Update PhysicalServerController.php
Som-gif Oct 30, 2024
6ba9e43
Merge pull request #936 from Som-gif/patch-1
dbarzin Oct 30, 2024
1f80282
Merge pull request #938 from dbarzin/dev
dbarzin Nov 2, 2024
e3c6269
Migration de l'index dans la branche gh-pages
Nov 3, 2024
edf70f1
Merge branch 'dbarzin:master' into master
siddjellali Nov 3, 2024
96e3a88
Merge pull request #939 from siddjellali/master
dbarzin Nov 3, 2024
68d42cc
Suppression du dossier _helmchart
Nov 3, 2024
eed6663
Merge remote-tracking branch 'origin/master'
Nov 3, 2024
f376447
Merge pull request #942 from siddjellali/master
dbarzin Nov 3, 2024
e1faf89
Merge pull request #945 from dbarzin/dev
dbarzin Nov 4, 2024
2e049db
Merge pull request #946 from dbarzin/dev
dbarzin Nov 4, 2024
4d37f06
Merge pull request #948 from dbarzin/dev
dbarzin Nov 6, 2024
9ab72b7
Bump symfony/http-foundation from 7.1.6 to 7.1.7
dependabot[bot] Nov 6, 2024
60b6a14
Bump symfony/process from 7.1.6 to 7.1.7
dependabot[bot] Nov 6, 2024
d9ff6df
Merge pull request #950 from dbarzin/dependabot/composer/symfony/proc…
dbarzin Nov 8, 2024
612cb9c
Merge pull request #949 from dbarzin/dependabot/composer/symfony/http…
dbarzin Nov 8, 2024
2510770
Merge pull request #952 from dbarzin/dev
dbarzin Nov 11, 2024
78c4800
Merge pull request #953 from dbarzin/dev
dbarzin Nov 11, 2024
1fb5460
Merge pull request #954 from dbarzin/dev
dbarzin Nov 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
![License](https://img.shields.io/github/license/dbarzin/mercator.svg?style=flat-square)
![Contributors](https://img.shields.io/github/contributors/dbarzin/mercator.svg?style=flat-square)
![Stars](https://img.shields.io/github/stars/dbarzin/mercator?style=flat-square)
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/mercator)](https://artifacthub.io/packages/search?repo=mercator)

**Mercator** est une application web open-source puissante et polyvalente, conçue pour faciliter la cartographie des systèmes d'information, comme décrit dans le [Guide de cartographie du système d'information](https://cyber.gouv.fr/publications/cartographie-du-systeme-dinformation) de l'[ANSSI](https://cyber.gouv.fr/). Que vous soyez un opérateur d'importance vitale ou que vous participiez à la gouvernance informatique plus large, Mercator est un outil essentiel pour acquérir de la visibilité, du contrôle et assurer la résilience de vos systèmes d'information.

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
![License](https://img.shields.io/github/license/dbarzin/mercator.svg?style=flat-square)
![Contributors](https://img.shields.io/github/contributors/dbarzin/mercator.svg?style=flat-square)
![Stars](https://img.shields.io/github/stars/dbarzin/mercator?style=flat-square)
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/mercator)](https://artifacthub.io/packages/search?repo=mercator)

**Mercator** is a powerful and versatile open-source web application designed to facilitate the mapping of information systems, as outlined in the [Mapping The Information System Guide](https://cyber.gouv.fr/en/publications/mapping-information-system) by [ANSSI](https://cyber.gouv.fr/en/). Whether you're an operator of vital importance or part of a broader IT governance framework, Mercator is an essential tool for gaining visibility, control, and ensuring the resilience of your information systems.

Expand Down
23 changes: 0 additions & 23 deletions _helm_chart/chart/.helmignore

This file was deleted.

9 changes: 0 additions & 9 deletions _helm_chart/chart/Chart.lock

This file was deleted.

36 changes: 0 additions & 36 deletions _helm_chart/chart/Chart.yaml

This file was deleted.

123 changes: 0 additions & 123 deletions _helm_chart/chart/README.md

This file was deleted.

22 changes: 0 additions & 22 deletions _helm_chart/chart/templates/NOTES.txt

This file was deleted.

Loading
Loading