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

2080 Commits

Author SHA1 Message Date
Diego Muñoz-Reja 1920a8d599 Merge branch 'ent-10924-entradas-confusas-en-audit-log-al-habilitar-deshabilitar-modulos' into 'develop' 
Ent 10924 entradas confusas en audit log al habilitar deshabilitar modulos

See merge request artica/pandorafms!5725
 2023-05-22 10:19:28 +00:00
Daniel Cebrian efc96d9661 #11299 added avanced mode agent in open version 2023-05-22 10:01:57 +02:00
Daniel Cebrian 94cdd624fa #11289 fixed autocomplete url address in agent 2023-05-19 13:10:19 +02:00
Daniel Cebrian c204558a57 #11288 fixed icon gis in agent 2023-05-19 11:00:39 +02:00
Diego Muñoz-Reja 3e3faaf922 Merge branch 'ent-11087-15509-no-se-puede-editar-elementos-en-paradas-planificadas-el-boton-no-funciona' into 'develop' 
Ent 11087 15509 no se puede editar elementos en paradas planificadas el boton no funciona

See merge request artica/pandorafms!5849
 2023-05-18 11:57:57 +00:00
Daniel Rodriguez 00983dfe16 Merge branch 'ent-11176-no-funciona-debug-de-modulos-web' into 'develop' 
Ent 11176 no funciona debug de modulos web

See merge request artica/pandorafms!5888
 2023-05-18 11:19:34 +00:00
Diego Muñoz-Reja 4a8e8f4ae1 Merge branch 'ent-11103-15535-agente-debe-de-ser-aplicado-cuando-ya-esta-aplicado' into 'develop' 
fixed modules adopted pandora_enterprise#11103

See merge request artica/pandorafms!5836
 2023-05-18 09:20:31 +00:00
Rafael Ameijeiras 0b65e9b721 Merge branch 'ent-11050-problema-macro-_alert_critical_instructions_-en-acciones-y-templates-de-alertas' into 'develop' 
Ent 11050 problema macro  alert critical instructions  en acciones y templates de alertas

See merge request artica/pandorafms!5828
 2023-05-17 14:48:50 +00:00
Rafael Ameijeiras 1bf3b94100 Merge branch 'ent-11098-snmp-walk-desde-editor-de-modulos-no-te-permite-seleccionar-oid-para-crear-modulo' into 'develop' 
Ent 11098 snmp walk desde editor de modulos no te permite seleccionar oid para crear modulo

See merge request artica/pandorafms!5835
 2023-05-17 14:45:41 +00:00
Rafael Ameijeiras e71d3a3f07 Merge branch 'ent-10623-se-anade-descripcion-automatica-al-configurar-puerto-en-chequeos-remotos' into 'develop' 
Ent 10623 se anade descripcion automatica al configurar puerto en chequeos remotos

See merge request artica/pandorafms!5786
 2023-05-17 14:41:50 +00:00
Matias Didier b2dfa48a34 Merge branch 'ent-11113-no-se-puede-configurar-umbral-warning-en-modulos-string-una-vez-creados' into 'develop' 
Ent 11113 no se puede configurar umbral warning en modulos string una vez creados

See merge request artica/pandorafms!5845
 2023-05-17 13:45:53 +00:00
Matias Didier 09030781bb Merge branch 'ent-11170-ya-no-pide-confirmacion-al-borrar-un-modulo' into 'develop' 
Ent 11170 ya no pide confirmacion al borrar un modulo

See merge request artica/pandorafms!5880
 2023-05-17 10:13:05 +00:00
Rafael Ameijeiras e478e2b9ba Merge branch 'ent-11241-15612-fallo-en-intervalo-inverso' into 'develop' 
Ent 11241 15612 fallo en intervalo inverso

See merge request artica/pandorafms!5909
 2023-05-17 08:06:34 +00:00
Rafael Ameijeiras d57e9c4f16 Merge branch 'ent-11094-modulo-tipo-plugin-usando-snmp_remote-no-muestra-opciones-de-configuracion-al-actualizar' into 'develop' 
Ent 11094 modulo tipo plugin usando snmp remote no muestra opciones de configuracion al actualizar

