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

18865 Commits

Author SHA1 Message Date
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop' 
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
 2020-01-09 16:46:58 +01:00
Daniel Barbero a933a091ea styles fixed 2020-01-09 12:07:19 +01:00
Manuel Montes 5e058df052 Fixed z-index header 2020-01-09 11:52:27 +01:00
Luis Calvo 2d303635ae Merge remote-tracking branch 'origin/develop' into ent-5165-error-pdf-report-names-generated-by-template 2020-01-09 10:42:46 +01:00
Daniel Barbero b40f5b17c1 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-09 09:43:57 +01:00
fbsanchez 320ca5d021 Merge branch 'develop' into 'ent-4697-cicd-pandorafms' 
Conflicts:
  pandora_server/pandora_server.spec
 2020-01-09 09:28:33 +01:00
artica d8b97885a9 Auto-updated build strings. 2020-01-09 00:01:13 +01:00
fbsanchez 93380430ef alternative dpkg-deb 2020-01-08 19:45:50 +01:00
Daniel Barbero Martin 909dc4bf7c fixed css 2020-01-08 18:08:20 +01:00
Daniel Barbero Martin a8e9c69e9a save min.js and min.js.map 2020-01-08 17:33:00 +01:00
Daniel Barbero Martin d97cdfbc7a fix element line 2020-01-08 17:28:03 +01:00
Tatiana Llorente 665e9e4c98 Show gis icon only if enabled gis 2020-01-08 15:57:18 +01:00
Tatiana Llorente f61ba42dd7 Resolve conflicts 2020-01-08 15:48:07 +01:00
Tatiana Llorente 7701ff7ad1 Resolve conflicts 2020-01-08 15:44:59 +01:00
Tatiana Llorente eb222cc82f Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido 
Conflicts:
	pandora_console/godmode/setup/setup.php
 2020-01-08 15:41:45 +01:00
Tatiana Llorente b6d5d1a15a Fixed bug with clock item in the visual consoles in meta 2020-01-08 15:23:39 +01:00
Daniel Rodriguez 1f15fd5dae Merge branch 'ent-5181-Pete-SQL-y-mal-funcionamineto-de-Auto-combined-graph' into 'develop' 
Ent 5181 pete sql y mal funcionamineto de auto combined graph

See merge request artica/pandorafms!3000
 2020-01-08 14:46:29 +01:00
Tatiana Llorente 2c019f04ee Fixed bug in auto combined graph 2020-01-08 11:37:44 +01:00
Daniel Rodriguez c30e9eb1fe Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop' 
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red

See merge request artica/pandorafms!2896
 2020-01-08 11:33: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
artica 64e63dad63 Auto-updated build strings. 2020-01-08 00:01:15 +01:00
Daniel Barbero Martin da01883902 Fixed items vc line 2020-01-07 18:07:07 +01:00
Jose Gonzalez f6163f4f80 Secured get_file script for unauthorized file download 2020-01-07 17:31:14 +01:00
Daniel Barbero Martin b49dd76ce4 Add images input 2020-01-07 15:43:44 +01:00
Daniel Barbero Martin 9e2c048895 new styles VC 2020-01-07 12:06:35 +01:00
Daniel Barbero Martin 4813bef53e Add new input linked visual console 2020-01-07 12:00:39 +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
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 eea9b0337c Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop' 
Ent 5081 fallo estético en el update manager offline

See merge request artica/pandorafms!2977
 2020-01-07 11:12:59 +01:00
vgilc 8ecefd686f Merge branch 'ent-3967-imagen-en-consulta-a-db-interface' into 'develop' 
Fix bug on reports db interface query

See merge request artica/pandorafms!2906
 2020-01-07 10:58:37 +01:00
Daniel Maya 8572540f9a Ent 3977 conteo módulos de agente con grupos secundarios 2020-01-07 10:57:44 +01:00
alejandro-campos 7c952eaaa8 changes visual setup 2020-01-07 10:56:37 +01:00
vgilc 828203ed06 Merge branch 'ent-4437-ayuda-no-hierarchy' into 'develop' 
Deleted help icon

See merge request artica/pandorafms!2616
 2020-01-07 10:55:36 +01:00
vgilc 5f3889b5f6 Merge branch 'ent-4573-Cambio-en-el-switch-de-deshabilitar-agentes' into 'develop' 
Change label for disabled status - #4573

See merge request artica/pandorafms!2693
 2020-01-07 10:48:11 +01:00
vgilc 22e0a4c818 Merge branch 'ent-4620-Campo-module-inservible-en-open' into 'develop' 
Ent 4620 campo module inservible en open

See merge request artica/pandorafms!2721
 2020-01-07 10:46:13 +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 8a6fa4f988 Merge branch 'ent-4881-entities-audit-OUM' into 'develop' 
Fixed audit log OUM entities bug

See merge request artica/pandorafms!2902
 2020-01-07 10:23:39 +01:00
vgilc 06e6fa261f Merge branch 'ent-4676-pequeño-bug-visual-en-ventana-modal-de-suscripcion-a-newsletter' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2756
 2020-01-07 10:22:04 +01:00
vgilc c14a462e63 Merge branch '5027-pandora-db-error-history-db-step' into 'develop' 
Added control for int values

See merge request artica/pandorafms!2927
 2020-01-07 10:20:26 +01:00
vgilc 996d322d5d Merge branch 'ent-5176-metaconsola-informes-tipo-texto' into 'develop' 
Fixed visual bug in text report item

See merge request artica/pandorafms!2991
 2020-01-07 10:17:10 +01:00
Daniel Rodriguez fa9d60a3ef Merge branch 'ent-5128-Metaconsola-conteo-y-paginacion' into 'develop' 
fix pagination in meta monitor view

