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

1360 Commits

Author SHA1 Message Date
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 Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop' 
discovery.cloud.gcp

See merge request artica/pandorafms!3479
 2020-12-09 13:54:25 +01:00
fbsanchez 34374159de gcp reviewed 2020-12-03 18:00:20 +01:00
Daniel Rodriguez 9aaae58cc7 Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop' 
Added QueryResult ui type

See merge request artica/pandorafms!3517
 2020-12-03 14:43:44 +01:00
Daniel Rodriguez e8071f18b1 Merge branch 'ent-6795-clase-invisible-no-importa-tanto' into 'develop' 
Fixed

Closes pandora_enterprise#6795

See merge request artica/pandorafms!3678
 2020-12-03 12:29:22 +01:00
alejandro-campos 8aa18a1236 active user password check 2020-12-02 16:29:45 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Marcos Alconada 909645b4ab fixed visual error alert correlated alerts 2020-12-02 10:15:33 +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
Jose Gonzalez 82202fe620 Fixed 2020-12-01 12:39:37 +01:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Daniel Rodriguez 3801fffa6e Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop' 
F2 feature

See merge request artica/pandorafms!3493
 2020-11-30 14:28:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
marcos 1ce48c812f updated 2fa all user 2020-11-26 18:11:30 +01:00
Daniel Barbero Martin 9c99058f30 fix custom graph 2020-11-25 17:29:09 +01:00
Jose Gonzalez 60ca2109f3 Solved issue with full screen 2020-11-25 11:59:03 +01:00
Jose Gonzalez 7984d9fcab Fix visual issue 2020-11-25 11:44:12 +01:00
Jose Gonzalez 912b2179bd Fix visual issues 2020-11-25 11:36:14 +01:00
Jose Gonzalez ed1b8f9713 Fix some bugs and added surround input feature 2020-11-24 15:51:02 +01:00
Daniel Barbero Martin af6bab49e9 fix visual view pure CV 2020-11-24 12:04:25 +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
Daniel Barbero Martin 1ad1671612 fix remove acl widget agent/module 2020-11-23 09:29:11 +01:00
fbsanchez 4e73d8045a Minor fixes 2020-11-17 11:07:59 +01:00
Jose Gonzalez b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
fbsanchez b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
fbsanchez d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
Daniel Rodriguez 79db1c3236 Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop' 
removed strict-user from monitor detail

See merge request artica/pandorafms!3568
 2020-10-30 13:28:35 +01:00
Daniel Rodriguez 64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop' 
fix charts

See merge request artica/pandorafms!3581
 2020-10-30 13:23:03 +01:00
fbsanchez 24ba5f2615 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:13:21 +01:00
fbsanchez fe681ba9d7 minor style added 2020-10-29 12:13:15 +01:00
Daniel Rodriguez 318094d758 Merge branch 'ent-6478-Bug-en-la-vista-HTML-y-PDF-de-los-items-AVG-MAX-MIN-Value-de-informes-y-templates' into 'develop' 
fixed report avg-min-max

See merge request artica/pandorafms!3540
 2020-10-28 15:19:32 +01:00
Daniel Barbero Martin 9b81da193b fix charts 2020-10-28 12:50:15 +01:00
Daniel Barbero Martin 2b2acefa31 Snmp and WMI in recon task move open 2020-10-27 15:02:05 +01:00
Daniel Barbero Martin 685acc6c20 fixed report avg-min-max 2020-10-20 16:00:19 +02:00
Jose Gonzalez dc15125cd8 Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo 
Update
 2020-10-15 12:27:59 +02:00
Daniel Barbero Martin 8a72074a8a fixed sql graph pie 2020-10-09 12:05:57 +02:00
Jose Gonzalez 3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2020-10-02 14:56:07 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez 679d72e5c0 minor fix 2020-10-01 14:05:25 +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 f69166bd53 Updates style width group selector 2020-09-28 18:04:46 +02:00
fbsanchez d152ba2980 estado_agente prevent filter options overlapping 2020-09-28 16:11:26 +02:00
Daniel Rodriguez 04215ba582 Merge branch 'ent-5435-9411-filtro-por-defecto-para-snmp-console' into 'develop' 
default values for date intervals (trap view)

See merge request artica/pandorafms!3469
 2020-09-24 10:57:43 +02:00
