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

6467 Commits

Author SHA1 Message Date
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
Daniel Rodriguez 74e291696a Merge branch 'ent-9334-mejorar-seccion-de-administrar-host-para-la-configuracion-remota-del-satellite' into 'develop' 
Ent 9334 mejorar seccion de administrar host para la configuracion remota del satellite

See merge request artica/pandorafms!5117
 2022-09-30 09:41:57 +00:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' 
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
 2022-09-29 12:36:37 +00:00
Daniel Rodriguez 1b8f9a613e Merge branch 'ent-9143-implementar-sistema-de-identificacion-de-satelite-para-descarga-del-key' into 'develop' 
Ent 9143 implementar sistema de identificacion de satelite para descarga del key

See merge request artica/pandorafms!5120
 2022-09-29 09:58:45 +00:00
Daniel Maya c650e7df6c #9143 Fixed empty license encryption key 2022-09-29 11:46:29 +02:00
Jimmy Olano 84d9b272c3 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop' 
implemented alert commands and actions to send report by email

Ref pandora_enterprise#8217

See merge request artica/pandorafms!5104
 2022-09-27 12:26:24 +00:00
Diego Muñoz-Reja aea77db9e9 Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop' 
Ent 7827 control de acceso a la consola por ip

See merge request artica/pandorafms!5098
 2022-09-26 11:03:52 +00:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
Daniel Rodriguez 30edbc81ad Merge branch 'ent-8934-Macros-para-fechas-en-custom-SQL' into 'develop' 
Added new macros

See merge request artica/pandorafms!5103
 2022-09-23 13:03:48 +00:00
Daniel Maya 96f81475f7 resolved conflict 2022-09-23 09:20:59 +02:00
Alejandro Campos 9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-23 06:41:57 +00:00
Diego Muñoz-Reja 158af125e2 Merge branch 'ent-9169-13822-error-al-actualizar-informacion-de-un-agente-cuando-se-llega-al-maximo-de-agentes-de-un' into 'develop' 
Fix edit agent when group limit is reached

See merge request artica/pandorafms!5085
 2022-09-21 11:03:29 +00:00
Daniel Rodriguez c556c7f505 Merge branch 'ent-9149-13753-incidencia-validacion-password-mail' into 'develop' 
Ent 9149 13753 incidencia validacion password mail

See merge request artica/pandorafms!5108
 2022-09-21 08:10:09 +00:00
Daniel Maya 197fa4c69a #9143 Added help tip 2022-09-20 15:16:56 +02:00
Daniel Maya 737f27f782 #9143 Added license_encryption_key 2022-09-20 11:37:07 +02:00
Daniel Rodriguez 9877d59ea6 Merge branch 'ent-9159-Discovery-Host-devices-Meter-lista-de-host-por-nombre' into 'develop' 
changed help tip

See merge request artica/pandorafms!5083
 2022-09-19 13:05:22 +00:00
Daniel Maya cd199e233d #9334 Added improve in satellite hosts 2022-09-19 12:17:24 +02:00
edu.corral 881e0914f0 ent 9149 password mail validation 2022-09-14 16:20:13 +02:00
José González 695cc5bcdc Added tooltip 2022-09-13 16:35:43 +02:00
alejandro.campos@artica.es d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
José González 9164f1e681 IP Allow control 2022-09-12 12:41:09 +02:00
Daniel Maya d53ee55663 #9331 Fixed wizard wmi 2022-09-08 15:18:48 +02:00
Calvo ae4d320d78 Fix edit agent when group limit is reached 2022-09-07 11:15:07 +02:00
alejandro.campos@artica.es f5f5d609a7 changed help tip 2022-09-06 13:16:24 +02:00
Daniel Barbero da0998e7c7 Merge remote-tracking branch 'origin/develop' into ent-7749-mover-operaciones-masivas-sobre-servicios-a-wizard-de-servicios-en-nodo 
Conflicts:
	pandora_console/godmode/menu.php
 2022-09-06 07:52:19 +02:00
Diego Muñoz-Reja 4f31294d94 Merge branch 'ent-9183-giss-se-pierde-el-filtrado-en-el-menu-de-alertas-anadidas-por-agente-nodo' into 'develop' 
Ent 9183 giss se pierde el filtrado en el menu de alertas anadidas por agente nodo

See merge request artica/pandorafms!5079
 2022-09-02 12:40:03 +00:00
