Commit Graph

606 Commits

Author SHA1 Message Date
Jose Gonzalez f584ac7835 Solved issue with query 2019-11-04 17:45:56 +01:00
fbsanchez 3eb0a6bb95 minor fixes after internal meeting 2019-10-30 18:33:33 +01:00
fbsanchez 72b1fb2b16 Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
Conflicts:
	pandora_console/include/javascript/pandora.js

	modified:   pandora_console/general/register.php
	modified:   pandora_console/godmode/agentes/configurar_agente.php
	modified:   pandora_console/godmode/agentes/module_manager_editor.php
	new file:   pandora_console/include/ajax/welcome_window.php
	new file:   pandora_console/include/class/WelcomeWindow.class.php
	modified:   pandora_console/include/constants.php
	modified:   pandora_console/include/functions_config.php
	modified:   pandora_console/include/javascript/pandora.js
	new file:   pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
fbsanchez c07baa614f Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF 2019-10-29 17:00:57 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
fbsanchez 0a53c0b915 Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 2019-10-29 16:50:46 +01:00
marcos 8174b4f2eb add help option in welcome window 2019-10-29 10:38:22 +01:00
Daniel Barbero Martin f6fd5cc21f Add image feedback 2019-10-29 09:13:48 +01:00
marcos 57bfc364ae add modal confirmation window 2019-10-28 18:57:10 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
Daniel Barbero c4aea1ac59 add styles validation form of modal 2019-10-25 13:28:01 +02:00
Daniel Barbero 22a2b7cd0b Add feedback phpInfo 2019-10-25 10:43:03 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
marcos e725a0185b cambios semi finales 2019-10-24 16:56:13 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
marcos b35c9dd96d ajust changes 2019-10-22 16:42:13 +02:00
marcos f14c4966e3 changes 2019-10-22 13:10:15 +02:00
marcos ca49cefb0d fixed 2019-10-22 12:19:25 +02:00
marcos ee97ed8a5e segunda ronda 2019-10-21 18:36:02 +02:00
Daniel Barbero e37af1598a continue feedback diagnostics 2019-10-21 18:11:04 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
Daniel Barbero b8d03e98c3 pdf diagnostic 2019-10-18 15:23:23 +02:00
marcos 353246f9f6 first changed to welcome window 2019-10-18 10:30:19 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Marcos Alconada e7a948bb71 Update HelpFeedBack.class.php 2019-10-16 11:03:21 +02:00
Marcos Alconada 1a77e3e381 Update HelpFeedBack.class.php 2019-10-15 18:11:50 +02:00
Marcos Alconada d04544fa66 Update HelpFeedBack.class.php 2019-10-15 16:34:01 +02:00
Marcos Alconada 03ada6fb1f Update HelpFeedBack.class.php 2019-10-15 16:28:12 +02:00
Marcos Alconada f8636e77cc Update HelpFeedBack.class.php 2019-10-15 12:45:40 +02:00
marcos a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
Daniel Barbero Martin 13a72426cd fixed diagnostics 2019-10-14 17:21:38 +02:00
Daniel Barbero 66bad65550 refactoriced diagnostics pandoraFMS 2019-10-11 14:55:20 +02:00
Tatiana Llorente dd2ace99e1 Check permissions to reset a network map - #4728 2019-10-11 13:51:52 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
fbsanchez d09c071684 discovery ACL 2019-10-09 15:45:02 +02:00
Daniel Rodriguez bd7ee945f7 Merge branch 'ent-4454-No-aparece-el-icono-con-color-de-warning-en-el-Service-Tree-View' into 'develop'
Fixed bad image for warning status - #4454

See merge request artica/pandorafms!2629
2019-10-07 19:21:53 +02:00
Daniel Rodriguez dc01b3e22e Merge branch 'ent-4679-notificacion-supervisor-server-no-actualizado' into 'develop'
Added notify when Console and Server have version mismatch

See merge request artica/pandorafms!2770
2019-10-07 15:59:16 +02:00
Daniel Rodriguez b2157f4b32 Merge branch 'ent-4051-tree-view-module-groups-duplica-modulos' into 'develop'
add condition in query

