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

1762 Commits

Author SHA1 Message Date
Pablo Aragon ea29220d4b Merge branch 'develop' into ent-13011-opciones-avanzadas-de-filtros-de-eventos-en-meta-no-tiene-borde 2024-03-26 12:20:12 +01:00
Rafael Ameijeiras 3287a56be0 Merge branch 'ent-13017-no-se-eliminan-los-datos-de-demo' into 'develop' 
Fixed demo data cleanup

See merge request artica/pandorafms!7033
 2024-03-26 11:02:27 +00:00
Pablo Aragon 8e96f0f1a0 13185-Change header and menu. WIP 2024-03-26 11:58:53 +01:00
Daniel Cebrian 567f1bb1ca Merge remote-tracking branch 'origin/develop' into ent-11634-eliminar-ha-antigua 2024-03-25 15:01:36 +01:00
Jonathan 1bd402d04c #13119 load_modal oncloseescape option & remove x welcomewindow 2024-03-25 12:20:39 +01:00
Pablo Aragon 44730d0f82 13154-Errata Welcome modal. Cancel -> Change 2024-03-25 10:39:04 +01:00
Pablo Aragon 308a7dd948 13159-Move button from action buttons to modal 2024-03-25 09:45:08 +01:00
Enrique Martin 20011387d7 Fixed demo network map relationships creation 2024-03-15 13:39:12 +01:00
Daniel Cebrian 6a1eeb467f #12691 fixed autosubmit in filters 2024-03-15 10:02:21 +01:00
Daniel Cebrian 55ad4b785e #13034 fixed acl 2024-03-15 09:11:12 +01:00
Daniel Cebrian 5f62f0351c #13053 fixed icon 2024-03-14 10:24:46 +01:00
Matias Didier 5ba4cb850a Merge branch 'ent-12994-mensaje-feo-de-error-cuando-no-puede-conectar-a-la-bbdd-de-historico' into 'develop' 
Ent 12994 Mensaje feo de error cuando no puede conectar a la BBDD de histórico

See merge request artica/pandorafms!6996
 2024-03-12 11:35:59 +00:00
Rafael Ameijeiras 499e74a964 Merge branch 'ent-12964-no-permitir-iniciar-sesion-de-superadmin-con-un-enlace-a-un-dashboard-publico' into 'develop' 
Ent 12964 No permitir iniciar sesión  de superadmin con un enlace a un Dashboard público

See merge request artica/pandorafms!7000
 2024-03-12 08:56:31 +00:00
Daniel Cebrian c8e04d3bdc #12964 fixed auto auth in public link dashboard 2024-03-11 09:42:38 +01:00
Daniel Maya 966177e8f2 #12984 Fixed importPrd 2024-03-07 17:20:38 +01:00
Daniel Maya e94f7e2c59 #12989 Fixed network csv 2 2024-03-07 16:20:17 +01:00
Daniel Cebrian 1125f64e89 #12994 fixed message error sql in history db 2024-03-07 13:28:34 +01:00
Daniel Maya a1bab17ee5 #12989 Fixed network csv 2024-03-07 11:08:35 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
Jonathan 260fcfe62b #12695 remove warnings 2024-02-22 10:07:47 +01:00
Jonathan 50187a8c15 #12695 wip remove warnings 2024-02-21 17:07:25 +01:00
Daniel Maya ef3bfb35f0 #12350 resolved conflict 2024-02-16 09:25:55 +01:00
Daniel Cebrian af0f8a4fc4 #11634 updated url in console supervisor 2024-02-15 16:40:18 +01:00
Daniel Cebrian cc43ab26db #11634 deleted ha legacy 2024-02-15 16:25:11 +01:00
Rafael Ameijeiras 62ce18e4dc Merge branch 'ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida' into 'develop' 
Net scan improvements

See merge request artica/pandorafms!6908
 2024-02-15 08:28:12 +00:00
Rafael Ameijeiras 6aab32bb42 Merge branch 'ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola' into 'develop' 
not show servers in metaconsole pandora_enterprise#12178

See merge request artica/pandorafms!6793
 2024-02-15 08:22:11 +00:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
Enrique Martin cb63c27d2a Merge branch 'ent-12687-sistema-import-export-prd' into 'develop' 
Ent 12687 sistema import export prd

See merge request artica/pandorafms!6874
 2024-02-14 12:11:16 +00:00
Enrique Martin 4ab6b29bef Added references to netwflow filters reports 2024-02-14 10:41:29 +01:00
Enrique Martin 73c33c15fd FIxed demo data PRDs import 2024-02-14 00:48:10 +01:00
Enrique Martin e80c88214f Improved base64 check for fields 2024-02-13 21:24:50 +01:00
Enrique Martin a41eae8b5c Fixed several items import and export 2024-02-13 20:13:58 +01:00
Enrique Martin 3159c4a50a Fixed several report items import 2024-02-13 19:45:29 +01:00
Jonathan da2bef45f2 #12695 wip removing warnings 2024-02-13 17:06:48 +01:00
Daniel Cebrian a432ae4d2d #12879 fixed problem with validation acl in delete group 2024-02-13 15:58:54 +01:00
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
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