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

23910 Commits

Author SHA1 Message Date
marcos 18a3a747bd add wiki url alerts correlation 2020-01-22 12:24:15 +01:00
Daniel Rodriguez 189ba74f01 Merge branch 'ent-5323-Phar-object-injection' into 'develop' 
Prepend folder to image to avoid Phar injection

See merge request artica/pandorafms!3021
 2020-01-22 12:20:35 +01:00
vgilc 69d9051339 Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop' 
Fixed visual bug in grouped report item

See merge request artica/pandorafms!2992
 2020-01-22 12:20:05 +01:00
Daniel Maya 5c3b6c7a69 Fix total check for failover 2020-01-22 12:18:11 +01:00
Daniel Rodriguez f6cb7eb3d7 Merge branch 'ent-5325-CSRF-XSS-realtime-graphs' into 'develop' 
Added enconding to POST variables realtime graphs

See merge request artica/pandorafms!3019
 2020-01-22 12:04:14 +01:00
Daniel Rodriguez ec03f947fe Merge branch 'ent-5226-Update-Manager-Offline-mostrar-aviso' into 'develop' 
Added warning in update manager offline

See merge request artica/pandorafms!2998
 2020-01-22 11:10:02 +01:00
Daniel Maya 32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Luis Calvo ca35bb64cc Prepend folder to image to avoid Phar injection 2020-01-22 10:17:35 +01:00
Daniel Barbero 8bcacf546c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-22 10:13:25 +01:00
artica 475517afd7 Auto-updated build strings. 2020-01-22 00:01:19 +01:00
Daniel Barbero Martin 4b5a754d2e Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-21 17:44:06 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Maya 428e0ffbd7 Fixed password policy 2020-01-21 17:31:21 +01:00
Daniel Maya 81fe77d9fd Added failover in templates 2020-01-21 16:26:36 +01:00
marcos 76ed257287 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-01-21 15:23:26 +01:00
Daniel Barbero Martin a557c25c31 Fixed errors VC 2020-01-21 12:55:54 +01:00
Daniel Rodriguez 2a4e7bcceb Merge branch 'ent-5329-9418-remote_cmd_string-busca-histórico-en-tagente_datos' into 'develop' 
remote_cmd_string modules historical data look into tagente_datos_string

See merge request artica/pandorafms!3018
 2020-01-21 11:15:34 +01:00
Luis Calvo 3d0b71d953 Added enconding to POST variables 2020-01-21 11:05:49 +01:00
Daniel Barbero Martin b2f356bd4b Fixed errors VC 2020-01-21 10:42:09 +01:00
Daniel Barbero Martin 8672629dd6 Fixed errors VC 2020-01-21 10:33:07 +01:00
Daniel Barbero Martin 578400aa92 change load modal ?????? 2020-01-21 08:37:30 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
artica 2a17065065 Auto-updated build strings. 2020-01-21 00:01:11 +01:00
marcos fed1b748bb Merge branch 'ent-4705-encriptado-de-nuevos-tokens' of https://brutus.artica.es:8081/artica/pandorafms into ent-4705-encriptado-de-nuevos-tokens 2020-01-20 18:36:51 +01:00
Daniel Barbero Martin 98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin 3545e28581 Fixed errors VC 2020-01-20 16:01:53 +01:00
Alejandro Fraguas 8803cbff33 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' into 'develop' 
changes in module data formatting when printed across the application and new setup options

See merge request artica/pandorafms!2944
 2020-01-20 14:19:45 +01:00
ismael.moreno 395d45cec9 remote_cmd_string modules historical data look into tagente_datos_string 2020-01-20 14:12:33 +01:00
Jose Gonzalez ee44c74d27 Solved issue with user profile creation 2020-01-20 12:40:19 +01:00
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-20 12:00:42 +01:00
Jose Gonzalez 6fdd460f8a Solved an internal issue for control the test result 2020-01-20 11:27:39 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop' 
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
 2020-01-20 09:54:20 +01:00
Daniel Barbero Martin 03c1224563 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-20 08:00:46 +01:00
artica ba1f0b96b4 Auto-updated build strings. 2020-01-20 00:01:08 +01:00
Daniel Barbero Martin 861011257d Fixed errors VC 2020-01-19 22:57:31 +01:00
Daniel Barbero Martin 536af6f33a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-19 11:37:18 +01:00
artica 8eb77fa6cc Auto-updated build strings. 2020-01-19 00:01:07 +01:00
artica 14de9f3c59 Auto-updated build strings. 2020-01-18 00:01:15 +01:00
Jose Gonzalez 867ae40b17 Changed pandora server start for control if is needed add parameters. Also, deleted default parameters 2020-01-17 22:58:45 +01:00
Daniel Rodriguez 96eebe4310 Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop' 
Added port option on server configuration to be used when connecting to execution server

See merge request artica/pandorafms!3012
 2020-01-17 14:40:58 +01:00
alejandro-campos bb4d3abe6b change config default value 2020-01-17 12:42:29 +01:00
Daniel Rodriguez 92eb63891b Merge branch 'ent-4754-mensaje-de-error-informes-con-base-de-datos-historica-mal-configurada' into 'develop' 
add historical data fialure message

See merge request artica/pandorafms!2925
 2020-01-17 10:32:53 +01:00
Marcos Alconada 2968ce7658 update error message 2020-01-17 10:09:52 +01:00
artica cf4362e433 Auto-updated build strings. 2020-01-17 00:01:10 +01:00
Alejandro Fraguas 4e1c3a72a8 Merge branch 'ent-5187-modulos-remote_cmd-no-funcionan' into 'develop' 
Set default rcmd_timeout=10 and new rcmd_timeout_bin token

See merge request artica/pandorafms!2990
 2020-01-16 19:16:20 +01:00
Marcos Alconada de1407badc Update mysqlerr.php 2020-01-16 17:58:50 +01:00
alejandro-campos 8778553cca Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' of https://brutus.artica.es:8081/artica/pandorafms into ent-5135-No-funciona-la-exploracion-SNMP-remota 2020-01-16 17:42:45 +01:00
alejandro-campos fb7cb57f03 added check to disable satellite servers from exec servers available in snmp wizard in case it is not a satellite agent or has remote config 2020-01-16 17:42:31 +01:00
Daniel Barbero Martin 02199b19b5 fixed errors VC 2020-01-16 16:55:48 +01:00
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00