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

12261 Commits

Author SHA1 Message Date
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 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
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
Daniel Barbero 9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +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
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
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
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
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
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
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 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 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
Jose Gonzalez 6f9d400d03 Changed to 2px active tab 2019-12-13 11:50:59 +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 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 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
fbsanchez ede4cedf62 Fix networkmap module key assignment 2019-12-11 16:42:50 +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
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
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
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 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 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
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
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
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
Jose Gonzalez 6883240931 Added control for int values 2019-12-02 11:54:39 +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
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
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
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
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
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
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
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
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 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
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
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 624a1e0086 WIP alert correlation 2019-11-20 18:17:43 +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 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
Tatiana Llorente bae61d4225 Changed date format to last remote contact 2019-11-20 10:30:22 +01:00
Daniel Barbero Martin 67fb2216d4 Fix 2019-11-20 09:48:35 +01:00
Daniel Barbero Martin cd8f52fd92 WIP alert correlations 2019-11-20 09:11:03 +01:00
artica 12123d68df Auto-updated build strings. 2019-11-20 00:01:37 +01:00
Tatiana Llorente 5dc9843e89 Fixed bug with shape in fictional nodes in network maps 2019-11-19 16:53:12 +01:00
artica 04076a04b1 Auto-updated build strings. 2019-11-19 00:01:12 +01:00
alejandro-campos a0f767ccc7 fixed module cron minute selectors 2019-11-18 15:28:34 +01:00
Daniel Barbero 8811095a3e WIP ALerts 2019-11-18 15:25:35 +01:00
Daniel Barbero 79f5e879cc WIP Alerts 2019-11-18 13:37:10 +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 6126503285 Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF 2019-11-18 12:30:51 +01:00
fbsanchez 61ccd5bdbc help_link omnishell 2019-11-18 12:30:12 +01:00
fbsanchez 85ca03b054 fix- removed traces 2019-11-18 11:07:04 +01:00
fbsanchez 99b0714850 PWE keep db connection up 2019-11-18 11:06:27 +01:00
José González 4cddf5a31a Merge branch 'develop' into 'ent-4930-create_event-no-anade-comentarios-evento' 
# Conflicts:
#   pandora_console/include/functions_events.php
 2019-11-18 11:02:31 +01:00
fbsanchez 6fb2e3af81 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-18 10:05:40 +01:00
artica 73389a7164 Auto-updated build strings. 2019-11-18 00:01:07 +01:00
artica 39b449be9c Auto-updated build strings. 2019-11-17 00:01:07 +01:00
artica 727b3bde5d Auto-updated build strings. 2019-11-16 00:01:11 +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 32466a5f0f Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-15 16:36:06 +01:00
Alejandro Fraguas 7e8f22b1de Merge branch 'ent-4936-Comillas-dobles-en-comentarios-de-eventos-no-funcionan' into 'develop' 
Ent 4936 comillas dobles en comentarios de eventos no funcionan

See merge request artica/pandorafms!2869
 2019-11-15 13:20:13 +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