See merge request artica/pandorafms!5827
 2023-05-17 08:05:09 +00:00
Daniel Cebrian d4c3df295c #11241 fixed inverse interval in module edit 2023-05-16 17:46:51 +02:00
Pablo Aragon f4cf8e769a 11094-Fix plugin data recovery 2023-05-16 16:00:17 +02:00
Daniel Rodriguez 9cf10e4f39 Merge branch 'ent-11147-mas-espacio-al-combo-de-creacion-de-modulos' into 'develop' 
Ent 11147 mas espacio al combo de creacion de modulos

See merge request artica/pandorafms!5865
 2023-05-16 09:58:39 +00:00
Daniel Rodriguez 64d25816d6 Merge branch 'ent-11158-15531-netflow-filters-al-dar-nombre-con-simbolos-espacio-al-filtro-crea-agentes-masivamente' into 'develop' 
Ent 11158 15531 netflow filters al dar nombre con simbolos espacio al filtro crea agentes masivamente

See merge request artica/pandorafms!5873
 2023-05-16 09:32:41 +00:00
miguel angel rasteu 4c102bee80 #11215 Fix selected option in interval select 2023-05-16 11:10:51 +02:00
Rafael Ameijeiras 6b8a3ab3d6 Merge branch 'ent-11167-15574-error-al-borrar-el-agente-el-borrado-es-correcto' into 'develop' 
Ent 11167 15574 error al borrar el agente el borrado es correcto

See merge request artica/pandorafms!5879
 2023-05-12 11:30:22 +00:00
Rafael Ameijeiras ca1e1748a2 Merge branch 'ent-11068-ha-desaparecido-la-opcion-de-change-to-critical-status-after' into 'develop' 
Ent 11068 ha desaparecido la opcion de change to critical status after

See merge request artica/pandorafms!5807
 2023-05-12 09:31:05 +00:00
Rafael Ameijeiras eb0be5c2c7 Merge branch 'ent-11067-no-aparece-la-ip-al-hacer-hover-sobre-el-modulo' into 'develop' 
Ent 11067 no aparece la ip al hacer hover sobre el modulo

See merge request artica/pandorafms!5801
 2023-05-12 09:20:38 +00:00
Daniel Cebrian 5195c6acaf #11176 fixed dialog debug module 2023-05-11 15:39:58 +02:00
Matias Didier f93fbc558c Merge branch 'ent-11132-pantalla-en-blanco-al-crear-editar-paradas-programadas-al-seleccionar-los-modulos' into 'develop' 
Ent 11132 pantalla en blanco al crear editar paradas programadas al seleccionar los modulos

See merge request artica/pandorafms!5850
 2023-05-11 11:45:30 +00:00
Jorge Rincon c0fb7f0f91 #11170 show module delete confirmation 2023-05-11 10:42:30 +02:00
Jorge Rincon c6e1b08885 #11167 Adjusted the action so that the message Could not be disabled is not displayed when deleting an agent 2023-05-11 09:31:56 +02:00
miguel angel rasteu 1fc0a43ca8 #11158 Fixed entities in agent name and icon size 2023-05-10 12:53:03 +02:00
miguel angel rasteu da165e7f6c #11147 Change width of select 2023-05-09 14:56:14 +02:00
Pablo Aragon be6fb97f26 11145-Password module: plugin, wmi, network 2023-05-09 10:02:47 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
Jonathan c1c638bdfe #11132 fix downtime add all modules 2023-05-08 13:57:54 +02:00
miguel angel rasteu ddeea2f7ec #11087 Fix incorrect id in JS code 2023-05-08 13:54:31 +02:00
miguel angel rasteu 9f7679e936 #11068 Fix JS code 2023-05-08 12:59:10 +02:00
miguel angel rasteu f9b7ac523e #11067 Fix IP target title 2023-05-08 11:59:08 +02:00
Daniel Rodriguez e96fda12eb Merge branch 'ent-11111-15539-modulos-web-check-vacios-en-el-agente' into 'develop' 
Ent 11111 15539 modulos web check vacios en el agente

See merge request artica/pandorafms!5833
 2023-05-08 09:44:06 +00:00
