Commit Graph

654 Commits

Author SHA1 Message Date
marcos a0607e7230 fixed visual error 2021-03-18 10:03:52 +01:00
marcos b6a7598c33 fixed visual error 2021-03-18 09:53:39 +01:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
marcos 4c5f220264 fixed visual error 2021-03-15 17:55:54 +01:00
fbsanchez b48af30d96 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/create_container.php
	pandora_console/godmode/reporting/graph_builder.main.php
	pandora_console/godmode/reporting/reporting_builder.main.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/include/javascript/pandora_ui.js
	pandora_console/views/dashboard/formDashboard.php
2021-03-11 17:47:27 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop'
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
2021-03-01 12:14:54 +00:00
Jose Gonzalez dac99fa4c6 Added more clear message 2021-02-19 12:29:48 +01:00
fbsanchez ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
fbsanchez 8049aabf5b select2 on select items 2021-02-16 13:35:04 +01:00
fbsanchez 2639533cc1 Fixes 2021-02-09 12:05:59 +01:00
fbsanchez 679ada717e filter with preload - filtering improved 2021-02-05 15:10:31 +01:00
fbsanchez 7bb68abbad Wizard RC1 with filtering and improved comm 2021-02-04 18:19:35 +01:00
Daniel Maya 6a9587bff8 #4536 autocomplete = off by default 2021-02-01 13:54:57 +01:00
alejandro-campos 983d58260d changes in dashboard permissions 2021-01-21 14:42:43 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
fbsanchez 9fa16decfa Force language message validation (groups) 2021-01-11 13:53:52 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Daniel Maya 244c4d56d6 Fixed unit 2020-12-04 12:32:38 +01:00
fbsanchez 34374159de gcp reviewed 2020-12-03 18:00:20 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
Daniel Rodriguez 1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop'
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
2020-12-01 12:11:33 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales
Merge with last updates
2020-11-23 10:08:16 +01:00
Jose Gonzalez 22ae632850 Added html_print_anchor function for link tags 2020-11-06 12:38:06 +01:00
Jose Gonzalez 938860dff2 Added wrapper attributes 2020-11-03 17:15:01 +01:00
Daniel Maya bde52df2e8 Added datalist for target ip 2020-10-30 13:25:33 +01:00
Daniel Rodriguez 4ed68fee56 Merge branch 'ent-6477-error-en-la-seleccion-de-grupos-de-dashboards' into 'develop'
Minor fix all group empty label

See merge request artica/pandorafms!3542
2020-10-29 12:20:35 +01:00
fbsanchez f744261821 minor fix 2020-10-27 16:03:35 +01:00
fbsanchez 5842235846 Orphan service modules + control require argument select from sql 2020-10-26 13:37:05 +01:00
fbsanchez 3220217ec8 exclude branch from select_for_Groups given group_id 2020-10-21 18:31:10 +02:00
fbsanchez 25295f7b0b fixes 2020-10-20 18:06:05 +02:00
fbsanchez 033dd531a8 Minor fix all group empty label 2020-10-20 17:47:35 +02:00
fbsanchez a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
fbsanchez 07ed5ac9d8 minor fix AJAX group selector in MC 2020-10-02 14:00:04 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
fbsanchez d73c215b91 Avoid create agent if no group is selected 2020-09-29 15:48:20 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez 12314d33c3 fixed direct html responses with sl2 2020-09-28 16:02:54 +02:00
fbsanchez d4e837b7e6 Group all management, "all" selected instead "none" if included 2020-09-28 15:47:38 +02:00
fbsanchez 9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
fbsanchez c2238ac295 minor changes 2020-09-11 15:30:18 +02:00
fbsanchez 426286b8b5 fixed pagination (started by 1 instead 0, select2 requirement) 2020-09-11 14:53:29 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
fbsanchez 9d3a209fc8 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-07 09:26:47 +02:00
Luis Calvo 158cbc74e2 Fixed result div for string modules bug 2020-07-23 17:28:44 +02:00
Daniel Rodriguez f2f8debab6 Merge branch 'ent-5969-fallo-visual-en-reports-vista-html' into 'develop'
fixed error