fbsanchez 9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
fbsanchez 0e0c529b7e missed css file 2020-09-22 12:01:37 +02:00
Daniel Rodriguez d450213b95 Merge branch 'ent-6322-10688-edicion-usuarios-tecla-intro-borra-perfil' into 'develop' 
Avoid deleting profiles while pressing enter in user details (management)

See merge request artica/pandorafms!3456
 2020-09-18 14:35:32 +02:00
fbsanchez 589d9c1d7c minor fixes 2020-09-14 17:48:38 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
Luis Calvo 8314a25830 Fixed custom login background on Edge and IE 2020-09-01 17:52:36 +02:00
Daniel Rodriguez de271193cc Merge branch 'ent-5963-10190-Mala-representacion-de-graficas-en-pdf-group-report-agent-configuration-y-group-settings' into 'develop' 
Ent 5963 10190 mala representacion de graficas en pdf group report agent configuration y group settings

See merge request artica/pandorafms!3296
 2020-07-20 15:33:53 +02:00
Luis 2dc239afe9 Ent 5443 group report no funcion bien 2020-07-20 13:26:39 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-14 18:10:11 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +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
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
alejandro-campos 3420f054a3 fixed group report and table styles 2020-06-10 14:52:20 +02:00
alejandro-campos 6062efe48d fixed group report and table styles 2020-06-10 14:47:14 +02:00
daniel a59cdec545 Fixed error dashboard draw multiple widget services 2020-06-09 10:37:29 +02:00
Daniel Rodriguez df1fe544a1 Merge branch 'ent-5756-pantallas-de-configuracion-del-cluster' into 'develop' 
Ent 5756 pantallas de configuracion del cluster

See merge request artica/pandorafms!3205
 2020-06-01 09:47:25 +02:00
Daniel Maya a56ee5dac5 Ent 5648 querier avanzado en la vista de log collector 2020-05-29 13:07:53 +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 5ec1f561a8 Supervised changes css 2020-05-22 14:07:51 +02:00
fbsanchez b0e8287c61 Wip cluster view 2020-05-21 19:28:24 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
Daniel Rodriguez 96947d32fc Merge branch 'ent-5807-Bugs-al-eliminar-widget-y-visual-con-nuevos-Dashboards' into 'develop' 
Fixed errors in dashboards

See merge request artica/pandorafms!3207
 2020-05-19 08:23:37 +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 585f0f011e WIP cluster rebuild 2020-05-14 17:49:02 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
Daniel Barbero Martin 24f4f68b33 Fixed errors in dashboards 2020-05-11 14:50:13 +02:00
fbsanchez 3684bf8ea2 Minor changes tree style 2020-05-07 09:36:14 +02:00
fbsanchez bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
fbsanchez 92ff713651 1st approach 2020-05-05 18:58:45 +02:00
daniel c308d49c25 Fix retrocompatibility 2020-04-30 14:08:56 +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
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
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
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
Jose Gonzalez 6f0b1c005f Added invisible class 2020-04-13 15:41:35 +02:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
Jose Gonzalez 805d96108c Changed position of buttons 2020-04-08 16:52:34 +02:00
fbsanchez 47857de79f some css adjustments 2020-04-08 11:48:31 +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
Jose Gonzalez 396c93c8b8 WIP: Refactor and solve visual issues 2020-04-07 17:46:12 +02:00
fbsanchez eb64fd8758 minor fixes 2020-04-06 16:10:37 +02:00
fbsanchez 3f9bdf65df minor fixes and target selection (buttons) 2020-04-06 13:00:09 +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
alejandro-campos 60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
fbsanchez e249233205 minor fixes 2020-04-01 16:43:04 +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 452f5253e2 merge develop 2020-03-26 14:43:57 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
Jose Gonzalez 7bf5764081 Added CSS changes. WIP: Backup upload 2020-03-19 18:24:52 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
fbsanchez 843f4f3f50 Wux style review 2020-03-10 15:39:44 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Daniel Maya e908019d4f Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta 2020-02-12 17:05:29 +01:00
Daniel Barbero Martin 5ff10ac514 fixed errors VC 2020-01-25 11:57:04 +01:00
Daniel Barbero Martin aea073b4d5 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-24 11:41:35 +01:00
Daniel Barbero Martin cd3691ecc3 fixed errors VC 2020-01-23 17:52:59 +01:00
vgilc 2447514c41 Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop' 
Fix visual problems with agent details