miguel angel rasteu bef0092388 #11111 Fix duplicated var 2023-05-08 11:22:55 +02:00
Daniel Rodriguez 5051f259a4 Merge branch 'ent-11095-15522-modulos-web-check-de-politica-vacios' into 'develop' 
Ent 11095 15522 modulos web check de politica vacios

See merge request artica/pandorafms!5825
 2023-05-08 09:03:23 +00:00
miguel angel rasteu a13560597c #11113 Fix html_print_input_text 2023-05-08 10:41:26 +02:00
Jorge Rincon 82db353dd1 #11098 The operation of the create module button from the SNPM Walk modal is adjusted 2023-05-05 14:10:41 +02:00
daniel 77be60e4a3 fixed modules adopted pandora_enterprise#11103 2023-05-04 18:24:11 +02:00
Jorge Rincon 9ab9087377 #11098 The Create agent module button is enabled 2023-05-04 16:48:20 +02:00
miguel angel rasteu b3e97d9550 #11111 Fix module_manager_editor_web that it obtains the plugin_parameter data with the id of the tagente_modulo table 2023-05-04 16:01:35 +02:00
Daniel Cebrian c0f5264dde #9686 new section for add policy in agent 2023-05-04 13:17:02 +02:00
Daniel Maya 78f4126700 #11050 Fixed critical instructions 2023-05-04 10:39:51 +02:00
Pablo Aragon a6212c2777 11094-Load fields plugin module 2023-05-04 10:35:32 +02:00
miguel angel rasteu f3488e2aa4 #11095 Fix id_policy_module in url 2023-05-04 09:43:48 +02:00
miguel angel rasteu 5cb01d2079 #10860 Create function get_agent_module_childs 2023-05-03 09:20:40 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
Daniel Cebrian d446812018 #986 changed behavior for ip custom when change with politic 2023-04-27 16:39:13 +02:00
miguel angel rasteu 728cc27396 #11068 Add option change to critical status 2023-04-27 15:34:42 +02:00
miguel angel rasteu 88d6e0e4f1 #11067 Add to the title the ip_target of the module when it exists. 2023-04-27 09:58:16 +02:00
Pablo Aragon d346244004 2892-Remove Create by template, from description 2023-04-26 12:26:37 +02:00
Jorge Rincon 4b74dc7e78 #10623 removal of the default text in the textarea description 2023-04-26 09:38:03 +02:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop' 
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
 2023-04-25 13:27:07 +00:00
Rafael Ameijeiras 5d943510be Merge branch 'ent-10363-15056-CPS-Disabled-desaparece-al-deshabilitarlo-en-Opciones-Avanzadas-de-Modulo' into 'develop' 
minor fix in cps selector

See merge request artica/pandorafms!5665
 2023-04-25 13:26:26 +00:00
Jorge Rincon d23876c8aa #10981 fixed TCP Send-Receive fields in network modules 2023-04-21 14:30:42 +02:00
Jorge Rincon e064e0fd9a Fixed set for string type modules (async_string and generic_data_string) 2023-04-20 16:36:23 +02:00
Rafael Ameijeiras e5d2a346d4 Merge branch 'ent-10370-El-mensaje-en-nodo-para-administrar-agentes-aun-apunta-al-asistente-eliminado-en-Metaconsola' into 'develop' 
fixed metaconsole link

See merge request artica/pandorafms!5657
 2023-04-20 12:11:33 +00:00
Diego Muñoz-Reja 53bdaf66f9 Merge branch 'ent-10327-14975-version-snmp-erronea-en-componentes-remotos-personalizados' into 'develop' 
Ent 10327 14975 version snmp erronea en componentes remotos personalizados

See merge request artica/pandorafms!5676
 2023-04-20 11:26:13 +00:00
Rafael Ameijeiras b070eb9094 Merge branch 'ent-10974-inverse-interval-no-queda-seteado-tras-modificar-modulos-en-agente' into 'develop' 
Ent 10974 inverse interval no queda seteado tras modificar modulos en agente

See merge request artica/pandorafms!5727
 2023-04-20 07:28:08 +00:00