See merge request artica/pandorafms!3308
2020-07-17 10:34:28 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
marcos e221175bf4 updated changes 2020-07-16 15:57:28 +02:00
fbsanchez 45062874ce minor fix disabled textareas 2020-07-13 14:06:52 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
fbsanchez 98dc5f1796 minor fix range input 2020-07-07 11:54:55 +02:00
fbsanchez 352da65640 WIP Smart services 2020-07-03 17:52:44 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
Luis 5bc968aefe Ent 5850 error reports historical serialize command snapshots 2020-06-25 15:17:24 +02:00
fbsanchez 45a161426b Services review 2020-06-24 18:01:34 +02:00
fbsanchez 94a7b625fb Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
Conflicts:
	pandora_console/extras/mr/39.sql
2020-06-22 14:06:13 +02:00
fbsanchez 166978f3aa Merge remote-tracking branch 'origin/develop' into ent-5759-intervalo-de-oracle-discovery-sale-mal 2020-06-22 12:25:04 +02:00
marcos 65789ff431 fixed error 2020-06-15 16:57:19 +02:00
Daniel Rodriguez dab1a8b5cb Merge branch 'ent-5788-Bug-en-item-percentil-de-las-consolas-visuales' into 'develop'
Fixed input type number size in Firefox

See merge request artica/pandorafms!3221
2020-06-11 12:01:33 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
fbsanchez e8a3cb698d Time selector adjustment 2020-05-26 11:26:49 +02:00
fbsanchez 7bc9a96524 Minor fixes 2020-05-25 18:18:38 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
Daniel Barbero Martin 3857d04df1 Fixed input type number size in Firefox 2020-05-20 10:54:07 +02:00
Tatiana Llorente b99298786e Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario 2020-05-19 08:20:04 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
Daniel Maya ccb3b8ab7a Fixed Advanced permissions AD 2020-04-20 15:19:28 +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
Jose Gonzalez d19a667ce9 Added form attribute for inputs 2020-04-13 15:41:00 +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 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
fbsanchez 2d4b977d26 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:05:18 +02:00
Jose Gonzalez 172bbed817 Added onKeyDown feature for text inputs 2020-04-02 12:53:21 +02:00
alejandro-campos 60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
fbsanchez cf6dddd933 minor fix 2020-03-26 17:05:19 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Daniel Barbero Martin c96dd8e930 Fix selector modules only string in VC barsgraph and donutgraph 2020-02-13 09:55:49 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin cd3691ecc3 fixed errors VC 2020-01-23 17:52:59 +01:00
Daniel Barbero 69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +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
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
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
Daniel Barbero ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Daniel Rodriguez b1b6306c30 Merge branch 'ent-4975-Añadir-todas-las-horas-al-formulario-del-cron-from-y-cron-to' into 'develop'
fixed module cron minute selectors

See merge request artica/pandorafms!2892
2020-01-13 18:20:57 +01:00
Daniel Barbero a933a091ea styles fixed 2020-01-09 12:07:19 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
vgilc 44ec25bf0a Merge branch 'ent-4636-Eliminar-hint-de-la-vista-Monitors-View' into 'develop'
Remove hint in metaconsole monitoring view

See merge request artica/pandorafms!2723
2020-01-07 10:44:53 +01:00
Daniel Rodriguez 53ed9a52f4 Merge branch 'ent-4974-Error-de-formulario-en-el-Cron-form-y-Cron-to-de-las-opciones-de-modulo' into 'develop'
change days select in module cron