See merge request artica/pandorafms!2963
 2020-01-07 09:46:22 +01:00
Daniel Rodriguez 7bfd29da6f Merge branch 'ent-5183-error-con-logo-de-so-en-informes-pdf-meta' into 'develop' 
Fixed bug in pdf metaconsole os icon

See merge request artica/pandorafms!2987
 2020-01-07 09:45:56 +01:00
Daniel Rodriguez de77e76c3a Merge branch 'ent-3270-Bug-en-las-consolas-visuales-de-tipo-bars-graph' into 'develop' 
fix bug in bars graph visual console editor

See merge request artica/pandorafms!2849
 2020-01-07 09:44:25 +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 Rodriguez e6616374f0 Merge branch 'ent-5000-Bug-en-el-icono-de-graficas-de-Monitor-detail-con-modulos-con-tags' into 'develop' 
fix bug when checking acl permissions with regard to secondary groups in monitor view

See merge request artica/pandorafms!2908
 2020-01-07 09:41:11 +01:00
Daniel Rodriguez 1ced09986e Merge branch 'ent-5212-ventana-de-bienvenida-open' into 'develop' 
Minor fix - opensource welcome icon

See merge request artica/pandorafms!2983
 2020-01-07 09:38:20 +01:00
Daniel Rodriguez efe1e78489 Merge branch 'ent-5102-Recursividad-no-funciona-en-Group-event-report' into 'develop' 
fixed recursion in Group event report

See merge request artica/pandorafms!2969
 2020-01-07 09:37:41 +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 Rodriguez 8b2efab1b0 Merge branch 'ent-5130-metaconsola-vista-de-alertas-mostrar-nombre-completo' into 'develop' 
Fixed bug in metaconsole alerts view

See merge request artica/pandorafms!2993
 2020-01-07 09:29:46 +01:00
Daniel Rodriguez 997d1e46e5 Merge branch 'ent-4996-no-funciona-el-select-multiple-de-agente-en-el-wizard-de-consolas-visuales' into 'develop' 
Added hint

See merge request artica/pandorafms!2904
 2020-01-07 09:26:11 +01:00
Tatiana Llorente 4cd1ca38a4 Ent 5091 unificacion de tamaño de letra en informes 2020-01-07 09:25:31 +01:00
Daniel Rodriguez 0c2c7d9f3b Merge branch 'ent-2813-Muestra-de-información-en-el-tree-view' into 'develop' 
Added stopPropagation

See merge request artica/pandorafms!2940
 2020-01-07 09:24:38 +01:00
Daniel Barbero Martin 04d39a0f70 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-07 08:02:20 +01:00
artica 6e6e7ba249 Auto-updated build strings. 2020-01-07 00:01:09 +01:00
artica ba9f6cd1a7 Auto-updated build strings. 2020-01-06 00:01:15 +01:00
artica 3f2884b282 Auto-updated build strings. 2020-01-05 00:01:08 +01:00
artica 9e5032e1e0 Auto-updated build strings. 2020-01-04 00:01:08 +01:00
artica e66b8ca4e3 Auto-updated build strings. 2020-01-03 00:01:13 +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
artica 713737986b Auto-updated build strings. 2020-01-02 00:01:10 +01:00
artica d386d3c390 Auto-updated build strings. 2020-01-01 00:01:10 +01:00
Daniel Maya c79a4b2c01 fixed file vulnerability 2019-12-31 11:24:54 +01:00
artica 5b346c1ed9 Auto-updated build strings. 2019-12-31 00:01:11 +01:00
Alejandro Fraguas a8e8a38fc7 Merge branch 'ent-5154-DB-interface-apto-espacios-en-blanco-queries' into 'develop' 
dbmanager blankspaces transparent to user

See merge request artica/pandorafms!2986
 2019-12-27 12:25:30 +01:00
Alejandro Fraguas 48286d6920 Merge branch 'ent-4875-codigo-pisado-de-la-api' into 'develop' 
Restore reverted changes

See merge request artica/pandorafms!2981
 2019-12-27 10:28:25 +01:00
manuel 9e0168cd6c Fixed bug in metaconsole alerts view 2019-12-27 10:24:48 +01:00
Alejandro Fraguas ec950b199e Merge branch 'ent-4488-Añadir-confirmacion-al-borrado-de-consolas-visuales' into 'develop' 
Ent 4488 añadir confirmacion al borrado de consolas visuales

See merge request artica/pandorafms!2859
 2019-12-26 13:42:28 +01:00
Alejandro Fraguas 46f02a6c53 Merge branch 'ent-4935-CSV-eventos-tooltip' into 'develop' 
Added tooltip to CSV datatable button

See merge request artica/pandorafms!2881
 2019-12-26 12:27:55 +01:00
Alejandro Fraguas 382e700272 Merge branch 'ent-4950-Bug-al-linkar-CV-con-otra' into 'develop' 
Ent 4950 bug al linkar cv con otra

See merge request artica/pandorafms!2883
 2019-12-26 11:46:36 +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
marcos 04ed92523a changed token VW to VR 2019-12-26 10:29:26 +01:00
artica 287d377520 Auto-updated build strings. 2019-12-26 00:01:08 +01:00
artica 4294ec6d1b Auto-updated build strings. 2019-12-25 00:01:11 +01:00
Alejandro Fraguas f0848d4feb Merge branch 'ent-4993-Diferentes-bugs-tiempos' into 'develop' 
Changed date format to last remote contact

See merge request artica/pandorafms!2898
 2019-12-24 11:48:25 +01:00