See merge request artica/pandorafms!2710
2019-10-03 16:41:15 +02:00
fbsanchez 79dca2fe6b Php OO form load 2019-10-02 18:37:50 +02:00
Jose Gonzalez 5294e2f627 Now the supervisor control all servers and not only one 2019-09-30 15:40:40 +02:00
Jose Gonzalez d878958502 Added notify when Console and Server have version mismatch 2019-09-30 12:48:46 +02:00
fbsanchez 746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
fbsanchez 7d52614064 Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora 2019-09-24 11:25:53 +02:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
marcos.alconada 83e5c14b1d add condition in query 2019-09-09 12:54:16 +02:00
Jose Gonzalez bb25679344 Added ui_get_full_url in all links 2019-09-04 14:12:38 +02:00
Jose Gonzalez 3d03faed9a Solved some issues 2019-08-06 14:56:57 +02:00
Tatiana Llorente 4e927e1ee5 Fixed bad image for warning status - #4454 2019-08-01 10:36:15 +02:00
Jose Gonzalez dd77429aea Solved issue with status names 2019-07-29 17:22:16 +02:00
Luis Calvo 94250cb870 Fixed minor bug 2019-07-15 17:46:59 +02:00
Luis Calvo a0ad1f2681 Merge remote-tracking branch 'origin/develop' into ent-4035-add-serialize-precision-value-notification 2019-07-15 15:04:13 +02:00
Daniel Barbero Martin bd070b706b fixed minor error 2019-07-11 12:45:52 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
marcos.alconada 340e253901 Add global config to method getFirstLevel() to remove warning check_acl error 2019-06-17 13:38:05 +02:00
fbsanchez ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
fbsanchez c741020538 styles review 2019-06-04 13:57:55 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop'
Ent 1668 update manager

See merge request artica/pandorafms!2420
2019-05-22 15:25:49 +02:00
Alejandro Fraguas ce359bfaf6 Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop'
Ent 3937 eliminar echos y prints de las subclases de wizard

See merge request artica/pandorafms!2430
2019-05-21 12:11:53 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
Luis Calvo 105695f1bd Added notification for serialize_precicion value 2019-05-17 18:29:38 +02:00
alejandro-campos 54d3eefa43 lint changes 2019-05-17 14:27:59 +02:00
alejandro-campos e746a49158 lint changes 2019-05-17 14:26:44 +02:00
Luis Calvo 1bfd91725e Changed <img> to hmtl_print_image
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
2019-05-16 17:13:14 +02:00
fbsanchez e7dbb55392 Minor fixes
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
2019-05-16 12:00:49 +02:00
alejandro-campos 13b32003b3 save changes ticket 3937
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
2019-05-16 11:37:48 +02:00
fbsanchez d871b599ef General fixes and UM comm updates
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
2019-05-14 23:49:01 +02:00
fbsanchez 8004e096fd MR 28 and minor fixes
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +02:00
fbsanchez 53e9113b7e UM notifications MR update
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
2019-05-14 17:15:28 +02:00
Tatiana Llorente f5114918b5 Unify the styles of Discovery with Pandora - #4004 2019-05-09 08:45:55 +02:00
Daniel Maya c31948b7c2 Fixed netflow node name
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
2019-04-30 17:30:57 +02:00
Daniel Maya 4b73518804 Fixed node name in netflow map
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
2019-04-26 09:54:38 +02:00
Alejandro Fraguas 194f4400f7 Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
Ent 3647 revision estilos discovery con la nueva linea de estilos