See merge request artica/pandorafms!2625
 2020-01-23 10:11:35 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Barbero Martin 4a1801bc50 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 08:04:18 +01:00
Tatiana Llorente 95600412e1 Minor visual changes in alert list 2020-01-14 13:14:09 +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 Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Daniel Barbero Martin 4f6ed7c39f Fix tinyMCE background grey 2020-01-13 10:14:51 +01:00
Daniel Barbero Martin 14e4e37c2a Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-10 08:09:13 +01:00
Daniel Barbero 7e4cb02ceb fixed styles and more 2020-01-09 18:05:21 +01:00
Manuel Montes 5e058df052 Fixed z-index header 2020-01-09 11:52:27 +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
Daniel Rodriguez d16ecc54b6 Merge branch '5148-Tabs-vista-eventos' into 'develop' 
Changed to 2px active tab

Closes pandora_enterprise#5148

See merge request artica/pandorafms!2959
 2020-01-07 11:46:18 +01:00
Daniel Rodriguez 456fbc096e Merge branch 'ent-4572-Bugs-graficos-en-black-theme' into 'develop' 
Fixed visual bugs in black theme - #4572

See merge request artica/pandorafms!2713
 2020-01-07 09:43:45 +01:00
Daniel Barbero Martin 5e008e684d Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-02 17:45:52 +01:00
Jose Gonzalez 6422e34782 Modified General tab in META events 2020-01-02 12:50:35 +01:00
Alejandro Fraguas ebe6e1109c Merge branch 'ent-4467-barra-de-busqueda-como-interprete-de-ordenes' into 'develop' 
Ent 4467 barra de busqueda como interprete de ordenes

See merge request artica/pandorafms!2934
 2019-12-26 11:10:53 +01:00
Alejandro Fraguas 9d318a8612 Merge branch '5144-IE-Edge-Login-Background' into 'develop' 
Added control for MS Edge and Internet Explorer browsers for disallow linear gradient

See merge request artica/pandorafms!2967
 2019-12-23 17:13:42 +01:00
Alejandro Fraguas ecb190910b Merge branch '3812-Pantalla-Instalacion-DB-Demos' into 'develop' 
Added images and CSS file for new demo installation screen

See merge request artica/pandorafms!2965
 2019-12-23 11:27:55 +01:00
Daniel Barbero d4207ef67c Fixed form php VC 2019-12-20 13:58:47 +01:00
Daniel Barbero a6dfdb796a Fixed errors Form VC 2019-12-19 20:47:52 +01:00
marcos 43d08f354a Ajustes CSS 2019-12-19 16:53:45 +01:00
Daniel Barbero 49ab5e95aa Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-18 07:50:08 +01:00
daniel 3e58746cd5 Fixed errors PDF images relative routes 2019-12-17 18:18:00 +01:00
Daniel Barbero d77d50bb74 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-17 08:26:04 +01:00
Luis Calvo b5bc431d7b Changed pdf report header colours(lighter) 2019-12-16 18:19:34 +01:00
Jose Gonzalez d8f232d814 Added control for MS Edge and Internet Explorer browsers for disallow linear gradient 2019-12-16 16:39:13 +01:00
Jose Gonzalez c57ef7e6a0 Added images and CSS file for new demo installation screen 2019-12-16 15:45:27 +01:00
artica b71752ea03 Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop 2019-12-16 11:23:06 +01:00
marcos 480673521c Can select with keyboard list items 2019-12-13 14:08:44 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Jose Gonzalez 6f9d400d03 Changed to 2px active tab 2019-12-13 11:50:59 +01:00
Daniel Barbero 319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
Daniel Barbero 63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-12-12 16:32:32 +01:00
marcos 1f3fc1f908 add more pages in order interpreter 2019-12-12 16:27:11 +01:00
alejandro-campos 7f79a50c33 visual changes in html report headers 2019-12-12 14:55:27 +01:00
Daniel Rodriguez 01db6dd3b2 Merge branch 'ent-5094-selector-fechas-informes-html' into 'develop' 
Added margin to date selector elements in reporting viewer

See merge request artica/pandorafms!2945
 2019-12-12 09:10:35 +01:00