manuel 3f09d13941 Fixed visual bug in grouped report item 2019-12-24 10:25:32 +01:00
manuel 4214a32fb7 Fixed visual bug in text report item 2019-12-24 10:11:27 +01:00
artica d653b4d685 Auto-updated build strings. 2019-12-24 00:01:22 +01:00
Alejandro Fraguas 45c57abb70 Merge branch 'ent-4883-Mensaje-erroneo-WebChat' into 'develop' 
Ent 4883 mensaje erroneo web chat

See merge request artica/pandorafms!2856
 2019-12-23 17:45:25 +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 c91290f062 Merge branch 'ent-4955-Bug-nombre-y-descripcion-items-informes' into 'develop' 
Changed title  name or description in items table of reports

See merge request artica/pandorafms!2875
 2019-12-23 17:13:39 +01:00
Alejandro Fraguas 7b97855dd7 Merge branch 'ent-3607-fallos-visuales-en-la-vista-de-plugin-de-la-metaconsola' into 'develop' 
Fixed file.png in plugin

See merge request artica/pandorafms!2725
 2019-12-23 17:10:56 +01:00
Alejandro Fraguas 68a47354f9 Merge branch 'ent-3494-Item-group-en-visual-console-metaconsola' into 'develop' 
fix bug in meta visual console: group item not retrieving values properly

See merge request artica/pandorafms!2864
 2019-12-23 16:54:40 +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
manuel 58beb51401 Fixed bug in pdf metaconsole os icon 2019-12-23 10:53:33 +01:00
Alejandro Fraguas 7f61caaa15 Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop' 
Ent 5034 bug al copiar acción de alerta

See merge request artica/pandorafms!2921
 2019-12-23 10:51:10 +01:00
Alejandro Fraguas 935d246a0d Merge branch 'ent-5162-9263-Notificaciones-infinitas' into 'develop' 
removed newsletter notification from messages list

See merge request artica/pandorafms!2978
 2019-12-23 10:49:04 +01:00
Alejandro Fraguas 807db02fec Merge branch 'ent-5099-dobles-interfaces' into 'develop' 
Fix networkmap module key assignment

See merge request artica/pandorafms!2952
 2019-12-23 10:25:04 +01:00
Alejandro Fraguas 7061ab81b6 Merge branch 'ent-4911-Informacion-mostrada-en-mapa-GIS-the-Satellite-Server' into 'develop' 
Ent 4911 informacion mostrada en mapa gis the satellite server

See merge request artica/pandorafms!2876
 2019-12-23 10:24:10 +01:00
Alejandro Fraguas fa34170e34 Merge branch 'ent-5117-problemas-con-el-inventory-en-meta' into 'develop' 
Fixed bug in inventory item

See merge request artica/pandorafms!2975
 2019-12-23 10:23:21 +01:00
Alejandro Fraguas 69159d158d Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop' 
Ent 1786 rango de tiempo en container graphs

See merge request artica/pandorafms!2931
 2019-12-23 10:18:39 +01:00
Alejandro Fraguas c5af1823e3 Merge branch 'ent-2023-Poder-editar-la-opcion-Safe-operation-mode-mediante-Bulk-operations' into 'develop' 
Ent 2023 poder editar la opcion safe operation mode mediante bulk operations

See merge request artica/pandorafms!2918
 2019-12-23 10:18:14 +01:00
artica cf8bf74cd4 Auto-updated build strings. 2019-12-23 00:01:17 +01:00
artica 59e91c0ed4 Auto-updated build strings. 2019-12-22 00:01:09 +01:00
artica df704997e3 Auto-updated build strings. 2019-12-21 00:01:24 +01:00
Luis Calvo 2c37ef4acb dbmanager blankspaces transparent to user 2019-12-20 14:18:48 +01:00
Daniel Barbero d4207ef67c Fixed form php VC 2019-12-20 13:58:47 +01:00
Daniel Barbero f08e92b6ad Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-20 08:02:18 +01:00
Junichi Satoh b245b3b4a8 Added support for MySQL 8.0. 2019-12-20 11:25:01 +09:00
artica 45a8904578 Auto-updated build strings. 2019-12-20 00:01:10 +01:00
Daniel Barbero a6dfdb796a Fixed errors Form VC 2019-12-19 20:47:52 +01:00
Daniel Barbero 14984faaaa Fixed errors Form VC 2019-12-19 20:42:29 +01:00
fbsanchez 9ee102b365 already used ui_get_full_url 2019-12-19 20:02:29 +01:00
fbsanchez abf4097e63 Minor fix - opensource welcome icon 2019-12-19 19:58:00 +01:00
marcos 8695e1aa4b Restore reverted changes 2019-12-19 17:45:38 +01:00
marcos 43d08f354a Ajustes CSS 2019-12-19 16:53:45 +01:00
marcos 87405ba318 add message no resoult found 2019-12-19 14:20:31 +01:00
marcos 7217176a75 add acl's to order interpreter 2019-12-19 14:11:07 +01:00
marcos e06c974e67 add acl's to order interpreter 2019-12-19 14:10:43 +01:00
alejandro-campos c3daa7e803 removed newsletter notification from messages list 2019-12-19 10:42:41 +01:00
Tatiana Llorente 4aa57143e7 Fixed visual bug in update manager offline 2019-12-19 09:42:54 +01:00
Daniel Barbero 7d60287018 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-19 08:02:47 +01:00
artica f69d243330 Auto-updated build strings. 2019-12-19 00:01:09 +01:00
Luis Calvo 22eb76b56b Fixed meta regex agent matching ids 2019-12-18 19:00:34 +01:00
marcos b551f1a13c update 2019-12-18 17:48:29 +01:00
Daniel Barbero 9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
manuel 9e88c1c2c2 Fixed bug in inventory item 2019-12-18 17:00:14 +01:00
marcos f3ddec4436 updates 2019-12-18 15:30:23 +01:00
marcos 91fe85e90e updates2 2019-12-18 15:15:25 +01:00
Daniel Maya 7f1245e09d Fixed mceLast class 2019-12-18 10:23:27 +01:00
Daniel Barbero 49ab5e95aa Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-18 07:50:08 +01:00
artica dcd1bbd527 Auto-updated build strings. 2019-12-18 00:01:20 +01:00
daniel 3e58746cd5 Fixed errors PDF images relative routes 2019-12-17 18:18:00 +01:00
marcos 35136ada8e minnor error 2019-12-17 15:25:28 +01:00
marcos 168dfcf32d minnor error 2019-12-17 15:23:01 +01:00
Daniel Rodriguez 3b0de7d448 Merge branch 'ent-5089-color-cabeceras-informes-pdf' into 'develop' 
Changed pdf report header colours(lighter)

