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

30724 Commits

Author SHA1 Message Date
Matias Didier 1eea5095aa Merge branch 'ent-12862-scroll-indeseado-en-vista-resumen-discovery' into 'develop' 
Ent 12862 scroll indeseado en vista resumen discovery

See merge request artica/pandorafms!6933
 2024-02-13 15:44:00 +00:00
Daniel Cebrian a432ae4d2d #12879 fixed problem with validation acl in delete group 2024-02-13 15:58:54 +01:00
Enrique Martin 5d174013e5 Fixed recon task snmp v3 credentials update 2024-02-13 15:44:09 +01:00
Enrique Martin 4b4a94e7fb Fixed recon task snmp v3 credentials update 2024-02-13 15:40:31 +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
Daniel Cebrian c18ecd0f01 #12864 added halfpastfouram in phpchartjs 2024-02-13 13:05:29 +01:00
Daniel Maya fdb8d68336 #12862 Fixed css table 2024-02-13 12:58:47 +01:00
Enrique Martin 9733ac8717 Set consecutive keys for dashboard items array. Fix JS error when printing imported dashboard 2024-02-13 11:53:35 +01:00
Enrique Martin 57b50e4c85 Fixed skip items creations 2024-02-13 10:43:44 +01:00
Daniel Maya 5a73d708e0 #12872 Fixed gis 2024-02-13 10:37:17 +01:00
Enrique Martin 59020ea572 Fixed skip items creations 2024-02-13 10:36:55 +01:00
Rafael Ameijeiras 8422aba9d7 Merge branch 'ent-12851-Se-ha-roto-el-token-Enable-log-collection-de-agente-software-linux-desde-la-consola' into 'develop' 
fix toggling log in linux agent

See merge request artica/pandorafms!6923
 2024-02-13 08:19:48 +00:00
Rafael Ameijeiras 76a4df9a07 Merge branch 'ent-12859-17048-alc-enterprise-no-filtra-correctamente-en-dashboards' into 'develop' 
Ent 12859 17048 alc enterprise no filtra correctamente en dashboards

See merge request artica/pandorafms!6926
 2024-02-13 08:19:15 +00:00
artica 58aabef5ce Auto-updated build strings. 2024-02-13 01:00:05 +01:00
Daniel Cebrian e5139436ab #12877 fixed reload comments 2024-02-12 17:19:50 +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 Maya e8bd4b9e6b #12859 Fixed groups 2024-02-12 13:02:11 +01:00
daniel d5b780ee99 fix visual errors servers notification pandora_enterprise#12178 2024-02-12 12:42:54 +01:00
Daniel Maya 15382049b8 #12687 Fixed delete file 2024-02-12 10:35:01 +01:00
daniel 45ffdb1cc5 fix visual errors not working servers pandora_enterprise#12178 2024-02-12 10:34:43 +01:00
daniel 639fbcc807 Merge remote-tracking branch 'origin/develop' into ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola 2024-02-12 09:51:56 +01:00
miguel angel rasteu 301ca0f710 #12866 Fix Other OS name and version in Agent view 2024-02-12 09:42:20 +01:00
Daniel Maya 35713c358b #12687 Added info message 2024-02-12 09:37:18 +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
artica b4c8e81e86 Auto-updated build strings. 2024-02-12 01:00:03 +01:00
artica 4b850ff733 Auto-updated build strings. 2024-02-11 01:00:04 +01:00
artica f5ccba67dc Auto-updated build strings. 2024-02-10 01:00:05 +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 b2df1b3529 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-09 13:56:21 +01:00
Enrique Martin 63b2541e61 Fixed get values from references and viceversa 2024-02-09 13:55:53 +01:00
Rafael Ameijeiras 140ed1c304 Merge branch 'ent-12321-widget-mapa-gis' into 'develop' 
Ent 12321 widget mapa gis

See merge request artica/pandorafms!6835
 2024-02-09 09:23:42 +00: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
Rafael Ameijeiras 5a1b5b53cc Merge branch 'ent-12843-error-deshabilitar-agentes-por-masivas-en-meta-16996' into 'develop' 
Ent 12843 error deshabilitar agentes por masivas en meta 16996

See merge request artica/pandorafms!6915
 2024-02-09 09:21:44 +00:00
Rafael Ameijeiras de47bcf7b1 Merge branch 'ent-12617-columna-name-y-botones-en-la-vista-de-servidores' into 'develop' 
Ent 12617 columna name y botones en la vista de servidores

See merge request artica/pandorafms!6869
 2024-02-09 09:21:22 +00:00
Daniel Maya 5b0f330491 #12687 changes in css 3 2024-02-09 10:08:54 +01:00
artica a8409c33a6 Auto-updated build strings. 2024-02-09 01:00:04 +01: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
Daniel Maya b68663b966 #12687 changes in sla_service 2024-02-08 17:01:49 +01:00
Enrique Martin 4ffba029c2 Fixed css issue with selctors 2024-02-08 16:21:07 +01:00
Rafael Ameijeiras 06a3fa3f27 Merge branch 'ent-12636-error-con-los-iconos-y-cabecera-de-sistemas-operativos' into 'develop' 
Ent 12636 error con los iconos y cabecera de sistemas operativos

See merge request artica/pandorafms!6872
 2024-02-08 14:50:49 +00:00