alejandro.campos@artica.es b293587aa9 implemented agent deploy wizard 2023-04-19 19:25:22 +02:00
alejandro.campos@artica.es 9553c42496 implemented agent deploy wizard 2023-04-19 19:21:38 +02:00
miguel angel rasteu 4d1e043236 Add width parameter on icons images 2023-04-18 11:08:43 +02:00
Jonathan 726ab896f1 #10899 remove entities from inventory custom fields 2023-04-18 09:49:35 +02:00
Jorge Rincon e33fadb8eb #10974 Warning threshold Inverse Interval and Critical threshold Inverse Interval set 2023-04-18 09:31:22 +02:00
Matias Didier 75a40d3c5a Merge branch 'ent-10898-error-en-la-asignacion-de-grupo-secundario' into 'develop' 
Ent 10898 error en la asignacion de grupo secundario

See merge request artica/pandorafms!5697
 2023-04-17 12:27:23 +00:00
miguel angel rasteu e0437d3fbd Fix duplicate code 2023-04-17 09:23:55 +02:00
Jonathan f6be23c353 #10899 json_ucescaped_unicode to inventory manage and visual fix 2023-04-14 12:24:39 +02:00
miguel angel rasteu 10c7d4dddb #15263 created filter for modules 2023-04-13 13:54:11 +02:00
miguel angel rasteu b043717df5 #15263 created filter for modules 2023-04-13 13:49:05 +02:00
Jonathan 1a05c71e78 #10526 fix create module dialog 2023-04-12 10:44:20 +02:00
Jonathan aa9fefd30c #10899 entities inventory and correction visual style 2023-04-12 10:25:35 +02:00
Pablo Aragon c21397476e 10898-Assign secondary groups in agent view 2023-04-12 08:21:26 +02:00
Jonathan 2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +02:00
Pablo Aragon bf76104350 10327-Change snmp_version when network_component change 2023-04-10 15:41:18 +02:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
alejandro.campos@artica.es 1b93472426 minor fix in cps selector 2023-04-05 12:38:23 +02:00
alejandro.campos@artica.es 795ccb14e6 fixed metaconsole link 2023-04-04 13:57:53 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS. 
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
 2023-04-04 11:57:45 +00:00
Matias Didier e4b718a468 Merge branch 'ent-10839-problema-con-buscador-agentes' into 'develop' 
Ent 10839 problema con buscador agentes

See merge request artica/pandorafms!5642
 2023-04-03 06:58:55 +00:00
Daniel Rodriguez ca16c5dd61 Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop' 
Ent 10441 control de cache en actualizaciones

See merge request artica/pandorafms!5623
 2023-03-31 07:33:26 +00:00
Daniel Maya 6bfdfa5a3b 10839 Fixed search 2023-03-30 14:09:02 +02:00
daniel f2e1b2ef57 fixed styles 2023-03-30 12:36:05 +02:00
Pablo Aragon e03e1e45ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 12:26:06 +02:00
Pablo Aragon 5e24706f71 Style fix 2023-03-30 12:25:45 +02:00
daniel 1262fee2e8 fixed styles 2023-03-30 08:43:23 +02:00
Jonathan 87946161f3 Solution conflict 2023-03-28 09:30:18 +02:00
Jonathan 81be0da7fd Module manager editor relations visual change 2023-03-28 09:17:47 +02:00
Pablo Aragon 98f812b757 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 17:03:45 +02:00
Pablo Aragon 55ff0e0597 wux and wmi 2023-03-27 17:03:38 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
daniel 5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Jonathan dfbdfbaf60 Create module message error correction 2023-03-17 12:15:10 +01:00
Jonathan d006c93297 Create update module msg error on open 2023-03-16 15:38:08 +01:00
Pablo Aragon 260caca63a 10021, 10224, 10652, 10414 2023-03-16 12:57:48 +01:00
Pablo Aragon 4d6029ba3f 10408-Manage agents, Agent view 2023-03-15 17:02:25 +01:00
Pablo Aragon 797f43ff3c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 15:58:34 +01:00
Pablo Aragon bed1e34fd2 Dashboards widgets 2023-03-15 15:58:28 +01:00
Daniel Cebrian c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
daniel cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/extras/mr/62.sql
 2023-03-14 18:17:54 +01:00