See merge request artica/pandorafms!2968
 2019-12-17 12:17:01 +01:00
Tatiana Llorente eca876212c Ent 5095 visualizacion formato de fechas 2019-12-17 12:15:51 +01:00
Daniel Barbero 2a92c9d38d Fixed errors VC forms 2019-12-17 10:57:19 +01:00
Daniel Maya 9db5b2bead fixed recursion in Group event report 2019-12-17 10:38:56 +01:00
Daniel Barbero d77d50bb74 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-17 08:26:04 +01:00
artica 0b0c38f9c0 Auto-updated build strings. 2019-12-17 00:01:10 +01:00
Daniel Rodriguez ad9879bc1e Merge branch 'ent-5158-Informes-SQL-en-la-meta' into 'develop' 
Fixed item sql

See merge request artica/pandorafms!2966
 2019-12-16 18:23:17 +01:00
Luis Calvo b5bc431d7b Changed pdf report header colours(lighter) 2019-12-16 18:19:34 +01:00
fbsanchez 4631d9ea64 minor style fix 2019-12-16 16:48:29 +01:00
fbsanchez ded6dcb41a Merge remote-tracking branch 'origin/develop' into ent-5108-ws-cookie-parser 2019-12-16 16:44:02 +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
Daniel Maya 8bde504fc2 Fixed item sql 2019-12-16 15:50:21 +01:00
Jose Gonzalez c57ef7e6a0 Added images and CSS file for new demo installation screen 2019-12-16 15:45:27 +01:00
fbsanchez abd2213e71 Menu entry for websocket engine settings 2019-12-16 15:42:54 +01:00
fbsanchez 89b97e340e Revert "DEBIAN console updated with gotty binary file" 
Undo GoTTY in Pandora Console DEB packages

This reverts commit d370fa560a.
 2019-12-16 12:16:42 +01:00
fbsanchez c2d0377a8d Revert "RPMBUILD console updated with gotty binary file" 
Undo Gotty in Pandora Console RPM

This reverts commit e43d8914aa.
 2019-12-16 12:16:21 +01:00
Daniel Rodriguez 24838cad0f Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop' 
Added compact mode to show timestamp - #4233

See merge request artica/pandorafms!2688
 2019-12-16 11:48:09 +01:00
alejandro-campos cc574cdb39 fix pagination in meta monitor view 2019-12-16 11:46:07 +01:00
artica 79cad3eaa9 Updated version and build strings. 2019-12-16 11:43:58 +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
Daniel Rodriguez 11beedc773 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-3' into 'develop' 
Fixed errors

See merge request artica/pandorafms!2962
 2019-12-16 11:20:37 +01:00
Alejandro Fraguas 37020bd572 Merge branch 'ent-4903-list_ACL_IPs_for_API' into 'develop' 
Fix bug when updating ACL IP list

See merge request artica/pandorafms!2961
 2019-12-16 11:19:10 +01:00
fbsanchez d370fa560a DEBIAN console updated with gotty binary file 2019-12-16 10:51:24 +01:00
fbsanchez e43d8914aa RPMBUILD console updated with gotty binary file 2019-12-16 10:46:37 +01:00
Daniel Barbero 6aa085abb9 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-16 07:56:13 +01:00
artica f7b0372e53 Auto-updated build strings. 2019-12-16 00:01:07 +01:00
artica 20f3583fc5 Auto-updated build strings. 2019-12-15 00:01:06 +01:00
artica ebe0ba25c8 Auto-updated build strings. 2019-12-14 00:01:09 +01:00
Daniel Barbero a203da5a26 Fixed errors 2019-12-13 16:01:24 +01:00
marcos de161d830c add Traducction 2019-12-13 14:46:47 +01:00
marcos 3008651b65 add < list 2019-12-13 14:43:30 +01:00
marcos 4e712d1a45 fixed error 2019-12-13 14:25:33 +01:00
marcos 90d0be6ff1 fixed error 2019-12-13 14:22:50 +01:00
alejandro-campos d30c2c9b3b Fix bug when updating ACL IP list 2019-12-13 14:17:25 +01:00
marcos 2139e0ef84 add 3 on key event 2019-12-13 14:11:12 +01:00
marcos 480673521c Can select with keyboard list items 2019-12-13 14:08:44 +01:00
Tatiana Llorente b38c396837 Change date in hover in compact mode 2019-12-13 13:40:19 +01:00
fbsanchez a558152cb2 minor fix 2019-12-13 13:20:44 +01:00
fbsanchez ad6ea431bf minor fix, hide quickshell settings while disabled 2019-12-13 13:13:09 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Daniel Barbero 9e01cb097c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-13 13:02:04 +01:00
fbsanchez 5f32bfdb64 Datatype fix - ws engine 2019-12-13 11:58:12 +01:00
Daniel Rodriguez 13ac0a6229 Merge branch 'ent-5082-setup-visual-styles-reports' into 'develop' 
Grouped report items on styles conf. Fixed font bug

