Commit Graph

1632 Commits

Author SHA1 Message Date
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop'
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
2024-02-09 09:22:48 +00:00
Rafael Ameijeiras f072936f21 Merge branch 'ent-12845-errores-visuales-en-nuevas-modales' into 'develop'
Ent 12845 errores visuales en nuevas modales

See merge request artica/pandorafms!6913
2024-02-06 16:55:38 +00:00
Rafael Ameijeiras e7f74210dc Merge branch 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola' into 'develop'
get data in file count from module

See merge request artica/pandorafms!6746
2024-02-06 13:49:02 +00:00
Alejandro Campos 64f13f1ae3 Merge branch 'develop' into 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola'
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
2024-02-06 09:02:36 +00:00
Jonathan 59fd298215 #12845 fix styles events 2024-02-05 17:24:52 +01:00
Jonathan c984da1ac7 #12848 reload when new credentials 2024-02-05 15:35:38 +01:00
Rafael Ameijeiras 4b40a8e9c5 Merge branch 'ent-12810-visualizacion-de-tipo-de-licencia' into 'develop'
Ent 12810 Visualizacion de tipo de licencia

See merge request artica/pandorafms!6907
2024-02-02 13:08:43 +00:00
Daniel Cebrian c6cb0c8747 #12810 changed text licensed in info status 2024-02-02 12:14:49 +01:00
Daniel Cebrian 3e40558443 #12810 fixed license_mode status 2024-02-02 10:55:57 +01:00
Daniel Cebrian d8fdb22c89 #12810 change value status license in diagnostics 2024-02-02 10:47:36 +01:00
alejandro.campos@artica.es 05af441f19 minor fix 2024-02-01 17:36:21 +01:00
alejandro.campos@artica.es 44e546af39 minor fix 2024-02-01 17:34:42 +01:00
Daniel Cebrian 64698c4951 #12149 upload max file size in about and diagnostic info 2024-02-01 15:38:52 +01:00
Daniel Cebrian 48d7a63eb1 #12149 added post_max_size notification 2024-02-01 14:54:23 +01:00
Daniel Cebrian f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
Jonathan f430d3ce9f #12797 fix select2 2024-01-30 14:53:48 +01:00
Daniel Cebrian c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
Daniel Cebrian 22598b4bc2 #12460 fixed deprecated 2024-01-29 17:31:19 +01:00
Daniel Cebrian fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
Daniel Rodriguez b11651aa6e Merge branch 'ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico' into 'develop'
Ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico

Closes pandora_enterprise#12580

See merge request artica/pandorafms!6791
2024-01-23 09:20:40 +00:00
Daniel Cebrian a9c16e1f69 #12538 added url in new notificacions 2024-01-22 10:55:37 +01:00
Daniel Cebrian d85a488cb0 #12538 new notifications in console supervisor 2024-01-22 10:37:03 +01:00
Daniel Cebrian fadb70d740 Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos 2024-01-19 13:06:37 +01:00
Matias Didier a4f67d353b Merge branch 'ent-12725-16851-tree-view-no-marca-agentes-en-estado-quiet' into 'develop'
Ent 12725 16851 tree view no marca agentes en estado quiet

See merge request artica/pandorafms!6849
2024-01-19 11:36:30 +00:00
Rafael Ameijeiras 510a06a347 Merge branch 'ent-12579-formato-erroneo-de-los-botones-accion-sobre-agentes-del-Satellite-Server' into 'develop'
Ent 12579 formato erroneo de los botones accion sobre agentes del satellite server

See merge request artica/pandorafms!6747
2024-01-18 12:56:43 +00:00
Rafael Ameijeiras 030d34224e Merge branch 'ent-12523-Problemas-visualizacion-de-eventos-de-auditoria' into 'develop'
some changes in audit view

See merge request artica/pandorafms!6754
2024-01-18 12:50:40 +00:00
Rafael Ameijeiras 1f64fb6115 Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop'
Ent 12320 wizard de bienvenida mas molon visualmente

See merge request artica/pandorafms!6842
2024-01-18 11:16:08 +00:00
Matias Didier bfa087413c Merge branch 'ent-12560-notificacion-del-alert-correlation-changed-in-v774-sigue-apareciendo' into 'develop'
Ent 12560 notificacion del alert correlation changed in v774 sigue apareciendo

See merge request artica/pandorafms!6770
2024-01-18 08:45:26 +00:00
Jonathan 234f4d2df1 #12579 add title on images 2024-01-15 14:32:52 +01:00
Jonathan ed165423fd #12725 add quiet agent tree view 2024-01-15 09:38:29 +01:00
Pablo Aragon 12f6f2e02b 12320-Welcome wizard new styles 2024-01-11 09:33:51 +01:00
Jonathan d8a5f1a521 #12560 fix type 2024-01-08 16:35:37 +01:00
Daniel Cebrian 22baa45387 #12537 new icons for notifications 2024-01-03 11:39:15 +01:00
miguel angel rasteu 696ca72a80 #12684 Fix tree view filter 2023-12-27 13:20:36 +01:00
miguel angel rasteu dd322ad283 Merge branch 'develop' into ent-12684-vista-tree-view-no-filtra-por-modulo-en-algunas-pestanas 2023-12-27 13:02:22 +01:00
Daniel Cebrian 8f69c109d5 #12686 fixed filter in tree module tag 2023-12-26 17:55:41 +01:00
Daniel Cebrian 590c7f7480 #12686 fixed filter in tree module group 2023-12-26 17:22:19 +01:00
Daniel Cebrian 83c6d3735e #12688 fixed filter module status in tree 2023-12-26 17:06:16 +01:00
miguel angel rasteu d6363d37b7 #12684 Fix tree view filter 2023-12-26 13:22:24 +01:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop'
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
2023-12-21 12:00:44 +00:00
Calvo 421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature

See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
felix.suarez 0d33a412ae Remove additional concatenation 2023-12-19 08:56:54 -06:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
Daniel Maya 0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
Daniel Rodriguez 3fe41179e0 Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
Ent 12216 entradas fantasma para elementos de discovery offline

See merge request artica/pandorafms!6740
2023-12-15 09:22:10 +00:00
daniel ea97bb8f60 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-14 13:27:03 +01:00
Diego Muñoz-Reja 60a2557878 Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop'
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion

See merge request artica/pandorafms!6451
2023-12-14 11:19:25 +00:00