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

2494 Commits

Author SHA1 Message Date
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
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +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
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +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
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
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
miguel angel rasteu bb3a45050f Merge branch 'develop' into ent-10637-mejora-informe-grupo 2023-08-24 12:38:23 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
miguel angel rasteu 330f36a3cf Fix group view 2023-08-22 13:23:17 +02:00
miguel angel rasteu feac240905 #10637 Resolve conflicts 2023-08-22 11:49:23 +02:00
alejandro.campos@artica.es 5624b8256c several changes 2023-08-22 10:29:58 +02:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02: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
Rafael Ameijeiras dbd90d79a7 Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop' 
Ent 10344 Conexion con el servidor se ha perdido

See merge request artica/pandorafms!6228
 2023-08-21 05:58:32 +00:00
Rafael Ameijeiras 52d37be6c9 Merge branch 'ent-10850-meter-la-vista-actual-de-la-vista-detalle-de-agentes-en-el-sistema-de-favoritos' into 'develop' 
Ent 10850 meter la vista actual de la vista detalle de agentes en el sistema de favoritos

See merge request artica/pandorafms!6196
 2023-08-18 06:52:31 +00: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 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
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es 8fdc841254 Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget 2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es 78e76e1ad3 implemented inventory widget 2023-08-01 09:57:49 +02:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
Pablo Aragon 0eb60cf5c8 11174-Timezone iana graph firefox 2023-07-27 11:24:52 +02:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Rafael Ameijeiras 0e6531b983 Merge branch 'ent-11335-se-pueden-crear-mapas-de-red-con-el-mismo-nombre-y-grupo' into 'develop' 
Ent 11335 Se pueden crear mapas de red con el mismo nombre y grupo

See merge request artica/pandorafms!6143
 2023-07-25 07:53:15 +00:00
Rafael Ameijeiras 25e2183d23 Merge branch 'ent-11726-15939-no-hay-columna-nombre-del-agente' into 'develop' 
Ent 11726 15939 no hay columna nombre del agente

See merge request artica/pandorafms!6240
 2023-07-25 07:51:24 +00:00