See merge request artica/pandorafms!2370

Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
alejandro-campos 01d1fb1c11 fixed visual bug
Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b
2019-04-22 18:17:39 +02:00
alejandro-campos 4f6a81dc5b visual changes to discovery
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
fbsanchez 8978b49a8b minor fix while setting node_radius by default
Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6
2019-04-22 09:33:51 +02:00
fbsanchez cbdd8e7104 Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 4efed0a1512550d09b8beb6a9851f7b1eeb3ff0c
2019-04-22 09:01:24 +02:00
Daniel Barbero Martin d5b1ac5565 fixed map IPAM
Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a
2019-04-08 18:28:27 +02:00
Daniel Barbero 4808e4ae97 fixed errors map ipam
Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4
2019-04-05 16:43:36 +02:00
Tatiana Llorente d91631e0e1 New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
fbsanchez 11b2fbc245 WIP db
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
2019-04-02 16:25:29 +02:00
fbsanchez b0a6ea7415 WIP atomic JS map. Minor fix to keep working
Former-commit-id: fee809008311942f1d9ad14aea70ba78e3d6eb3a
2019-03-29 20:52:51 +01:00
fbsanchez 4854d4b2df WIP atomic JS map
Former-commit-id: 95736d11295948e5dc20aefcf1293b7882729588
2019-03-29 20:31:55 +01:00
fbsanchez 086ee0620e minor fix
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
2019-03-27 18:31:02 +01:00
fermin831 7b901be5fa Changed default font size name on NetworkMap class
Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f
2019-03-27 12:42:54 +01:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
fermin831 9ee095406b Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php

Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
2019-03-27 11:59:25 +01:00
fbsanchez 3c853ff508 widget networkmap simple working
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
2019-03-27 11:47:09 +01:00
fbsanchez 3038de3a9d minor fixes
Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796
2019-03-27 11:06:57 +01:00
Daniel Barbero Martin 5504741a9d Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php


Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29
2019-03-26 18:48:49 +01:00
fbsanchez 08a240746c breadcrum improvement discovery
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
fbsanchez 3316d19bd3 minor fix
Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f
2019-03-26 17:00:20 +01:00
fbsanchez 2d1463ee0c minor fixes networkmaps
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
alejandro-campos a0f4eb1910 change discovery page title
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
alejandro-campos ec999341ba change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
fermin831 f880d9202a Adde no popup configuration token to avoid to show tooltips
Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
2019-03-26 15:27:45 +01:00
Ramon Novoa c25143c27e Add a notification for 'limited mode'.
Former-commit-id: dce72c7a9ea452029e5650a2012ff35cc6eca9b8
2019-03-26 11:53:03 +01:00
fbsanchez dad791b887 relationship management JS
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
2019-03-25 15:52:15 +01:00
fbsanchez e1a4250d01 NetworkClass RC1
Former-commit-id: bd30ce824e0f50e9684e32268bea396a84ff6744
2019-03-25 11:09:22 +01:00
fbsanchez b5401a500c minor fixes
Former-commit-id: 30e4d5dffa78834088d8644168d4d64b13cf8b08
2019-03-25 11:02:16 +01:00
fbsanchez eac0d66056 refresh holding area in networkmap
Former-commit-id: 17492041e3c14d15a6cf96b522ab368e9a2b7974
2019-03-22 19:16:45 +01:00
fbsanchez face622e9e reset-map fixed
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
2019-03-22 18:27:12 +01:00
fbsanchez 091e2db13a minor fix
Former-commit-id: 55b56db7a7ca1eee5d48731269d2894425037e3b
2019-03-22 16:00:01 +01:00
fbsanchez 732fdafc14 custom text in links
Former-commit-id: 31b851b5c296e8beb135a60f6b67ee8a073a28ea
2019-03-22 15:08:44 +01:00
fbsanchez e31607a4e0 custom link colors
Former-commit-id: 9aa8f8114494d8b8fd8f010fa5066142fd104f70
2019-03-22 15:06:01 +01:00
fbsanchez 9ef66a11c4 custom link colors
Former-commit-id: 44a7df6e814679cfff1a0489374c25edcc9ab52c
2019-03-22 15:00:02 +01:00
fbsanchez 4910da5e31 minor fix map_filter builder
Former-commit-id: 0ef6bcaa84163f21fe0d6bcd869a7b8646581893
2019-03-22 14:57:29 +01:00
fbsanchez a4c048dd29 minor fix
Former-commit-id: 1ccd9e446645362fb9b305a699527c5aa2c20369
2019-03-22 14:43:55 +01:00
fbsanchez bc1195e78e minor fix
Former-commit-id: b100cf9398a52a443f934632794da991ea4f2342
2019-03-22 14:30:50 +01:00
fbsanchez 3d71d17440 minor fix
Former-commit-id: 3d00cc3810df66e79ac69a71ee48df1c9c6b326e
2019-03-22 14:27:53 +01:00
fbsanchez 64c4514ace minor fix orphans while no pandora node
Former-commit-id: 067f83b5cd8fc87922c61622873b60753edebf2d
2019-03-22 13:16:26 +01:00
fbsanchez 80ecb58f8f minor fix orphans while no pandora node
Former-commit-id: a9f053624ba5c38a08c3589689d4a56cfcfcff37
2019-03-22 13:04:53 +01:00
fbsanchez 0d301cd8ed minor fix orphans while no pandora node
Former-commit-id: 5c21ffec17ba10d77921961c6c813b116449d3a0
2019-03-22 13:02:57 +01:00
fbsanchez 4947d2117a minor fixes networkmapclass
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
2019-03-22 03:56:31 +01:00
fbsanchez 6990951dc7 Fix in group map calculation
Former-commit-id: 1d77a55b629553ac89cb0ae33d1d1f1ad76c3de3
2019-03-21 21:34:56 +01:00
fbsanchez 26d231e78c Improved user experience networkmaps
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
fbsanchez 95d2259236 Improvements. networkmap class
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
2019-03-21 16:16:53 +01:00
fbsanchez 05c03d2d46 NetworkMap class
Former-commit-id: 1c5d4f55853928052482f42aca2900d8964929ad
2019-03-20 17:22:06 +01:00
fbsanchez 9aecc6b85b NetworkClass RC1
Former-commit-id: 8b77646d618d157f0804b11cb7193a7f25bda97b
2019-03-20 13:10:20 +01:00
fbsanchez 1b99c5db49 WIP netclass editor
Former-commit-id: 2c7dffb63e4f9c587c3cdcbf8f87f134a82c1299
2019-03-19 20:43:08 +01:00
fbsanchez 97b53db82b wip relationships
Former-commit-id: 7f582f8c0197f488438226120eaea4c4dcc1646e
2019-03-18 18:11:54 +01:00
fbsanchez 1ddeda295c WIP networkmap class
Former-commit-id: fbd4ed5e5784c510bc1ea66f1627e61fa176573c
2019-03-17 01:39:56 +01:00
fbsanchez fe045962e7 wip generate_dot
Former-commit-id: f41d5a55ec9cd8f27124d6697e92c5fb3009a2d2
2019-03-15 20:44:57 +01:00
Daniel Barbero 0593e72f3e move custom net scan and script to OPEN
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
2019-03-15 09:11:18 +01:00
fbsanchez 8c8f368993 WIP: NetworkMaps rebuild
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
2019-03-14 18:51:48 +01:00
fbsanchez 95c61024f7 Cleanup Networkmaps
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
2019-03-13 11:38:03 +01:00
fbsanchez e61d409acc fix in redirection after map creation
Former-commit-id: dbe1a326942df79f77d8973e8a83781778fa59b0
2019-03-12 19:23:40 +01:00
fbsanchez 663c1e0841 NetworkMap class rc1
Former-commit-id: 871da4e80cd5909f6bb1da567e3fbe55709690a5
2019-03-12 18:32:55 +01:00
fbsanchez 1bc326c00c WIP: NetworkMap class
Former-commit-id: 888621c19262397298ac934e26e55a0b0ab218ec
2019-03-12 18:17:18 +01:00
fbsanchez 06f8aae91a WIP NetworkMap class
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
2019-03-12 16:22:28 +01:00
fbsanchez d7983bec4e WIP NetworkMap class
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
fbsanchez e5190a91ee WIP NetworkMap class
Former-commit-id: 90763db5291c638e89216da48e1fc4fdba92bc82
2019-03-12 10:29:35 +01:00
fbsanchez 0ad8a0383f WIP NetworkMap class
Former-commit-id: f2594c8388e4cb235e39f08945ad064e999cfbcb
2019-03-12 10:29:19 +01:00
fbsanchez 1d660d259f WIP NetworkMap class
Former-commit-id: 6694ee84fe5e9dc783010a3092753b4041370993
2019-03-11 20:10:08 +01:00
fbsanchez e672456998 fixes satellite contact interval detector
Former-commit-id: b3536e29fd7ae1330667eee7bf98a55ef3f65e4b
2019-03-11 18:04:23 +01:00
Daniel Maya ccb41f1b68 Fixed z_dash(zoom) in networkmap
Former-commit-id: 2d19cd9234717cd5066d2ddd7094d367262ed1c4
2019-03-11 16:57:54 +01:00
fbsanchez 2188caaec2 WIP NetworkMap class
Former-commit-id: 5af817aef635798f1ebdfcf596f30939b327e2a7
2019-03-11 15:37:08 +01:00
fbsanchez c8bad2b68a WIP NetworkMap class
Former-commit-id: e6918056fa9d71d33cc3b06e3c265dc3856e45af
2019-03-11 15:10:22 +01:00
fbsanchez fcab1ae612 WIP NetworkMap class
Former-commit-id: da5ce8681313cdf5c5a7ec7a005c3ebd273fea43
2019-03-11 15:09:31 +01:00
fbsanchez 3e39e727b6 WIP: Unified class NetworkMapClass
Former-commit-id: 6e6f4afb70be008602f51dfbd383bb855613e084
2019-03-07 18:57:48 +01:00
fbsanchez 97e6c7c77d minor fix notif. satellite crashed
Former-commit-id: 829dc9d8ab224698bfb33582917ca8008ba7b255
2019-03-07 11:57:31 +01:00
fbsanchez aef10cf649 Fixed grown in notifications
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
2019-03-06 19:39:07 +01:00
fbsanchez a860b293e3 minor fixes in url and descriptions (discovery)
Former-commit-id: a53542c61164a41cd4c2befea73191e9f74e5800
2019-03-06 18:28:00 +01:00
alejandro-campos 0548fdd95f Change english strings
Former-commit-id: 47d1b455f4997ce7b63672678aaeb42a8205e957
2019-03-05 16:48:27 +01:00
fbsanchez d89e3993e7 WIP first tasks
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
2019-03-04 20:02:35 +01:00
fbsanchez 756fdd2cd4 minor fix in supervisor - server status global counter
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
2019-03-04 16:43:48 +01:00
fbsanchez 5e496d0d7a Fixed url target in Supervisor
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
2019-03-04 14:52:57 +01:00
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
Alejandro Fraguas 441fb979e1 Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
Ent 3210 nueva vista de servicios

