1699 Commits

Author SHA1 Message Date
Jonathan
834635a487 Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-07 10:39:47 +01:00
Enrique Martin
59e53cc4cc Fixed PRD export process 2024-02-07 04:13:43 +01:00
Enrique Martin
3ce2c6ae3e Encoded SQL fields for queries 2024-02-07 03:13:52 +01:00
Enrique Martin
ad0984d312 Removed values safe_output and safe_input 2024-02-07 02:53:31 +01:00
Enrique Martin
f69b1af3bd Fixed export and import json formats 2024-02-07 02:18:39 +01:00
Enrique Martin
064393ed14 Fixed inverseRecursiveJoin 2024-02-07 01:37:31 +01:00
Enrique Martin
4139910167 Fixed tables crossed references and tables import order 2024-02-07 01:29:43 +01:00
Enrique Martin
e0d1352201 Get result, errors, items. Fix create items function. 2024-02-06 20:28:43 +01: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
Daniel Maya
d308aa6822 #12687 Added import 2024-02-06 16:02:37 +01: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
Enrique Martin
f00e491738 Fix merge issues 2024-02-05 23:30:35 +01:00
Enrique Martin
d1c6c9843b Added net scan options to welcome wizard 2024-02-05 23:26:55 +01: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 Maya
688f235c6b #12687 Fixed export with json_ref 2 2024-02-01 10:48:34 +01:00
Daniel Maya
9337cc28e7 #12687 added recursive function 2024-01-31 11:41:20 +01:00
Daniel Maya
7acd687b9b #12687 Fixed export with json_ref 2024-01-31 09:21:27 +01:00
Daniel Maya
a83577d1a8 #12687 Added import/export prd 4 2024-01-30 17:34:37 +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 Maya
e07d89883f #12687 Added import/export prd 3 2024-01-29 17:38:01 +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 Maya
401b1973be #12687 Added import/export prd 2 2024-01-24 12:15:16 +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 Maya
95f8519d5d #12687 Added import/export prd 2024-01-22 17:22:23 +01: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