daniel 423767a32a fixed styles 2023-03-14 17:27:01 +01:00
daniel c4f4d371cc fixed styles 2023-03-14 17:25:58 +01:00
Pablo Aragon 6e4fe7bc48 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-14 14:56:52 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
Jose Gonzalez f0a424a493 Module manager fix 2023-03-14 08:04:05 +01:00
Pablo Aragon 51ab985784 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 16:14:02 +01:00
Pablo Aragon 6450100f23 Manage agent, setup view 2023-03-13 16:13:49 +01:00
Jose Gonzalez a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jose Gonzalez d4fa2831bf Inventory tab 2023-03-09 16:44:45 +01:00
daniel 1a63f8070a fixed styles 2023-03-09 15:06:03 +01:00
daniel e21d9968e8 fixed styles 2023-03-08 19:25:25 +01:00
Jose Gonzalez c51c00f974 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-08 15:05:35 +01:00
Jose Gonzalez f5daa72c6b Scheduled downtime 2023-03-08 15:04:07 +01:00
Jose Gonzalez 0373cd3514 Scheduled downtime 2023-03-08 15:02:12 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
daniel 1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez 114e9a366f Networkmap 2023-02-28 10:39:31 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
 2023-02-28 07:32:43 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Jose Gonzalez 70216262a9 Minor fixes 2023-02-24 12:05:53 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Jose Gonzalez 13aa4e77f1 Fix minor issues 2023-02-20 17:49:02 +01:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +01:00
Jonathan 041ce5d5e8 Manage Agents delete and create required "primary group" 2023-02-16 10:59:45 +01:00
Jose Gonzalez be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Jose Gonzalez 1d682521e9 Minor fixes in agent/module view 2023-02-14 10:41:40 +01:00
Jose Gonzalez 8f65ee4fb8 Minor fix: search submit in module list 2023-02-14 07:52:13 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Daniel Cebrian bcfa977f56 #10335 fixed plugin select in edit modules in bulk 2023-02-08 15:23:13 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22:52 +01:00
Jose Gonzalez ab1d2f38f6 Changed function name 2023-02-07 15:39:53 +01:00
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Rafael Ameijeiras 3bc593e58a Merge branch 'ent-10219-stored-cross-site-scripting-in-syslog-section' into 'develop' 
Ent 10219 stored cross site scripting in syslog section

See merge request artica/pandorafms!5464
 2023-02-02 10:02:32 +00:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez 0162767f6d Clean debug 2023-01-30 13:39:58 +01:00
Rafael Ameijeiras 4984599132 Merge branch 'ent-9175-13829-visualizacion-de-contrasenas-en-texto-plano-dentro-del-inspector-onenet-pakistan' into 'develop' 
Ent 9175 13829 visualizacion de contrasenas en texto plano dentro del inspector onenet pakistan

See merge request artica/pandorafms!5392
 2023-01-30 11:24:39 +00:00
Daniel Cebrian c2a16eb311 #10219 added db_escape_string_sql for control quotes 2023-01-26 16:34:35 +01:00
Daniel Cebrian 9282aa2319 #10219 fixed xss injection in syslog 2023-01-26 16:20:25 +01:00
Rafael Ameijeiras 7bdfb1a096 Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop' 
Added child module delete warning

See merge request artica/pandorafms!5429
 2023-01-26 12:53:03 +00:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Rafael Ameijeiras 2be4dc7960 Merge branch 'ent-9069-schedule-downtime-poner-decente-el-filtro' into 'develop' 
Ent 9069 schedule downtime poner decente el filtro

See merge request artica/pandorafms!5398
 2023-01-24 12:03:10 +00:00