See merge request artica/pandorafms!2953
 2019-12-13 11:51:56 +01:00
Jose Gonzalez 6f9d400d03 Changed to 2px active tab 2019-12-13 11:50:59 +01:00
fbsanchez 3b5ebd0bf7 Better quickshell integration and fixes 2019-12-13 11:46:44 +01:00
Daniel Rodriguez 350dbaf832 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-2' into 'develop' 
Fix gauge pdf reports

See merge request artica/pandorafms!2958
 2019-12-13 11:28:30 +01:00
Alejandro Fraguas 810ad03c65 Merge branch '4290-Opciones-Adicionales-Templates-Alertas-Idiomas' into 'develop' 
Possible solution to avoid issues with JS and apostrophe of other languages strings

See merge request artica/pandorafms!2932
 2019-12-13 10:50:37 +01:00
Daniel Barbero 603b4e71eb Fix gauge pdf reports 2019-12-13 09:06:54 +01:00
Daniel Barbero 319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
artica 37c5acf4d1 Auto-updated build strings. 2019-12-13 00:01:12 +01:00
Daniel Rodriguez b3c55db8fd Merge branch 'ent-4931-Bug-al-crear-informe-con-SLA-Wizard-en-META' into 'develop' 
Ent 4931 bug al crear informe con sla wizard en meta

See merge request artica/pandorafms!2873
 2019-12-12 18:14:00 +01:00
Manuel Montes a2162948b4 Fixed minor bugs in metaconsole reports 2019-12-12 18:12:42 +01:00
vgilc 3d3ff46d12 Merge branch 'ent-5088-Cabecera-de-informes-en-html' into 'develop' 
Ent 5088 cabecera de informes en html

See merge request artica/pandorafms!2956
 2019-12-12 17:58:53 +01:00
marcos 6a5dfb5ec9 refactor code 2019-12-12 17:16:09 +01:00
vgilc 0a7f24192e Merge branch 'ent-5110-formulario-de-modulos-remotos-erroneo' into 'develop' 
Fixed bug in module creation view

See merge request artica/pandorafms!2954
 2019-12-12 17:07:35 +01:00
Daniel Rodriguez 3223e0a8e1 Merge branch 'ent-4865-8983-modulos-snmp-v3-politicas' into 'develop' 
Fixed snmp input

See merge request artica/pandorafms!2914
 2019-12-12 17:01:12 +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 b998ec3c44 visual changes in html report headers 2019-12-12 14:58:42 +01:00
alejandro-campos 7f79a50c33 visual changes in html report headers 2019-12-12 14:55:27 +01:00
Jose Gonzalez 81dcf4713f Modified arab phrase for solve the issue 2019-12-12 14:19:09 +01:00
Daniel Barbero 415a54fb55 base64 images pdf 2019-12-12 14:01:11 +01:00
manuel 2504a3dc09 Fixed bug in module creation view 2019-12-12 13:50:35 +01:00
Daniel Rodriguez ab1c6e17ca Merge branch 'ent-4508-desajustes-y-bug-en-open' into 'develop' 
fixed minnor error

See merge request artica/pandorafms!2929
 2019-12-12 11:03:22 +01:00
Manuel Montes 7ea61b7424 Added controls on report items 2019-12-12 09:11:15 +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
artica dd49f0c91c Auto-updated build strings. 2019-12-12 00:01:11 +01:00
marcos 8ca473b2a7 ajust search input 2019-12-11 18:42:46 +01:00
Luis Calvo a364af3b2d Grouped report items on styles conf. Fixed font bug 2019-12-11 18:32:49 +01:00
fbsanchez ede4cedf62 Fix networkmap module key assignment 2019-12-11 16:42:50 +01:00
vgilc 0d16bc3188 Merge branch '4605-Bug-Wizard-SNMP' into 'develop' 
Modified type of module when use SNMP Agent Wizard

See merge request artica/pandorafms!2947
 2019-12-11 16:24:29 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
fbsanchez bb093482a7 Fix: ws session extraction 2019-12-11 13:04:45 +01:00
Daniel Maya bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +01:00
Daniel Maya b2b2cdbede Fixed public_console height 2019-12-11 12:05:57 +01:00
Alejandro Fraguas 9a21710cd5 Merge branch 'ent-5054-Vista-de-Netflow-live-view-descojonada' into 'develop' 
Ent 5054 vista de netflow live view descojonada

See merge request artica/pandorafms!2928
 2019-12-11 11:37:02 +01:00
artica 772b26ffcb Auto-updated build strings. 2019-12-11 00:01:11 +01:00
Daniel Rodriguez 1350ef951b Merge branch '5079-Otra-vez-las-comillas-dobles-en-comentarios' into 'develop' 
Code reset and solved other issues with comments

See merge request artica/pandorafms!2943
 2019-12-10 17:21:48 +01:00
Daniel Rodriguez 35298d754a Merge branch 'ent-4984-netflow-vulnerability' into 'develop' 
Fixed netflow command injection vulnerability

See merge request artica/pandorafms!2933
 2019-12-10 16:43:29 +01:00
Alejandro Fraguas d033b7d95a Merge branch 'ent-4948-posibilidad-de-añadir-fecha-hora-en-los-availability-graph' into 'develop' 
Added datetime in availability graph

See merge request artica/pandorafms!2917
 2019-12-10 16:34:33 +01:00
Jose Gonzalez 62de2fe396 Modified type of module when use SNMP Agent Wizard 2019-12-10 15:37:04 +01:00
vgilc bc1109e0ae Merge branch 'ent-5049-crear-accion-de-alerta-solo-deja-elegir-el-grupo-all' into 'develop' 
Fixed bugs in alert actions

See merge request artica/pandorafms!2942
 2019-12-10 15:32:51 +01:00
