tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-29 05:38:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
31,183 Commits 34 Branches 30 Tags
Commit Graph

6485 Commits

Author SHA1 Message Date
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
alejandro.campos@artica.es
9f28e6f7fb minor fix 2022-08-17 13:31:12 +02:00
alejandro.campos@artica.es
ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
alejandro.campos@artica.es
e6739e16b8 fixed 500 2022-08-16 11:56:05 +02:00
Jimmy Olano
e8f84e6293 Merge branch 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' into 'develop' 
Added switch to agetn conf to avoid automatic Ip update

ref: pandora_enterprise#7683

See merge request artica/pandorafms!5019
 2022-08-11 14:55:40 +00:00
Jimmy Olano
b10b9186bf Merge branch 'ent-9151-Ensanchar-los-boxes-de-agentes-módulos-en-paradas-planificadas' into 'develop' 
Ent 9151 ensanchar los boxes de agentes módulos en paradas planificadas

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9151

See merge request artica/pandorafms!5044
 2022-08-10 11:54:00 +00:00
Luis
de1977fec1 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-08-10 11:26:05 +00:00
Diego Muñoz-Reja
23070102bc Merge branch 'ent-8545-gestion-de-agentes-del-satelite-desde-la-consola-consola' into 'develop' 
Ent 8545 gestion de agentes del satelite desde la consola consola

See merge request artica/pandorafms!5043
 2022-08-09 12:44:46 +00:00
Daniel Barbero
743b1c295f Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-08-08 12:26:27 +02:00
Daniel Maya
ea18fda67a #9151 resize multiselect 2022-08-08 12:04:29 +02:00
Calvo
ced2a0837c Fix fixed ip switch issues 2022-08-08 10:23:11 +02:00
Calvo
2c8b9b3aa5 Satellite agent management 2022-08-05 21:49:42 +02:00
José González
f1979e30c2 Fix URL Typo 2022-08-05 11:03:10 +02:00
alejandro.campos@artica.es
120003ab20 added dynamic token filter to view 2022-08-04 14:05:06 +02:00
alejandro.campos@artica.es
af63bfe948 implemented visual editor for satellite conf and added some changes on editor 2022-08-04 09:14:05 +02:00
Daniel Barbero
2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
Luis
33f9972293 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-07-29 11:20:22 +00:00
Daniel Barbero Martin
d8bac6dde9 fixed show modal label VC in list item pandora_enterprise#9321 2022-07-28 14:30:08 +02:00
Daniel Barbero Martin
e5d1145f0a move bulk operations services pandora_enterprise#7749 2022-07-27 11:37:23 +02:00
Daniel Barbero Martin
35333422b4 fix errors massive operations pandora_enterprise#8564 2022-07-26 09:53:30 +02:00
Daniel Barbero Martin
526e5a9b34 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-26 08:00:28 +02:00
Daniel Rodriguez
5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Daniel Barbero Martin
ac23665244 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-21 10:58:37 +02:00
Jimmy Olano
7f1ecff302 Merge branch 'ent-9062-mensaje-de-advertencia-sin-traducir' into 'develop' 
Add transaltion to discovery message

Ref: pandora_enterprise#9062

See merge request artica/pandorafms!4967
 2022-07-20 22:24:13 +00:00
Daniel Barbero Martin
027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Calvo
3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Daniel Barbero Martin
e58bc4f96a move massive aperation edit agent pandora_enterprise#8564 2022-07-14 16:06:51 +02:00
Daniel Barbero Martin
8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin
01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
edu.corral
36e2043102 ent-9091 setup view 2022-07-06 10:58:16 +02:00
Daniel Maya
86052ff28a #8769 Fixed conflict 2022-07-06 09:49:39 +02:00
Daniel Barbero Martin
12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Maya
e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00