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

21579 Commits

Author SHA1 Message Date
artica 63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
Daniel Rodriguez 4ea790a649 Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' 
Ent 7141 vulnerabilities csrf

Closes pandora_enterprise#7141

See merge request artica/pandorafms!4015
 2021-05-19 16:00:16 +00:00
artica f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
José González 91d11bd4cf Controlled pandora_revent with id_agent 0 2021-05-18 16:37:05 +02:00
José González 46e0cbca70 id_agent control for pandora_revent 2021-05-18 14:52:23 +02:00
fbsanchez 9666b76fa9 Common requirements using base url 2021-05-18 10:56:40 +02:00
artica 739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
alejandro.campos@artica.es 663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00
Daniel Rodriguez a6f41ede3d Merge branch 'ent-7521-Dynamic-Threshold-max-desactivado-por-error' into 'develop' 
Fixed issue with undesired deactivate dynamic threshold max field

Closes pandora_enterprise#7521

See merge request artica/pandorafms!4130
 2021-05-17 08:07:11 +00:00
Daniel Rodriguez 8b704cb2c1 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas-2' into 'develop' 
new bell orange

See merge request artica/pandorafms!4131
 2021-05-17 08:06:37 +00:00
artica d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica 8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
marcos 9cde309222 new bell orange 2021-05-14 11:58:08 +02:00
Daniel Rodriguez 203310d13b Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop' 
remove vamos a ver

See merge request artica/pandorafms!4126
 2021-05-14 09:39:07 +00:00
Daniel Rodriguez 823eb96d47 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas' into 'develop' 
changed bell orange

See merge request artica/pandorafms!4127
 2021-05-14 09:38:47 +00:00
Daniel Rodriguez 5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
José González 998fb4b0dc Fixed issue with undesired deactivate dynamic threshold max field 2021-05-14 11:22:32 +02:00
alejandro.campos@artica.es 2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es 86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
artica 9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
alejandro.campos@artica.es 1a194e1644 minor change 2021-05-13 14:10:42 +02:00
alejandro.campos@artica.es b52f971262 minor change 2021-05-13 14:06:54 +02:00
alejandro.campos@artica.es 172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 3a76d6e680 Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop' 
Added comments header and improve code

Closes pandora_enterprise#7156

See merge request artica/pandorafms!3986
 2021-05-13 11:14:44 +00:00
marcos 40cfe62e96 changed bell orange 2021-05-13 13:14:16 +02:00
marcos d711d71392 remove vamos a ver 2021-05-13 13:09:42 +02:00
artica afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
José González 3758c80019 Fixed delete_files entries. 2021-05-12 13:07:45 +00:00
Daniel Rodriguez 6aa1188d35 Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop' 
Added missing fields to alert snmp actions

See merge request artica/pandorafms!3927
 2021-05-12 12:54:37 +00:00
Luis 7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Rodriguez 4e871ed296 Merge branch 'ent-6983-typo-en-traduccion' into 'develop' 
fixed wrong string

See merge request artica/pandorafms!4099
 2021-05-12 07:55:09 +00:00
artica 671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +02:00
Daniel Rodriguez 8a3d977e82 Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop' 
Ent 5401 búsqueda de módulo por id al llegar desde link de consola

See merge request artica/pandorafms!4026
 2021-05-11 15:38:01 +00:00
Daniel Rodriguez dcbeaa1b3e Merge branch 'ent-7295-bug-visual-en-modal-eventos' into 'develop' 
Fixed visual bug on event modal event responses

See merge request artica/pandorafms!4022
 2021-05-11 13:49:40 +00:00
Luis b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Daniel Rodriguez 858adb2628 Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' 
Fixed errors diagnostic

See merge request artica/pandorafms!4047
 2021-05-11 13:48:55 +00:00
Daniel Maya 9c234eef85 Ent 7087 mensaje duplicado en los test mails 2021-05-11 13:48:09 +00:00
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez 128f67b058 Merge branch 'ent-7139-clickjacking' into 'develop' 
Avoiding clickjacking

Closes pandora_enterprise#7139

See merge request artica/pandorafms!4013
 2021-05-11 09:45:08 +00:00
Daniel Rodriguez fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop' 
fixed bug in file attachment

See merge request artica/pandorafms!4102
 2021-05-11 07:40:54 +00:00
Daniel Rodriguez 89dcde6ca7 Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop' 
minor changes

See merge request artica/pandorafms!4107
 2021-05-11 07:40:24 +00:00
Daniel Rodriguez f77d774a32 Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop' 
fixed visual error black theme

See merge request artica/pandorafms!4100
 2021-05-11 07:39:58 +00:00