See merge request artica/pandorafms!2195

Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
alejandro-campos 7791639b35 fix bad image routes
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
2019-02-26 13:31:35 +01:00
alejandro-campos db5d2ceee1 fix bad routes in services treeview
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
2019-02-25 17:04:07 +01:00
fbsanchez 4289684e00 Cloud Discovery RC1
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
2019-02-23 00:01:59 +01:00
fbsanchez 8b5f50f883 Discovery minor fixes
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
fbsanchez 4abf19722b Minor fixes and improvements. Discovery
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
2019-02-22 18:12:01 +01:00
alejandro-campos faae9c58b3 implement services tree view
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
fbsanchez 1feebae564 removed fullurl supervisor
Former-commit-id: 74cc731977477c444150d49aff9ab062ddac065a
2019-02-22 13:33:46 +01:00
alejandro-campos eb56fd566c implemented services treeview
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
fbsanchez e32c4025a4 Supervisor. minor fixes
Former-commit-id: 036bc6a871db86d7a8925c7d5e2531d9f62ca839
2019-02-21 14:18:33 +01:00
fbsanchez fd77b94f96 Fix regexp Supervisor
Former-commit-id: 7dc32dd119ae78a3158e7c5d20bc5f73a8c94d2f
2019-02-21 14:16:17 +01:00
fbsanchez 69abba260a Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: eec0a9614d1dee466d5adb59c9f39d2599360e27
2019-02-19 20:27:34 +01:00
fbsanchez fa3f548cdd Several changes for Wiz.App support
Former-commit-id: 7c86d2e601771686a69d3f1b846638a427a25d6e
2019-02-19 20:27:05 +01:00
fbsanchez 1b82a970b1 WIP: App wiz
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
2019-02-19 14:36:16 +01:00
fbsanchez 85371424ee Minor fixes and status check
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
2019-02-19 11:13:07 +01:00
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
fbsanchez 42dc0c60be supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
fbsanchez e90d4b7256 Supervisor added blacklist to avoid mail twice
Former-commit-id: e2f03306076d90f9abe312694ea1fa2298ee7c62
2019-02-07 18:29:20 +01:00
fbsanchez 42b0afb884 Supervisor minor fixes
Former-commit-id: 84171e197df0a016a9a4b7d0e49f0412b65ee864
2019-02-07 18:07:52 +01:00
fbsanchez 681ad67028 ConsoleSuperviso - mailing support and minor fixes
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
2019-02-07 18:00:51 +01:00
fbsanchez dc9decde42 ConsoleSupervisor
Former-commit-id: 3c40e628883f032a449862d0161659586819e6df
2019-02-07 16:24:49 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
fermin831 2d2c465ff6 Removed unwanted traces 2018-10-17 15:43:26 +02:00
fermin831 0ca34c744d Fixed tags filter on Tree tags 2018-10-16 13:29:00 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
fermin831 8d5953ce50 Removed unused code 2018-10-02 15:01:40 +02:00
fermin831 2d057f9ae9 Fixed tags problems with secondary groups in tree view 2018-10-02 13:35:48 +02:00
vgilc f73b4a55e6 Merge branch '2741-Refactorizar_vista_module_groups' into 'develop'
refactoriced view module_groups