marcos 8ca473b2a7 ajust search input 2019-12-11 18:42:46 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
vgilc 325eff607e Merge branch 'ent-3903-Dashboard-mostrar-leyenda-en-mapa-de-servicio' into 'develop' 
changes in service map widget: always show legend and fix visual problem

See merge request artica/pandorafms!2889
 2019-12-10 11:53:37 +01:00
Luis Calvo a184b50eb2 Added margin to date selector elements in reporting viewer 2019-12-05 18:55:15 +01:00
marcos 1430e6ee11 Update orderinterpreter class and css 2019-12-05 16:10:31 +01:00
marcos 1f97fcef40 update css and preg_match 2019-12-03 18:31:13 +01:00
marcos 7eec91b946 Show result in normal window 2019-12-03 18:19:32 +01:00
marcos d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00
Daniel Barbero 867f0cfbe9 WIP Rules alert correlation 2019-11-25 20:06:42 +01:00
Daniel Barbero f24034e729 Add styles Rules 2019-11-25 09:09:59 +01:00
fbsanchez ae5d7b8944 minor style fix rulebuilder 2019-11-23 13:20:19 +01:00
fbsanchez 9bfe3f3152 minor style fix rulebuilder 2019-11-23 13:16:30 +01:00
fbsanchez d3b5e7a2b0 minor style fix rulebuilder 2019-11-23 13:13:24 +01:00
fbsanchez 2f0b2c1766 minor fix css 2019-11-23 13:06:58 +01:00
fbsanchez 64e481187f RuleBuilder Style updates 2019-11-23 12:48:47 +01:00
fbsanchez 8001ba0d41 minor fix 2019-11-22 15:37:32 +01:00
Daniel Barbero d6ce54cddf fixed errors Alert correlation 2019-11-22 15:26:30 +01:00
Daniel Barbero 4caf84da25 WIP alert correlations 2019-11-22 10:24:12 +01:00
Daniel Barbero 66035a8b67 fixed errors css 2019-11-21 15:27:47 +01:00
Daniel Barbero Martin cd8f52fd92 WIP alert correlations 2019-11-20 09:11:03 +01:00
fbsanchez 443eb1168c Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 2019-11-18 12:48:31 +01:00
fbsanchez 46c42ef8a4 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 16:52:26 +01:00
fbsanchez 84c6640032 minor style fix 2019-11-15 16:51:53 +01:00
fbsanchez 9440570548 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-15 13:08:09 +01:00
fbsanchez e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
fbsanchez 547e0c4364 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-14 20:58:16 +01:00
fbsanchez 546b8dc448 omnishell minor changes 2019-11-14 20:55:55 +01:00
fbsanchez 0d3817d64d dynamic toggle in wizard input printForm 2019-11-14 17:45:45 +01:00
alejandro-campos 994b3a9bff changes in service map widget: always show legend and fix visual problem 2019-11-14 15:21:24 +01:00
Daniel Barbero Martin c17acefc49 Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-14 12:22:11 +01:00
fbsanchez b0920d93af Merge branch 'ent-4772-omnishell' into ent-EDF 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-13 18:15:19 +01:00
fbsanchez 78443a029d Omnishell rc1 2019-11-13 18:10:16 +01:00
fbsanchez 0e2a3d0f47 minor style fix after feedback cleanup 2019-11-13 17:42:14 +01:00
fbsanchez 65d02d4529 Merge remote-tracking branch 'origin/ent-EDF' into ent-4774-welcome-to-pandorafms 2019-11-13 17:40:45 +01:00
fbsanchez 345eb48fd7 save the green lines 2019-11-13 17:38:48 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
fbsanchez 670df456f5 wip results omnishell 2019-11-13 16:39:24 +01:00
fbsanchez 672ce6db22 first task omnishell and minor style checks 2019-11-13 15:24:44 +01:00
Daniel Rodriguez f844c660af Merge branch 'ent-4766-feedback-de-ayudas' into 'develop' 
add feedback

See merge request artica/pandorafms!2813
 2019-11-13 13:43:08 +01:00
Daniel Barbero Martin 5f8ec8f89c fixed errors 2019-11-13 13:29:09 +01:00
fbsanchez 875d4430a7 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-13 12:21:42 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-13 12:20:29 +01:00
Daniel Barbero Martin 7103317bc2 Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico 
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/styles/pandora.css
 2019-11-13 12:12:17 +01:00