Daniel Maya 7a3bf1a13f #12687 changes in css 2 2024-02-08 15:50:49 +01:00
Daniel Maya cf3b8e7359 #12687 changes in css 2024-02-08 15:42:00 +01:00
Enrique Martin 86c33119c8 Updated welcome windows styles 2024-02-08 11:32:45 +01:00
alejandro.campos@artica.es bf4786e8fb fix toggling log in linux agent 2024-02-08 10:22:20 +01:00
Daniel Maya 8524e7ba31 Merge branch 'develop' into ent-12321-widget-mapa-gis 2024-02-08 09:34:32 +01:00
Daniel Maya 9844f95f16 #12350 resolved conflict 2024-02-08 09:19:13 +01:00
Daniel Maya b9d871cbd9 #12687 Changes in import dialog 2024-02-08 09:07:33 +01:00
artica 5acffa86d3 Auto-updated build strings. 2024-02-08 01:00:04 +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 47c6b9c335 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-07 18:26:51 +01:00
Enrique Martin 5d000a03d1 Improved import and export. Supported Array and CSV fields. 2024-02-07 18:26:22 +01:00
Daniel Maya b858527a31 #12687 Changes in export dialog 2024-02-07 16:45:11 +01:00
Daniel Cebrian cf12d9dfd0 #12525 added control for verify default emails in update manager 2024-02-07 16:29:39 +01:00
Daniel Maya 8675e60c9b #12687 Changes to the export name 2024-02-07 15:49:20 +01:00
Daniel Maya 5bc20f9768 #12687 Added message prd 2024-02-07 15:01:53 +01:00
Daniel Cebrian 0d235f3b6d #12460 fixed deprecated 2024-02-07 13:17:39 +01:00
Daniel Maya af334e21be #12687 Added import prd 2 2024-02-07 12:13:50 +01:00
Jonathan 499ea9b805 #12633 fix visuals errors 2024-02-07 09:21:42 +01:00
Enrique Martin 2421f07291 Included parse error message 2024-02-07 04:16:51 +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
artica 4912a4051f Auto-updated build strings. 2024-02-07 01:00:50 +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
Jonathan 644308db4f #12845 fix style hover 2024-02-06 14:34:34 +01:00
Rafael Ameijeiras adb67e9ff0 Merge branch 'ent-12847-nombres-de-consolas-visuales-favoritas-muestran-entities' into 'develop' 
Ent 12847 nombres de consolas visuales favoritas muestran entities

See merge request artica/pandorafms!6912
 2024-02-06 11:14:20 +00:00
Rafael Ameijeiras 00b7781ec6 Merge branch 'ent-12848-vista-credential-store-no-autorefresca' into 'develop' 
Ent 12848 vista credential store no autorefresca

See merge request artica/pandorafms!6911
 2024-02-06 11:14:01 +00:00
Jonathan e402f713c7 #12845 fix play image 2024-02-06 11:35:28 +01:00
Jonathan f869c18b69 #12843 fix node db update massive 2024-02-06 10:57:26 +01: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
Rafael Ameijeiras 542d1c2b51 Merge branch 'ent-12751-path-traversal-and-untrusted-upload-file' into 'develop' 
Ent 12751 Path Traversal and Untrusted Upload File

See merge request artica/pandorafms!6905
 2024-02-06 07:59:50 +00:00
Rafael Ameijeiras 1ae069ce12 Merge branch 'ent-12833-17008-bulk-operations-cuadros-min-critical-y-max-critical-referencian-incorrectamente' into 'develop' 
Ent 12833 [#17008] Bulk Operations: Cuadros Min Critical y Max Critical referencian incorrectamente

See merge request artica/pandorafms!6895
 2024-02-06 07:59:09 +00:00
Rafael Ameijeiras 39ed351034 Merge branch 'ent-12488-cambiar-funcionamiento-de-reescalado-de-tamano-tips-de-inicio' into 'develop' 
Ent 12488 cambiar funcionamiento de reescalado de tamano tips de inicio

See merge request artica/pandorafms!6910
 2024-02-06 07:58:05 +00:00
artica 7dc0acf6da Auto-updated build strings. 2024-02-06 01:00:25 +01:00
Enrique Martin 269a9134bb Added net scan options to welcome wizard 2024-02-06 00:09:03 +01: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 5f00166b74 #12847 remove entities title and name 2024-02-05 16:52:12 +01:00
Jonathan 80c0f48774 #12488 when px lower 0 default 100 2024-02-05 16:05:16 +01:00
Jonathan c984da1ac7 #12848 reload when new credentials 2024-02-05 15:35:38 +01:00
Jonathan 21fe027a62 #12488 tips window move for clicks 2024-02-05 14:34:43 +01:00
artica 64f6825d65 Auto-updated build strings. 2024-02-05 09:21:33 +01:00
Enrique Martin f7dbd8f3b2 Net scan improvements 2024-02-02 14:41:28 +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
Rafael Ameijeiras f65acbd4f3 Merge branch 'ent-9992-9740-introducir-el-boton-de-email-test-en-la-configuracion-de-correo-de-la-metaconsola' into 'develop' 
Ent 9992 [#9740] Introducir el botón de email test en la configuración de correo de la Metaconsola

See merge request artica/pandorafms!6901
 2024-02-02 13:08:17 +00:00