Commit Graph

19252 Commits

Author SHA1 Message Date
fbsanchez 92ff713651 1st approach 2020-05-05 18:58:45 +02:00
vgilc d17299e290 Merge branch 'update-japanese-console-translation' into 'develop'
Japanese console translation

See merge request artica/pandorafms!3182
2020-05-05 15:25:39 +02:00
tatiana 490213dfed Changed path in a required file 2020-05-05 12:50:15 +02:00
artica b894f63f1f Auto-updated build strings. 2020-05-05 01:00:14 +02:00
alejandro-campos 197e309129 added new module type 2020-05-04 12:22:04 +02:00
alejandro-campos 1140a4345a added new module type 2020-05-04 12:20:50 +02:00
fbsanchez 4815dce8aa H&D port filtering + control tasks cancellation while restarting server 2020-05-04 11:13:15 +02:00
fbsanchez 54a9ebd4ed Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d
Conflicts:
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-05-04 09:52:15 +02:00
artica 12128ea2f1 Auto-updated build strings. 2020-05-04 01:00:15 +02:00
artica 7006e3febd Auto-updated build strings. 2020-05-03 01:00:14 +02:00
artica f95fed2d79 Auto-updated build strings. 2020-05-02 01:00:15 +02:00
artica 848503babe Auto-updated build strings. 2020-05-01 01:00:14 +02:00
marcos e215cdc194 add cache false on functions_module_library 2020-04-30 18:20:09 +02:00
fbsanchez 7ad06596ff Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d 2020-04-30 16:26:47 +02:00
fbsanchez 900e25eef1 WIP rcmd in H&D 2020-04-30 15:00:25 +02:00
fbsanchez 026562e7ee MR changes 2020-04-30 15:00:04 +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
Junichi Satoh 6f0dbf18bd Updated Japanese console translation. 2020-04-23 17:47:10 +09: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
Daniel Maya ccb3b8ab7a Fixed Advanced permissions AD 2020-04-20 15:19:28 +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
fbsanchez 2ca9e6fb4a 1st approach avoid quick_shell vulnerability (telnet) 2020-04-17 11:18:49 +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
marcos e3f1f5fe6e change url for pop up reverse proxy 2020-04-16 13:44:23 +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
Jose Gonzalez d19a667ce9 Added form attribute for inputs 2020-04-13 15:41:00 +02:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
marcos d5a7d75169 update function get id_event from meta api 2020-04-13 11:00:11 +02:00
Jose Gonzalez 3f1e7d2ced Solve minor fix 2020-04-13 10:57:32 +02:00
marcos 045f115d95 documented api function 2020-04-13 10:54:37 +02:00
fbsanchez 32538e659a Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-13 10:36:47 +02:00
marcos db7eaaaf20 created function to get id_event from tmetaconsole_even api 2020-04-13 10:36:23 +02:00
artica 8d27ff9350 Auto-updated build strings. 2020-04-13 01:00:08 +02:00
artica 8b609e2d26 Auto-updated build strings. 2020-04-11 01:00:15 +02:00
artica 017fdea2c7 Auto-updated build strings. 2020-04-10 01:00:14 +02:00
artica 6425d4d86d Auto-updated build strings. 2020-04-09 01:00:18 +02:00
marcos 9931b16793 add nombre in api_get_i_name_by_alias API method 2020-04-08 17:01:18 +02:00
Jose Gonzalez d1f565bb1d Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-08 16:52:41 +02:00
Jose Gonzalez 805d96108c Changed position of buttons 2020-04-08 16:52:34 +02:00
fbsanchez a75964fcba minor fix 2020-04-08 16:06:39 +02:00
fbsanchez 748582509a avoid process csv while updating task with no csv changes 2020-04-08 12:29:44 +02:00
fbsanchez 4cf121b45a Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-08 12:26:05 +02:00
fbsanchez 95d7a5d267 minor fix 2020-04-08 12:26:01 +02:00
Jose Gonzalez 725e7d9c16 Solved issue with wrong position in filter 2020-04-08 12:17:22 +02:00
fbsanchez 47857de79f some css adjustments 2020-04-08 11:48:31 +02:00
marcos e86f72958d update AllowOverride notify 2020-04-08 10:36:40 +02:00
fbsanchez 5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18:13 +02:00
fbsanchez ce5868bbc4 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-08 10:03:51 +02:00
marcos ff3b285f08 add url on notify 2020-04-08 09:45:18 +02:00
artica 987d8f4c75 Auto-updated build strings. 2020-04-08 01:00:21 +02:00
fbsanchez 56e9275b1a minor fix 2020-04-07 19:10:37 +02:00
fbsanchez 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
fbsanchez 1a2fd7ac09 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-07 18:50:18 +02:00
marcos c44cb889e0 updates 2020-04-07 18:49:01 +02:00
marcos f8f2da4d40 notify for allowoverride 2020-04-07 18:40:47 +02:00
Jose Gonzalez 396c93c8b8 WIP: Refactor and solve visual issues 2020-04-07 17:46:12 +02:00