2616 Commits

Author SHA1 Message Date
daniel
04a8717aed Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
2023-10-25 15:58:10 +02:00
daniel
868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
Daniel Cebrian
a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +02:00
Daniel Cebrian
490e39c2d8 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-24 13:43:31 +02:00
daniel
d8dfaf0fe3 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-10-23 17:02:51 +02:00
alejandro.campos@artica.es
a747b8fa56 fix 2023-10-23 14:09:38 +02:00
Daniel Cebrian
b1b7a1e57d #10194 fixed acl in view 2023-10-19 16:18:36 +02:00
daniel
4fb7e1719b add periodicity graph pandora_enterprise#9640 2023-10-18 12:49:47 +02:00
miguel angel rasteu
7b443414ca #12137 Fix graph events height 2023-10-17 09:52:56 +02:00
miguel angel rasteu
1c609374a8 #12134 Count total modules 2023-10-17 09:27:53 +02:00
miguel angel rasteu
be99b512e2 #12137 Fix events graph 2023-10-17 08:41:06 +02:00
Daniel Cebrian
d54a6faede #10194 adjust bars 24 hrs in events and changed numbers 2023-10-16 20:47:47 +02:00
Daniel Cebrian
2a4f8ce646 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-16 16:56:29 +02:00
Rafael Ameijeiras
2c76e30591 Merge branch 'ent-11075-cambiar-apostrofe-en-apartado-de-creacion-de-mapas-de-red' into 'develop'
Ent 11075 cambiar apostrofe en apartado de creacion de mapas de red

See merge request artica/pandorafms!6510
2023-10-16 10:07:13 +00:00
Daniel Cebrian
533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +02:00
miguel angel rasteu
133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
Daniel Cebrian
2228011812 #11126 new view vulnerability scanner 2023-10-04 17:37:42 +02:00
Alejandro Campos
0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
miguel angel rasteu
f27d4176ea #12137 Fix OS version 2023-10-03 10:58:59 +02:00
miguel angel rasteu
2b416382a4 #12138 Fix agent main view 2023-10-03 10:26:57 +02:00
miguel angel rasteu
384a66dc0d #12137 Fix refact 2023-10-03 09:35:10 +02:00
alejandro.campos@artica.es
0771094e85 minor changes 2023-10-02 16:42:32 +02:00
miguel angel rasteu
3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
miguel angel rasteu
340288d785 #12137 visual refactoring for main agent view 2023-10-02 15:25:24 +02:00
Daniel Rodriguez
05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
miguel angel rasteu
a4345c8ae4 #11075 Fix apostrophe 2023-09-27 16:08:55 +02:00
daniel
91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
daniel
f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
miguel angel rasteu
98bdee7037 #12079 Apply the filter automatic 2023-09-21 09:24:35 +02:00
alejandro.campos@artica.es
ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
alejandro.campos@artica.es
6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
miguel angel rasteu
d83c1a81d2 #12052 Fix filter alter detail view 2023-09-19 13:50:06 +02:00
daniel
09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
daniel
16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +02:00
daniel
ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/functions_menu.php
2023-09-08 13:11:52 +02:00
alejandro.campos@artica.es
318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
Pablo Aragon
18d4f700f4 11801-Change message no filter in Monitor status 2023-09-07 13:54:41 +02:00
Pablo Aragon
87c02fd0a7 11801-Resolve conflict 2023-09-07 11:08:31 +02:00
alejandro.campos@artica.es
f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Rafael Ameijeiras
e3a5fe0fb6 Merge branch 'ent-10602-Inventory-Widget' into 'develop'
Ent 10602 inventory widget

See merge request artica/pandorafms!6301
2023-09-06 07:08:19 +00:00
alejandro.campos@artica.es
c21fba3aec minor fix 2023-09-05 13:45:02 +02:00
daniel
a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
daniel
1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
2023-09-04 08:16:48 +02:00
Pablo Aragon
4d3b558e97 11801-Monitors detail/view Start disabled (enable on filter) 2023-09-01 09:37:16 +02:00
Pablo Aragon
9010d079d3 11801-Datatables add parameter Start disabled (enable on filter) 2023-08-31 14:58:47 +02:00
Jonathan
1e22d473e6 #9814 projection graphs - module view & dashboard 2023-08-31 13:42:52 +02:00
Gorka Sanchez
66eaf39645 Merge branch 'ent-10637-mejora-informe-grupo' into 'develop'
Ent 10637 mejora informe grupo

See merge request artica/pandorafms!6206
2023-08-31 06:47:57 +00:00
Pablo Aragon
a27f5e129a 11958-Fix Recover alert icon size 2023-08-29 12:35:06 +02:00
Pablo Aragon
c967211830 11958-Fix Recover alert icon size 2023-08-29 12:33:35 +02:00
daniel
ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00