tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,099 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

856 Commits

Author SHA1 Message Date
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
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
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
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
Daniel Cebrian 940447d2b0 #12050 new icon security hardening widget 2023-09-19 16:43:55 +02:00
Daniel Cebrian b85d622d51 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-18 16:52:57 +02:00
Pablo Aragon 959a2e9110 11806-Add alert icon in Manage agent 2023-09-13 08:14:11 +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
Daniel Cebrian 133c1676c0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-07 15:28:55 +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
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
daniel a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
Rafael Ameijeiras 6e60eeb09b Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop' 
Ent 11490 Nuevo widget: group status map

See merge request artica/pandorafms!6252
 2023-09-04 07:05:49 +00: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
Daniel Cebrian 1fa0bc0ab1 #11965 new section security in menu 2023-08-29 15:09:41 +02:00
Daniel Cebrian 93b52faf2f #11490 added image icon for group status map widget 2023-08-29 11:02:04 +02:00
Daniel Cebrian dee5667783 Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-29 10:57:43 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Pablo Aragon c0933e8b15 11423-Graph analytics 2023-08-23 11:51:29 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Rafael Ameijeiras 1f9cd3a773 Merge branch 'ent-11316-simplificar-vistas-de-soporte' into 'develop' 
Ent 11316 Simplificar vistas de soporte

See merge request artica/pandorafms!6173
 2023-08-21 06:16:41 +00:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
Daniel Cebrian 74ed3d6c2b Merge branch 'develop' into ent-11316-simplificar-vistas-de-soporte 2023-08-18 08:26:45 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Daniel Cebrian 3b0d15b41c Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-11 12:26:24 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
alejandro.campos@artica.es 78e76e1ad3 implemented inventory widget 2023-08-01 09:57:49 +02:00
Jorge Rincon 2fb9634c4b #11772 Fixed netflow server image 2023-07-31 09:02:46 +02:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop' 
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
 2023-07-19 11:54:01 +00:00
daniel 5cf31fc77e ITSM fixed pandora_enterprise#11471 2023-07-19 11:36:03 +02:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras dffb9d5bbf Merge branch 'ent-11493-nuevo-widget-colmena-de-agentes-agent-hive' into 'develop' 
Ent 11493 nuevo widget colmena de agentes agent hive

See merge request artica/pandorafms!6085
 2023-07-18 05:30:04 +00:00
Daniel Maya a0dc60a49f #11493 Added png 2023-07-17 14:57:54 +02:00
Daniel Cebrian 42540065cd #11490 new widget group status map 2023-07-17 08:30:47 +02:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00
Jorge Rincon 12c538421a #11543 added the pandora FMS logo in black 2023-07-05 09:53:05 +02:00
Matias Didier 321a048d80 Merge branch 'ent-11162-bugs-visuales-en-vista-de-servicios' into 'develop' 
Ent 11162 bugs visuales en vista de servicios

See merge request artica/pandorafms!5876
 2023-07-03 15:23:52 +00:00
Jonathan 1c7e7e8ee1 #11162 new service icon 2023-07-03 15:12:47 +02:00