Calvo 5d0826f412 Delete modules with children message 2023-01-24 12:26:49 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Calvo 8c071532e9 Added child module delete warning 2023-01-19 10:34:13 +01:00
Jose Gonzalez 8510629781 Treeview improvement 2023-01-19 00:31:11 +01:00
Jose Gonzalez 8c1bd2c1ee Agent module manager fixed and improve action buttons 2023-01-17 15:21:07 +01:00
Jose Gonzalez 8c852fb3df Agent improvements 2023-01-16 01:28:53 +01:00
Calvo ce224d67ba Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2023-01-13 09:08:17 +01:00
Daniel Rodriguez 29624c92e8 Merge branch 'ent-9618-ver-la-ip-contra-la-que-se-esta-ejecutado-un-modulo-remoto-en-la-vista-de-agente' into 'develop' 
Ent 9618 ver la ip contra la que se esta ejecutado un modulo remoto en la vista de agente

See merge request artica/pandorafms!5393
 2023-01-12 12:25:35 +00:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Daniel Cebrian 31d0cceecc #10131 fixed error 500 in module templates 2023-01-11 17:00:39 +01:00
Daniel Cebrian 0f7ffec6aa #9069 fixed style in SCHEDULED DOWNTIME form 2023-01-11 13:57:46 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Jose Gonzalez 118099cd24 Minor fixes and solve issues with module templates 2023-01-11 13:02:18 +01:00
Jose Gonzalez 4cb5055488 TODO added 2023-01-10 15:16:58 +01:00
Daniel Cebrian df87c122af added ip in modules list 2023-01-10 10:50:47 +01:00
Pablo Aragon 72acbae5a6 Hide module password value 2023-01-10 10:23:09 +01:00
Jose Gonzalez 60685cdccc Table fixes 2023-01-10 10:18:37 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Jose Gonzalez 8728551c08 Agent details modules table upgraded 2023-01-04 15:46:32 +01:00
Jose Gonzalez 03226b1f23 Polishing agent main view 2023-01-02 16:50:13 +01:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Rafael Ameijeiras 7c0b6330bd Merge branch 'ent-9997-quitar-using-module-component-de-la-edicion-de-modulo' into 'develop' 
Ent 9997 quitar using module component de la edicion de modulo

See merge request artica/pandorafms!5354
 2022-12-28 09:49:42 +00:00
Rafael Ameijeiras fa034e4ae2 Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop' 
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas

See merge request artica/pandorafms!5359
 2022-12-28 09:42:23 +00:00
Rafael Ameijeiras db7205fed3 Merge branch 'ent-9996-descripcion-incorrecta-al-crear-modulo-ssh' into 'develop' 
Ent 9996 descripcion incorrecta al crear modulo ssh

See merge request artica/pandorafms!5351
 2022-12-28 09:37:04 +00:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
Jonathan c89d80e7e7 #9997 Module agent on edit don't show template 2022-12-23 09:44:15 +01:00
Calvo b46f9c9319 Move inventory to open 2022-12-22 12:47:03 +01:00
Calvo 2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
Rafael Ameijeiras 925749dc5f Merge branch 'ent-9052-lista-de-modulos-de-un-agente-ordenar-filtros-y-controles' into 'develop' 
Ent 9052 lista de modulos de un agente ordenar filtros y controles

See merge request artica/pandorafms!5327
 2022-12-22 09:35:41 +00:00
Pablo Aragon d83abafaaa 9996 Edit description when create ssh module 2022-12-21 17:05:01 +01:00
Rafael Ameijeiras 9ad2556201 Merge branch 'ent-1270-borrado-de-modulos-hijos-automatico' into 'develop' 
Ent 1270 borrado de modulos hijos automatico

See merge request artica/pandorafms!5340
 2022-12-21 11:49:39 +00:00
Daniel Rodriguez cc2da2d4a4 Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop' 
implement cluster in open project

See merge request artica/pandorafms!5204
 2022-12-21 09:05:01 +00:00
Jonathan f62116bf92 #1270 deleche children modules on checked 2022-12-21 08:44:11 +01:00
Jose Gonzalez ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01:00
alejandro.campos@artica.es 47cb138d9b path fix 2022-12-20 14:15:33 +01:00
Jonathan e694d6468f 1270 Delete modules on cascade 2022-12-19 17:04:49 +01:00
Jose Gonzalez b0997850f4 Fix server type icon definition 2022-12-19 16:38:47 +01:00
Jose Gonzalez 977c358fa0 Grouped somethings 2022-12-19 15:08:53 +01:00