1776 Commits

Author SHA1 Message Date
Enrique Martin
85315fab60 Fixed JSON values import and export for dashboards and autocreate eval 2024-02-13 15:22:37 +01:00
Enrique Martin
23bd170ff0 Fixed JSON values import and export for dashboards 2024-02-13 15:15:10 +01:00
Enrique Martin
c7d61902fb Fixed JSON values import and export for dashboards 2024-02-13 15:00:46 +01:00
Enrique Martin
57b50e4c85 Fixed skip items creations 2024-02-13 10:43:44 +01:00
Enrique Martin
59020ea572 Fixed skip items creations 2024-02-13 10:36:55 +01:00
Jonathan
0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
Daniel Maya
a43b2b1c59 #12687 Initialize result 2024-02-12 15:27:56 +01:00
daniel
c6a662a070 fix reload server update to license pandora_enterprise#12178 2024-02-12 14:58:00 +01:00
daniel
45ffdb1cc5 fix visual errors not working servers pandora_enterprise#12178 2024-02-12 10:34:43 +01:00
Enrique Martin
d382ca4066 Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida
Conflicts:
	pandora_console/extras/mr/68.sql
2024-02-12 09:29:28 +01:00
Enrique Martin
2f24344025 Removed temporal comment 2024-02-09 15:16:48 +01:00
Enrique Martin
07ec59290b Added info messages to import output 2024-02-09 15:11:47 +01:00
Enrique Martin
63b2541e61 Fixed get values from references and viceversa 2024-02-09 13:55:53 +01:00
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
Enrique Martin
a41d420245 Fixed inverse import key 2024-02-08 17:47:28 +01:00
Enrique Martin
ac016c4c9d Fixed policies export order 2024-02-08 17:36:05 +01:00
Enrique Martin
4e48142205 Merge branch 'ent-12687-sistema-import-export-prd' of https://brutus.artica.es:8081/artica/pandorafms into ent-12687-sistema-import-export-prd 2024-02-08 17:33:55 +01:00
Enrique Martin
53964da048 Fixed inverse join key select 2024-02-08 17:33:30 +01:00
Jonathan
6e1fb2f061 #12695 wip removing warnings 2024-02-08 17:17:17 +01:00
Daniel Maya
b68663b966 #12687 changes in sla_service 2024-02-08 17:01:49 +01:00
Jonathan
9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +01:00
Enrique Martin
86c33119c8 Updated welcome windows styles 2024-02-08 11:32:45 +01:00
Enrique Martin
9901dea9a0 Fixed services import when agent not found 2024-02-07 21:24:41 +01:00
Enrique Martin
afb6892ef0 Remove only not ref keys in items creation 2024-02-07 19:32:08 +01:00
Enrique Martin
5d000a03d1 Improved import and export. Supported Array and CSV fields. 2024-02-07 18:26:22 +01:00
Jonathan
2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Daniel Maya
af334e21be #12687 Added import prd 2 2024-02-07 12:13:50 +01:00
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