See merge request artica/pandorafms!2887
2020-01-07 09:30:53 +01:00
Daniel Barbero 14984faaaa Fixed errors Form VC 2019-12-19 20:42:29 +01:00
Daniel Barbero 9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
Daniel Barbero 2a92c9d38d Fixed errors VC forms 2019-12-17 10:57:19 +01:00
alejandro-campos 5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
fbsanchez 4e2bd7ed55 minor fixes 2019-11-22 20:49:46 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 5195d6a754 Allow single quotes hidden_extended 2019-11-21 12:42:06 +01:00
alejandro-campos a064f47ef3 fix module cron values 2019-11-20 17:20:17 +01:00
alejandro-campos a0f767ccc7 fixed module cron minute selectors 2019-11-18 15:28:34 +01:00
alejandro-campos a238594354 change days select in module cron 2019-11-14 12:48:55 +01:00
Alejandro Fraguas 0199c6312a Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop'
refactoriced diagnostics pandoraFMS

See merge request artica/pandorafms!2809
2019-11-14 11:49:23 +01:00
Daniel Barbero Martin 9d3c9febad Add alert correlation wizard 2019-11-12 13:16:25 +01:00
fbsanchez a8bdb68cac Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 19:40:23 +01:00
fbsanchez 4905b18888 Fulfill help path and mail check 2019-11-07 19:39:50 +01:00
fbsanchez c4779f6f91 Merge branch 'ent-4766-feedback-de-ayudas' into ent-EDF 2019-11-07 18:33:51 +01:00
fbsanchez 763ec6772c Help feedback style improved 2019-11-07 17:26:32 +01:00
Daniel Barbero Martin ebb7cbfe6c Fix styles css 2019-11-05 15:12:24 +01:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
Daniel Barbero Martin f06a55c6bb continue feedback mail 2019-10-23 19:50:57 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
alejandro-campos a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +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
Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
Tatiana Llorente eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
alejandro-campos f2a6dbb60e Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria 2019-09-17 14:56:54 +02:00
alejandro-campos 87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
manuel b12facc89b Remove hint in metaconsole monitoring view 2019-09-12 12:25:31 +02:00
fbsanchez ebcce5cad4 Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-12 11:17:44 +02:00
Daniel Maya 86cf025317 Fixed some errors in visual console 2019-09-05 11:58:15 +02:00
fbsanchez 291dece854 obhd encapsulated debug print 2019-09-03 12:40:16 +02:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
fbsanchez 17dc0b82ac Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-17 17:19:58 +02:00
fbsanchez 47cc0d9d6e WIP: Agent deployment center 2019-07-10 23:59:09 +02:00
fbsanchez eb01e9baaf public_url with force option 2019-07-02 14:17:53 +02:00
fbsanchez 5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
Tatiana Llorente 4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
fbsanchez 974db824a8 style review 2019-06-03 19:13:29 +02:00
Alejandro Fraguas 4c85066ecd Merge branch 'ent-3670-0-rebelde-en-autoconfigurador-de-agentes' into 'develop'
Resolved

See merge request artica/pandorafms!2245
2019-05-31 10:08:02 +02:00
fbsanchez f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
marcos.alconada e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
2019-04-24 16:20:42 +02:00
Daniel Rodriguez 50e994e065 Merge branch 'ent-bug-conflicto-con-simple-selects-con-atributo-size' into 'develop'
change way to print discovery simple multiple inputs

See merge request artica/pandorafms!2378