Tatiana Llorente 9d3426c0e9 Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2 2019-12-10 15:29:35 +01:00
Daniel Rodriguez f9c4a826d5 Merge branch 'ent-4982-Tree-View-Module-groups' into 'develop' 
Added Group by in tree view

See merge request artica/pandorafms!2903
 2019-12-10 13:46:27 +01:00
vgilc 1e0818786b Merge branch 'ent-4652-ajustar-posicion-del-label-el-item-imagen-estatica-de-consolas-visuales' into 'develop' 
Adjusted margin on static image item

See merge request artica/pandorafms!2895
 2019-12-10 11:56:06 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +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
vgilc aadb2ea783 Merge branch 'ent-4427-Funcion-API-validate_event_by_id' into 'develop' 
Ent 4427 funcion api validate event by

See merge request artica/pandorafms!2639
 2019-12-10 11:51:37 +01:00
vgilc 8d0b86c420 Merge branch 'ent-4481-entities-en-graficas-personalizadas-bullet-chart' into 'develop' 
remove entities custom graph bullet chart

See merge request artica/pandorafms!2640
 2019-12-10 11:50:57 +01:00
vgilc 418cf73c87 Merge branch 'ent-4506-item-de-consola-visual-tipo-line-imborrable-y-problemas-al-colocarlo' into 'develop' 
Fixed bug in visual console line item

See merge request artica/pandorafms!2885
 2019-12-10 11:49:42 +01:00
vgilc 7a616018a1 Merge branch 'ent-4619-fallos-css-advanced-options-agentes-open' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2758
 2019-12-10 11:48:45 +01:00
vgilc e9de1df431 Merge branch 'ent-4713-Revisar-funcion-groups-get-id-recursive' into 'develop' 
fix minor bug in function groups_get_id_recursive

See merge request artica/pandorafms!2842
 2019-12-10 11:47:13 +01:00
vgilc 7db5f8b9b1 Merge branch 'ent-4887-service-tree-view-no-carga' into 'develop' 
Solved issue with query

See merge request artica/pandorafms!2858
 2019-12-10 11:46:17 +01:00
vgilc f4372bb766 Merge branch 'ent-4917-Pete-SQL-al-añadir-un-dia-especial-a-la-lista-de-dias-especiales' into 'develop' 
Ent 4917 pete sql al añadir un dia especial a la lista de dias especiales

See merge request artica/pandorafms!2861
 2019-12-10 11:43:46 +01:00
vgilc 776c683ac9 Merge branch 'ent-4922-Filtros-del-visor-de-traps-actualizan-solos' into 'develop' 
Ent 4922 filtros del visor de traps actualizan solos

See merge request artica/pandorafms!2879
 2019-12-10 11:43:07 +01:00
vgilc 3e69967c4d Merge branch 'ent-4960-9081-Error-home-screen-standard-user-con-ACL' into 'develop' 
fix bug when accessing certain views as home screen

See merge request artica/pandorafms!2882
 2019-12-10 11:42:13 +01:00
vgilc f55a5c484e Merge branch 'ent-4961-Ventana-filtro-de-eventos-muy-pequeña-si-el-nombre-de-filtro-es-muy-grande' into 'develop' 
Ent 4961 ventana filtro de eventos muy pequeña si el nombre de filtro es muy grande

See merge request artica/pandorafms!2880
 2019-12-10 11:35:41 +01:00
vgilc f1e648404c Merge branch 'ent-4999-9146-Ventanas-info-agentes-en-gis-no-funcionan-bien' into 'develop' 
fix bug when selecting and unselecting feature in gis maps

See merge request artica/pandorafms!2905
 2019-12-10 11:32:56 +01:00
vgilc 1b2d4e233a Merge branch 'ent-5006-Bug-al-eliminar-un-nodo-de-un-mapa-de-red-y-mover-otro-elemento' into 'develop' 
Ent 5006 bug al eliminar un nodo de un mapa de red y mover otro elemento

See merge request artica/pandorafms!2907
 2019-12-10 11:30:28 +01:00
Luis 2b03b00223 Fixed agent event graph bar and link to event list 2019-12-10 11:28:56 +01:00
vgilc f8c4c1baba Merge branch 'ent-5040-network-tools-no-funcionan-con-agentes-con-mas-de-una-ip-secundaria' into 'develop' 
Fixed bug in network tools

See merge request artica/pandorafms!2920
 2019-12-10 10:57:07 +01:00
artica 7a858fbc25 Auto-updated build strings. 2019-12-10 00:01:07 +01:00
artica 180d5842ee Auto-updated build strings. 2019-12-09 00:01:08 +01:00
artica 8128f2605a Auto-updated build strings. 2019-12-08 00:01:07 +01:00
artica 8f31fc21f1 Auto-updated build strings. 2019-12-07 00:01:07 +01:00
artica f477014a1b Auto-updated build strings. 2019-12-06 00:01:10 +01:00
Luis Calvo a184b50eb2 Added margin to date selector elements in reporting viewer 2019-12-05 18:55:15 +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
Jose Gonzalez 3652f31a18 Code reset and solved other issues with comments 2019-12-05 17:06:58 +01:00
manuel 85f4301e4c Fixed bugs in alert actions 2019-12-05 16:43:26 +01:00
marcos 1430e6ee11 Update orderinterpreter class and css 2019-12-05 16:10:31 +01:00
marcos a89a64cc1b Merge remote-tracking branch 'origin/develop' into ent-4467-barra-de-busqueda-como-interprete-de-ordenes 2019-12-05 15:05:54 +01:00
artica 0263060639 Auto-updated build strings. 2019-12-05 00:01:09 +01:00
marcos be3dcccc4d out entities 2019-12-04 17:45:58 +01:00
marcos d6090771ef Merge remote-tracking branch 'origin/develop' into ent-4481-entities-en-graficas-personalizadas-bullet-chart 2019-12-04 17:32:38 +01:00
marcos fbb1e53362 update orderinterpreter 2019-12-04 17:28:03 +01:00
Daniel Maya 2b8e9995ce Added stopPropagation 2019-12-04 17:14:45 +01:00
artica 0ba2d86971 Auto-updated build strings. 2019-12-04 00:01:08 +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
vgilc 810fe8f860 Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'" 
This reverts merge request !2886
 2019-12-03 15:59:08 +01:00