See merge request artica/pandorafms!1788
2018-10-01 10:59:09 +02:00
fermin831 81e15c4dc9 Fixed tags on Tree view 2018-09-28 09:37:16 +02:00
fermin831 da3061651b Fixed search agentes and modules in others tree views 2018-09-21 13:01:40 +02:00
fermin831 df660091ae Fixed search group in others tree views 2018-09-21 11:48:23 +02:00
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
daniel 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
fermin831 9c032f4dfe [Secondary groups] Fixed group report 2018-09-11 13:22:51 +02:00
daniel 022adeb24d fixed metaconsole tree view popup modules 2018-09-10 15:35:11 +02:00
daniel 729fe74758 fixed minor error tree view acl 2018-09-10 12:08:38 +02:00
daniel ac0f0536c7 performance improve view groups 2018-09-07 14:19:01 +02:00
daniel f3a2bda1a5 remove group cache in tree view 2018-09-05 18:31:13 +02:00
daniel 4781809e14 fixed minor error not init agent in tree view node 2018-09-05 18:28:31 +02:00
daniel 82c4adc5c7 convert spaces to tab 2018-09-05 14:01:32 +02:00
daniel 7554906e59 minor refactorization tree view 2018-09-05 13:48:53 +02:00
daniel 51f71d1a07 fixed metaconsole tree view 2018-09-05 11:23:53 +02:00
daniel 2829ddd8dd clean main tree class code 2018-09-05 09:54:28 +02:00
daniel 718401467d put tree view in separate files 2018-09-04 11:51:36 +02:00
daniel 41761bc525 fixed tree view tags 2018-08-31 13:33:22 +02:00
daniel 3334138cb4 fixed tree view SO 2018-08-31 10:51:17 +02:00
daniel fb7def14af fixed tree view counter second level and module group view 2018-08-31 09:09:54 +02:00
daniel 6a124487a4 fixed module tree view 2018-08-30 12:23:35 +02:00
daniel b346e4dca9 refactorized group tree view 2018-08-29 13:55:50 +02:00
daniel 90d686a7ab fixed error in acl groups tree view 2018-08-29 09:16:07 +02:00
daniel 59e405c2b3 disabled modules search in tree view 2018-08-28 15:24:35 +02:00