Former-commit-id: a4de7318635a68d1c9c1343b3674a93581d5ce23
2019-04-24 13:55:02 +02:00
alejandro-campos 7433d52130 change way to print discovery simple multiple inputs
Former-commit-id: 845171053b2002d036f0f8992a2aacad4ec0a561
2019-04-24 12:32:33 +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 4f6a81dc5b visual changes to discovery
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
Daniel Barbero Martin 3e4a7bfdbf fixed error autocomplete input module
Former-commit-id: c9fca2ba51b3b0872d39e658f18c5d3c5e917dbd
2019-04-09 09:51:03 +02:00
fermin831 a2f5b8502a Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/include/styles/pandora.css

Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
Tatiana Llorente a99c8b1a7b New view user edit
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
Fermin bf5dfd8bdb Extend class to pencil image in html interval component
Former-commit-id: baf46a4b64f58e300b092a8ee71c438931e2d840
2019-03-15 10:52:46 +01:00
Fermin e9061d74b6 Added ordering header element
Former-commit-id: 11ffbe8c00a8ea9d881321be7c7541eaf0babe92
2019-03-08 11:46:47 +01:00
fermin831 1f89cccbbe Change item link filter by image filter in network/flow explorer
Former-commit-id: 521cca18646273361711e75ad85f64a9b9988046
2019-03-07 15:10:38 +01:00
marcos.alconada 39974a1780 Arreglado
Former-commit-id: a77d86dac7913a7f0f7bf7173eb67eb8609920ed
2019-03-07 12:37:50 +01:00
marcos.alconada f26593dc21 Success
Former-commit-id: 7920fc0927ddab510b2a9869a09fd7e0cf166182
2019-03-07 12:34:09 +01:00
Fermin a01319464e Added link with params html component and modify the network report
Former-commit-id: d95cfe164d67e70d5135feb68169bb825ee2d83a
2019-03-05 10:08:07 +01:00
manuel c886dd1dfa Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php


Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
manuel 875d7ecaba Unified sizes of the checkbox switch
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
daniel d9e0f2ea42 Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
2019-02-21 13:26:12 +01:00
daniel dc4d5b1bd7 fixed error in widget
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
2019-02-21 13:21:05 +01:00
fbsanchez 7df9d4f78b WIP: H&D merge
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
2019-02-14 17:14:01 +01:00
Daniel Barbero 444b5c4bfd Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
Conflicts:
	pandora_console/install.php


Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
2019-02-14 07:51:53 +01:00
Daniel Barbero 93edda07ee fixed errors
Former-commit-id: 167c9a725e5dbd4f4ae1db0b6fb6c573a364c122
2019-02-13 07:55:21 +01:00
fbsanchez 166c3bbe88 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
fbsanchez 42dc0c60be supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
daniel 16c742bd83 fixed report pdf
Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
2019-02-08 14:10:19 +01:00
fermin831 6dbeaf6307 Added more attributes to swith HTML element
Former-commit-id: aa567ef6f16e1e89489b16f808b00e772866ef86
2019-02-07 12:20:34 +01:00
fermin831 37d02ddf59 Added disabled status to switches
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
manuel.montes dee7c769f2 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/godmode/setup/setup_auth.php
	pandora_console/godmode/setup/setup_ehorus.php
	pandora_console/godmode/setup/setup_general.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/styles/pandora.css

	modificado:     pandora_console/include/functions_html.php


Former-commit-id: feaf2f5d3defda182f9cdaf151854257aeba1b22
2019-02-06 16:11:46 +01:00
fermin831 b589826c86 Added HTML switch element
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
daniel 7d4fc056ca fixed errors Qa
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
2019-01-25 11:18:15 +01:00
manuel.montes fd2dcb3281 Changed radio buttons by toogle switch checkbox
Former-commit-id: d4b46db05fa38e268e0c6f82979bca52fec36e78
2019-01-17 17:28:23 +01:00
daniel 4e6cf0182a fixed error create modules network
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
Samuel Carcases f14acf12d2 Merge branch '1931_Cambiar_el_cuerpo_del_email_al_enviar_reportes' into 'develop'
Be able to change the subject and body of the report message when necessary

See merge request artica/pandorafms!1925

Former-commit-id: 18ef1606525fd0cf1ecd692fd156e3fd72f7ca43
2019-01-10 14:49:18 +01:00
vgilc 33f014695d Merge branch '3057-Agregar-token-barras-desplazamiento-en-vista-datos-de-modulo' into 'develop'
Fixed overflow in module data view

See merge request artica/pandorafms!1967