vgilc 809628560b Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop' 
Ent 4968 comandos de alerta con saltos de linea

See merge request artica/pandorafms!2886
 2019-12-03 15:53:23 +01:00
marcos 14b8379ccb ajax call, controller, class, match result, return array inputs(example to return) 2019-12-03 15:11:16 +01:00
marcos 631170bfe9 resolv blank page 2019-12-03 14:26:31 +01:00
marcos 90f17ebd46 Merge remote-tracking branch 'origin/develop' into ent-4467-barra-de-busqueda-como-interprete-de-ordenes 2019-12-03 14:15:47 +01:00
marcos d4720c2260 add firts changes 2019-12-03 13:59:03 +01:00
Luis Calvo 22cd129f71 Fixed netflow command injection vulnerability 2019-12-03 13:58:14 +01:00
Jose Gonzalez 35ca0bc247 Possible solution to avoid issues with JS and apostrophe of other languages strings 2019-12-03 13:05:33 +01:00
Tatiana Llorente fecd2c74b5 Added button to refresh graph in container graphs 2019-12-03 13:00:59 +01:00
artica 60aaf4363e Auto-updated build strings. 2019-12-03 00:01:07 +01:00
marcos d7288114ad fixed minnor error 2019-12-02 18:17:54 +01:00
Tatiana Llorente 2d62955020 Changed filters styles in netflow live view 2019-12-02 16:11:17 +01:00
Jose Gonzalez 6883240931 Added control for int values 2019-12-02 11:54:39 +01:00
marcos e412516a64 add historical data fialure message 2019-12-02 11:20:25 +01:00
artica 80d5eea467 Auto-updated build strings. 2019-12-02 00:01:08 +01:00
artica 882198798a Auto-updated build strings. 2019-12-01 00:01:06 +01:00
artica a6f881c6fa Auto-updated build strings. 2019-11-30 00:01:08 +01:00
artica 14999b7b84 Auto-updated build strings. 2019-11-29 00:01:08 +01:00
marcos a67b0a9978 update pandora.js pandora_ui.js 2019-11-28 18:27:05 +01:00
Tatiana Llorente 0420a439d1 Send params to copy and delete action alert by post 2019-11-28 11:51:32 +01:00
marcos 99eb67c251 Merge remote-tracking branch 'origin/develop' into ent-4876-pandora_ui.js 2019-11-28 10:02:43 +01:00
artica ec6d317bd4 Auto-updated build strings. 2019-11-28 00:01:09 +01:00
Daniel Barbero Martin e6afe84940 Fixed pdf 2019-11-27 15:22:39 +01:00
manuel a799b22a5c Fixed bug in network tools 2019-11-27 14:06:52 +01:00
Luis b0d5b7223e Added report template regex to MR 2019-11-27 13:21:05 +01:00
Daniel Barbero Martin ea2c5bc8c9 Fixed translate 2019-11-27 11:49:20 +01:00
marcos e84610120b Add coments in pandora_ui.js 2019-11-27 11:43:50 +01:00
Marcos Alconada 888988572a Merge branch 'develop' into 'ent-4876-pandora_ui.js' 
# Conflicts:
#   pandora_console/include/javascript/pandora.js
 2019-11-27 11:39:11 +01:00
Alejandro Fraguas ed0ad76e61 Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop' 
Add new search for id source event in metaconsole

See merge request artica/pandorafms!2438
 2019-11-27 10:14:35 +01:00
artica d2fdc0cf9d Auto-updated build strings. 2019-11-27 00:01:08 +01:00
Tatiana Llorente d8e1786830 Added Save Operation Mode option in agents bulk operations 2019-11-26 16:44:53 +01:00
fbsanchez c28dfd60a5 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-26 16:16:15 +01:00
Alejandro Fraguas e96d7f1f30 Merge branch 'ent-4444-Rendimiento-en-la-vista-de-eventos-en-metaconsola' into 'develop' 
Added index in MR

See merge request artica/pandorafms!2916
 2019-11-26 15:37:49 +01:00
Daniel Rodriguez 66c67ea74a Merge branch 'ent-4226-mejoras-plugin-sap' into 'develop' 
Ent 4226 mejoras plugin sap

See merge request artica/pandorafms!2853
 2019-11-26 14:14:10 +01:00