Diego Muñoz-Reja deb7fa54ec Merge branch 'ent-7774-13106-Deshabilitar-modulos-mediante-paradas-planificada' into 'develop' 
implemented disable modules scheduled downtime

See merge request artica/pandorafms!5075
 2022-09-02 12:18:15 +00:00
Ramon Novoa 9f30d66328 Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:06:50 +02:00
Ramon Novoa fa74a2f91f Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:05:45 +02:00
Diego Muñoz-Reja 75720da969 Merge branch 'ent-9194-Bug-modulos-deshabilitados' into 'develop' 
fixed bug when disabling modules and disabled modules count

See merge request artica/pandorafms!5074
 2022-09-02 11:04:28 +00:00
Diego Muñoz-Reja 5276236c41 Merge branch 'ent-5319-9412-mas-personalizacion-de-paradas-planificada' into 'develop' 
implemented cron based scheduled downtimes

See merge request artica/pandorafms!5061
 2022-09-02 10:32:26 +00:00
edu.corral 03504fe7c5 ent 9183 agent alerts filter 2022-09-02 11:26:24 +02:00
alejandro.campos@artica.es a479ab84f7 implemented disable modules scheduled downtime 2022-08-31 16:14:38 +02:00
Diego Muñoz-Reja 56f5001541 Merge branch 'ent-8745-Tiempo_no_inicializados_entorno' into 'develop' 
Added control for clean not initialized modules

See merge request artica/pandorafms!5073
 2022-08-30 13:02:55 +00:00
alejandro.campos@artica.es db88876748 fixed bug when disabling modules and disabled modules count 2022-08-30 14:58:19 +02:00
Diego Muñoz-Reja 5fa97231bc Merge branch 'ent-8862-fallo-visual-de-slider-delete-selected-items-en-configuracion-del-agente' into 'develop' 
Ent 8862 fallo visual de slider delete selected items en configuracion del agente

See merge request artica/pandorafms!5072
 2022-08-30 12:30:21 +00:00
Diego Muñoz-Reja 53026e8d98 Merge branch 'ent-8459-Nuevo-informe-de-catalogo-de-modulos-del-sistema' into 'develop' 
Ent 8459 nuevo informe de catalogo de modulos del sistema

See merge request artica/pandorafms!5067
 2022-08-30 12:18:45 +00:00
Daniel Maya d3612439fb #8898 conflict resolved 2022-08-29 14:06:15 +02:00
José González b07a161fb0 Added control for clean not initialized modules 2022-08-29 14:05:30 +02:00
edu.corral 8c186bae9a ent 8862 visual bug agent manager slider 2022-08-29 13:13:59 +02:00
Daniel Maya 53cbb4d3da #9107 conflict resolved 2022-08-29 10:13:39 +02:00
alejandro.campos@artica.es de55200659 Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada 2022-08-29 10:06:41 +02:00
alejandro.campos@artica.es 58a2d3ec85 visual fix 2022-08-29 09:48:10 +02:00
Diego Muñoz-Reja 56e2648c59 Merge branch 'ent-9046-mover-setup-edit-os-a-resources-operating-systems' into 'develop' 
Ent 9046 mover setup edit os a resources operating systems

See merge request artica/pandorafms!5068
 2022-08-26 13:06:27 +00:00
Jimmy Olano 661c77e107 Merge branch 'ent-9321-bugs-en-consolas-visuales' into 'develop' 
fixed show modal label VC in list item pandora_enterprise#9321

pandora_enterprise#9321

See merge request artica/pandorafms!5036
 2022-08-25 21:07:36 +00:00
Jimmy Olano db6a76f005 Merge branch 'ent-9091-vista-setup-no-se-ve-bien' into 'develop' 
Ent 9091 vista setup no se ve bien

#9091 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9091

See merge request artica/pandorafms!5008
 2022-08-25 20:52:28 +00:00
Diego Muñoz-Reja 063814e29e Merge branch 'ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes' into 'develop' 
move massive aperation edit agent pandora_enterprise#8564

See merge request artica/pandorafms!5016
 2022-08-25 12:52:55 +00:00
edu.corral 3d084c8da9 #9046 move edit os from setup to resources 2022-08-25 14:01:08 +02:00
alejandro.campos@artica.es af52895150 implemented modules inventory report 2022-08-24 19:22:20 +02:00
Daniel Maya 182bb2d2c4 8898 Refresh time 2022-08-23 11:17:48 +02:00