Former-commit-id: bfcf0c9c08953e1fa49e8731db808bc78ecc826b
2018-12-21 10:23:29 +01:00
Alejandro Gallardo Escobar 9ca56c40ea Added a new color input and a debug function
Former-commit-id: 657724102e35c49465119d2ef75e3363d4d0d878
2018-12-10 09:20:06 +01:00
manuel.montes dd7e623782 Fixed overflow in module data view 2018-11-13 17:04:14 +01:00
samucarc 0f3717a268 Be able to change the subject and body of the report message when necessary 2018-11-02 12:57:52 +01:00
daniel 34bb73ac4b add new params html_debug for strig in one line and new alias hd 2018-09-20 16:00:08 +02:00
fermin831 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
fermin831 d3c3304976 Fixed pagination and added filter to All events 2018-08-14 10:40:56 +02:00
fermin831 a5ff91185b Fixed text format in html historic data 2018-08-13 12:41:09 +02:00
daniel 590373ab93 fixed minor error post process create agent 2018-07-31 15:25:44 +02:00
Alejandro Gallardo Escobar 01997ff479 Added a select component to choose a timezone 2018-04-30 15:34:18 +02:00
danielmaya 6799f5f504 Added massive edit policy modules 2018-04-12 15:42:39 +02:00
fermin831 f653fb0f26 Fixed month order on cron 2018-01-10 18:31:13 +01:00
daniel fd66f84d0b fixed minor errors 2017-12-19 09:57:52 +01:00
Daniel Maya 076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
Daniel Maya f67a4d90ae Dynamic unit in massive edit modules 2017-09-25 14:51:45 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
# Conflicts:
#   pandora_console/extras/mr/4.sql
2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Daniel Maya 57f6ad097a update 2017-07-11 10:10:48 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
2017-05-23 09:50:22 +02:00
Arturo Gonzalez 727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
Arturo Gonzalez 8531e9847b Added lost id to dynamic threshold select 2017-04-18 17:46:50 +02:00
daniel 07e5274d0d fixed error in login page errors and change icon pdf report 2017-03-22 15:26:54 +01:00
fermin831 9354e845f7 Changed some icons 2017-02-28 19:17:38 +01:00
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Arturo Gonzalez 2cfce8979e Added new funtion to module cron interval with "from" and "to" forms. Ticket #246 2017-02-13 11:32:04 +01:00
enriquecd 5d7d655833 Fix sound console for snmp traps alert, multiple selection and fix icons - #38 2017-02-02 17:46:59 +01:00
Arturo Gonzalez f9d6bbf323 UX console in progress... (ux console v3.0) 2017-01-20 12:20:00 +01:00
Arturo Gonzalez defdd619ba Added new field to input text. (Transactional maps develop) 2016-11-22 14:16:56 +01:00
m-lopez-f 904ab2ba52 Fixed problems with post process select in updated module form. Ticket: #4182
(cherry picked from commit 789fde7eb1)
2016-11-14 10:56:43 +01:00
enriquecd 21ddb758ba Fix Dark background and comments for Enterprise popup community version - #65 2016-10-28 18:11:53 +02:00
daniel bc5f00a2e7 fixed ticket 4123 and 4124 2016-10-24 17:43:54 +02:00
Arturo Gonzalez 6c185386ac Data precision... (Added integer controll between 0 and 5) 2016-10-18 11:25:36 +02:00
Arturo Gonzalez 13a19c42c2 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:30 +02:00
Arturo Gonzalez 3e50676e19 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:00 +02:00
daniel d5d1727fe7 add new field for modules 2016-10-14 10:16:21 +02:00
Arturo Gonzalez e3a6fada7f New networkmaps in progress... (To much changes in the maps form and more minor things) 2016-10-03 16:09:07 +02:00
enriquecd 78f5d79638 fix visual errors 2016-09-29 15:02:12 +02:00
enriquecd e5c82954f3 repair visual bugs
(cherry picked from commit 7928125092)
2016-09-28 18:20:42 +02:00
enriquecd a051243b64 GUI improvement, add enterprise edition popup - ticket gitlab 49/68 2016-09-19 16:20:18 +02:00
Hirofumi Kosaka 4efc510e6c Fixed a bug that custom "interval values" had not been used as default
module interval (you can add custom ones at 'visual styles' configuration).
2016-03-22 13:26:52 +09:00
fermin831 55140d06dd Fixed cron updating problem TICKETS #3329
In addition, linux agent send crontab token and in data modules, cron
information is displayed grayed
2016-02-05 09:56:37 +01:00
mdtrooper ab46cde699 Cleaned source code. 2016-01-27 13:15:23 +01:00
m-lopez-f bea8170120 Fixed problems with function and pass variables. Tiquet: #2856 2015-10-06 15:37:16 +02:00
Arturo Gonzalez Diaz c411c026fa Fixed external link images in meta. Ticket#2827 2015-10-05 16:45:49 +02:00
m-lopez-f 7d6f03c3c8 Fixed problems with save event filters and dont save agent and module. Tiquet: #2794 2015-09-30 09:26:19 +02:00
Arturo Gonzalez Diaz 3c1c05e493 Fixed broke images in module graphs. Ticket #2684 2015-09-09 12:20:05 +02:00
Arturo Gonzalez Diaz db608b3fb9 Fixed broke images in module graphs. Ticket #2684 2015-09-09 12:17:40 +02:00
Arturo Gonzalez Diaz 52dc70143e Fixed broken image in module graph (meta). Ticket #2574 2015-08-17 13:45:24 +02:00
mdtrooper 1b766d9e3e Fixed PHP warnings. 2015-07-21 12:02:33 +02:00
Alejandro Gallardo Escobar b0f894437e Minor fix 2015-07-14 10:20:04 +02:00
Alejandro Gallardo Escobar 4f2c35ac63 Added the 'required' attribute to the input text and input text password through a function parameter 2015-07-13 12:45:35 +02:00
mdtrooper df9b99ce16 Fixed the empty table in the html_print_table function.
(cherry picked from commit be65df793b)
2015-06-22 17:36:28 +02:00
m-lopez-f 2c286b4f59 Fixed problems with titles in images and links
(cherry picked from commit b8b4c2d440)
2015-06-19 14:46:02 +02:00
mdtrooper 37a7cf6cf2 Some fixes in the code. 2015-06-11 20:17:54 +02:00
m-lopez-f e29497c394 Changed style of Nodo 2015-04-10 09:43:44 +02:00
Vanessa Gil 041e9c00bc Fixed bug #1913. 2015-03-10 17:09:31 +01:00
Alejandro Gallardo Escobar d04d44c518 Added an alias to the "html_debug_print" function 2015-03-09 20:20:37 +01:00
m-lopez-f 29a58006db Fixed php include error 2015-03-05 10:55:17 +01:00
mdtrooper 0952b96b49 Added the option 'last value' for the items 'general' and 'exception' in reports. TICKET: #1819 2015-02-23 13:43:26 +01:00
mdtrooper 2842970c83 Added feature of custom post process values. TICKET: #1743 2015-02-09 19:35:03 +01:00
Alejandro Gallardo Escobar 265dda2a3f Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_groups.php
2015-01-19 11:47:55 +01:00
Vanessa Gil 3698e887c3 Added Stric ACL mode. 2015-01-15 18:08:58 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs"
This reverts commit 3d251fd035.
2015-01-15 15:11:26 +01:00
Alejandro Gallardo Escobar e1b34840b1 Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/functions_groups.php
2015-01-09 11:41:07 +01:00
Vanessa Gil 3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +01:00
Alejandro Gallardo Escobar 7aa4851c5b Changed the 'forced_title' feature of the function "html_print_image" 2015-01-08 13:16:57 +01:00
mdtrooper 704b3932a4 Working in the massive action for the tags in policies. Ticket: #1576 2014-12-09 15:57:35 +01:00
Alejandro Gallardo Escobar eeb9725334 Merge branch 'feature/ticket#1243-PlannedDowntime' into develop 2014-09-22 11:48:22 +02:00