manuel 12230c83c9 Added datetime in availability graph 2019-11-26 11:55:41 +01:00
fbsanchez c985f2d5f9 Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-26 10:50:51 +01:00
fbsanchez d3f18a94f7 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-26 10:48:59 +01:00
Daniel Maya cf8bae66d1 Added index in MR 2019-11-26 10:31:57 +01:00
artica b3fa4b7b7d Auto-updated build strings. 2019-11-26 00:01:08 +01:00
Daniel Barbero 867f0cfbe9 WIP Rules alert correlation 2019-11-25 20:06:42 +01:00
Daniel Maya d89ec20c52 Fixed snmp input 2019-11-25 17:24:28 +01:00
Marcos Alconada d0aab40fa8 Update 29.sql 2019-11-25 16:56:59 +01:00
marcos 0490024abc add sap view to autorefresh edit my user 2019-11-25 15:01:27 +01:00
marcos 6f8bf104b4 update sap view 2019-11-25 13:50:26 +01:00
fbsanchez 1b4b59d1c2 Rules migration DB 2019-11-25 13:36:43 +01:00
fbsanchez 1b57b279fb minor changes 2019-11-25 13:03:55 +01:00
fbsanchez a854809247 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 2019-11-25 09:39:25 +01:00
Daniel Barbero f24034e729 Add styles Rules 2019-11-25 09:09:59 +01:00
artica 1592773b46 Auto-updated build strings. 2019-11-25 00:01:07 +01:00
artica 44311c0438 Auto-updated build strings. 2019-11-24 00:01:07 +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
artica 09e6615611 Auto-updated build strings. 2019-11-23 00:01:09 +01:00
fbsanchez 4e2bd7ed55 minor fixes 2019-11-22 20:49:46 +01:00
fbsanchez 5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2019-11-22 15:49:07 +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 e8812cba95 add img 2019-11-22 14:50:23 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
fbsanchez 5b5895a644 minor fix 2019-11-22 13:30:25 +01:00
fbsanchez 1565fee3f4 minor fix, errata 2019-11-22 11:59:24 +01:00
fbsanchez fd12c5a009 DB update, default values for Alert correlation 2019-11-22 11:57:20 +01:00
Daniel Barbero 35abd12499 WIP alert correlations 2019-11-22 11:06:55 +01:00
marcos ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
marcos de3f8b2a0f updates 2019-11-22 10:56:30 +01:00
Daniel Barbero 4caf84da25 WIP alert correlations 2019-11-22 10:24:12 +01:00
artica 561e73d524 Updated version and build strings. 2019-11-22 10:03:53 +01:00
artica b386da7da6 Auto-updated build strings. 2019-11-22 00:01:10 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 362837f856 updated default values for tevent_rule, new tokens for correlated alerts 2019-11-21 17:47:21 +01:00
marcos 93c4793025 add id_source_event 33.sql 2019-11-21 17:36:01 +01:00
Tatiana Llorente d392978a70 Fixed bug when deleting nodes in network maps 2019-11-21 17:28:58 +01:00
marcos 1640c03fc3 first changes pandora.js to pandora_ui.js 2019-11-21 16:42:39 +01:00
alejandro-campos 02780aed41 fix bug when checking acl permissions with regard to secondary groups in monitor view 2019-11-21 16:36:34 +01:00
Alejandro Fraguas e9bd9f1b58 Merge branch 'ent-4444-Rendimiento-en-la-vista-de-eventos-en-metaconsola' into 'develop' 
fixed secondary group in events

See merge request artica/pandorafms!2901
 2019-11-21 16:09:01 +01:00
Daniel Barbero 66035a8b67 fixed errors css 2019-11-21 15:27:47 +01:00
Luis Calvo dcf33758fa Fis bug on reports db interface query 2019-11-21 14:36:31 +01:00
alejandro-campos 8b9177c2e7 fix bug when selecting and unselecting feature in gis maps 2019-11-21 13:18:04 +01:00
fbsanchez 7af1841b8f moved alert.js to correlated_alerts.js 2019-11-21 13:12:17 +01:00
fbsanchez 5195d6a754 Allow single quotes hidden_extended 2019-11-21 12:42:06 +01:00
manuel e4ba7ccde0 Added hint 2019-11-21 12:06:00 +01:00
fbsanchez 0f2b8a55a5 wip alert correlation 2019-11-21 12:05:14 +01:00
Luis 41e818334e Ent 4954 urls documentacion soporte al fallar base datos 2019-11-21 11:14:50 +01:00
Daniel Maya 791454ee87 Added Group by in tree view 2019-11-21 10:22:51 +01:00
Daniel Rodriguez 775289fc20 Merge branch 'ent-4550-ACL-acceso-denegado-detalles-agente-icono-grupo' into 'develop' 
Changed definition of link in group icon

See merge request artica/pandorafms!2891
 2019-11-21 10:21:07 +01:00
Marcos Alconada 34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' 
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
 2019-11-21 10:13:00 +01:00
Daniel Barbero 17e7710f45 add datepicker alert correlation 2019-11-21 09:05:34 +01:00
artica 23e64ab781 Auto-updated build strings. 2019-11-21 00:01:18 +01:00
Luis Calvo d222553aba Fixed audit log OUM entities bug 2019-11-20 18:27:21 +01:00
fbsanchez 6996969995 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-20 18:23:17 +01:00
fbsanchez 624a1e0086 WIP alert correlation 2019-11-20 18:17:43 +01:00
marcos 294c160622 semifinal sap sap view agent 2019-11-20 18:01:07 +01:00
alejandro-campos a064f47ef3 fix module cron values 2019-11-20 17:20:17 +01:00
Daniel Maya fad70cfdc0 fixed secondary group in events 2019-11-20 16:34:56 +01:00
Daniel Barbero Martin fb6013bd62 Wip alert correlation 2019-11-20 15:55:08 +01:00
fbsanchez 3b636a12ce Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-20 15:53:00 +01:00
fbsanchez e9432aaaa5 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-20 15:51:47 +01:00
Daniel Barbero Martin 61568ee3b7 Add button diagnostic 2019-11-20 13:26:02 +01:00
Daniel Barbero Martin 4d7f92e3f0 Add button diagnostic 2019-11-20 13:25:16 +01:00
alejandro-campos 4d332f2bef fix duplicated operation in migrate file 2019-11-20 12:43:08 +01:00
fbsanchez 446d6c3507 Fix windows commands 2019-11-20 12:35:55 +01:00
fbsanchez 79a135b077 Fix errata DESC => COMMENT 2019-11-20 11:36:15 +01:00