Commit Graph

19168 Commits

Author SHA1 Message Date
artica 848503babe Auto-updated build strings. 2020-05-01 01:00:14 +02:00
daniel c308d49c25 Fix retrocompatibility 2020-04-30 14:08:56 +02:00
artica 8a019bd8f4 Auto-updated build strings. 2020-04-30 01:00:16 +02:00
artica 456848485e Auto-updated build strings. 2020-04-29 01:00:16 +02:00
Daniel Rodriguez a28ffda2eb Merge branch 'ent-5762-notificacion-de-chat' into 'develop'
add modal on Webchat

See merge request artica/pandorafms!3189
2020-04-28 16:38:56 +02:00
marcos 2d48c67377 add modal on Webchat 2020-04-28 13:56:43 +02:00
marcos bcc68c0034 add modal on Webchat 2020-04-28 13:42:27 +02:00
Daniel Rodriguez 19713f5040 Merge branch 'ent-5750-dashboards-boton-de-borrado' into 'develop'
add delete confirmation dialog

See merge request artica/pandorafms!3185
2020-04-28 11:36:17 +02:00
marcos 72f9c051eb changed message confirmation dialog 2020-04-28 10:44:13 +02:00
marcos 8cd1c0b83f add body message on confirmation modal 2020-04-28 10:12:20 +02:00
artica d644714fcb Auto-updated build strings. 2020-04-28 01:00:18 +02:00
marcos ccd58897ee Add confirmation window 2020-04-27 16:40:50 +02:00
artica a986ed0a48 Auto-updated build strings. 2020-04-27 01:00:15 +02:00
artica bf0596e978 Auto-updated build strings. 2020-04-26 01:00:15 +02:00
artica 202816e309 Auto-updated build strings. 2020-04-25 01:00:18 +02:00
marcos ef30239cc6 add delete confirmation dialog 2020-04-24 16:43:18 +02:00
artica eb9b116311 Auto-updated build strings. 2020-04-24 01:00:16 +02:00
artica 1b641b81fb Auto-updated build strings. 2020-04-23 01:00:15 +02:00
artica 91d1832f8f Updated version and build strings. 2020-04-22 12:42:47 +02:00
artica 60f4f21297 Auto-updated build strings. 2020-04-22 01:00:15 +02:00
Luis Calvo d44aa7b1e1 Fixed agent aler list 2020-04-21 16:02:36 +02:00
artica b3d7c56de4 Auto-updated build strings. 2020-04-21 01:00:18 +02:00
artica 3992b81900 Auto-updated build strings. 2020-04-20 01:00:19 +02:00
artica 2e44631253 Auto-updated build strings. 2020-04-19 01:00:15 +02:00
artica 04ecb0afa5 Auto-updated build strings. 2020-04-18 01:00:19 +02:00
artica 719762105d Auto-updated build strings. 2020-04-17 01:00:19 +02:00
Alejandro Fraguas fdced83e63 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
Fixes name resolution

See merge request artica/pandorafms!3167
2020-04-16 18:23:31 +02:00
fbsanchez 290abfe2ce fix css issue window shrink 2020-04-16 17:54:41 +02:00
artica 1b028be67f Auto-updated build strings. 2020-04-16 01:00:14 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
Alejandro Fraguas a4bd4a4c5d Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
minor style fix

See merge request artica/pandorafms!3166
2020-04-15 12:33:41 +02:00
fbsanchez 83b53e3eb7 minor style fix 2020-04-15 11:53:10 +02:00
Alejandro Fraguas afa53c3398 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
minor style change

See merge request artica/pandorafms!3164
2020-04-15 09:17:46 +02:00
artica e695a3f5b5 Auto-updated build strings. 2020-04-15 01:00:17 +02:00
fbsanchez 282b31841d minor style change 2020-04-14 18:24:51 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
	pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +02:00
Alejandro Fraguas 254a32be22 Merge branch 'ent-5691-Vulnerabilidad-XSS-en-sistema-de-mensajes' into 'develop'
fix cross-site scripting vulnerability

See merge request artica/pandorafms!3156
2020-04-14 15:36:48 +02:00
alejandro-campos 268e317ca3 fix cross-site scripting vulnerability 2020-04-14 12:50:19 +02:00
fbsanchez edb3059a09 minor style fix 2020-04-14 12:32:54 +02:00
fbsanchez 36daf76cc5 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/extras/mr/37.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2020-04-14 12:00:15 +02:00
fbsanchez 3b71297d56 escaped single quotes (wmi) + refresh button 2020-04-14 11:57:18 +02:00
Daniel Rodriguez 0e6b1ab713 Merge branch 'ent-5684-Se-ha-roto-la-vista-de-arbol' into 'develop'
Fix tree

See merge request artica/pandorafms!3153
2020-04-14 10:48:02 +02:00
Daniel Rodriguez a0881d53e8 Merge branch 'ent-5678-Errores-varios-en-los-nuevos-dashboards' into 'develop'
Fix dashboards

See merge request artica/pandorafms!3152
2020-04-14 10:43:48 +02:00
artica 60ee065f8b Auto-updated build strings. 2020-04-14 01:00:15 +02:00
fbsanchez 13a1e44a5e operation icons on small screens 2020-04-13 19:34:36 +02:00
fbsanchez 58eeffd04d clearer maps 2020-04-13 18:28:56 +02:00
Jose Gonzalez 3fd09c9828 WIP: Reverse develop version for agent_wizard 2020-04-13 17:30:21 +02:00
slerena d13eac3081 Update .htaccess 2020-04-13 17:20:11 +02:00
Daniel Barbero Martin 0c53ff58b2 Fix tree 2020-04-13 16:42:46 +02:00
Jose Gonzalez 6f0b1c005f Added invisible class 2020-04-13 15:41:35 +02:00