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

11781 Commits

Author SHA1 Message Date
marcos 353246f9f6 first changed to welcome window 2019-10-18 10:30:19 +02:00
artica 22af1a3654 Auto-updated build strings. 2019-10-18 00:01:11 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00
Daniel Barbero Martin 4e56f6751a Continue work diagnostics 2019-10-17 15:17:28 +02:00
Alejandro Fraguas be29f1dd55 Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop' 
fixed minor error

See merge request artica/pandorafms!2782
 2019-10-17 13:20:14 +02:00
Tatiana Llorente adf3b08537 Add text (inv) in the help of the thresholds for inverse intervals - #1880 2019-10-17 11:50:50 +02:00
alejandro-campos 3a5bbb22bd changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument 2019-10-17 11:14:42 +02:00
Daniel Rodriguez 2dfc2b7a8a Merge branch 'ent-3989-graficas-sql-metaconsola' into 'develop' 
Available in metaconsole sql charts in reports for metaconsole server

See merge request artica/pandorafms!2697
 2019-10-17 11:07:37 +02:00
Daniel Rodriguez 3cb80e5d32 Merge branch '4820-planned_downtimes_created-no-se-almacena-correctamente' into 'develop' 
Solved issue with date_from and dato_to missing time data

See merge request artica/pandorafms!2817
 2019-10-17 10:16:07 +02:00
artica 361f2022f4 Auto-updated build strings. 2019-10-17 00:01:10 +02:00
Daniel Rodriguez b6db2aa041 Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' 
Fixed open and enterprise network map migration

See merge request artica/pandorafms!2745
 2019-10-16 19:03:24 +02:00
Jose Gonzalez 4a29057a1b Solved issue with date_from and dato_to missing time data 2019-10-16 16:41:22 +02:00
Daniel Rodriguez 5f0dffb816 Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop' 
Ent 4559 desajuste en custom fields

See merge request artica/pandorafms!2684
 2019-10-16 11:38:38 +02:00
Marcos Alconada e7a948bb71 Update HelpFeedBack.class.php 2019-10-16 11:03:21 +02:00
Alejandro Fraguas 7e54a26b49 Merge branch 'ent-4618-8580-4526-Bug-en-los-CSV-report' into 'develop' 
Fixed csv reports download

See merge request artica/pandorafms!2742
 2019-10-16 09:58:00 +02:00
artica a3a456da92 Auto-updated build strings. 2019-10-16 00:01:08 +02:00
Marcos Alconada 1a77e3e381 Update HelpFeedBack.class.php 2019-10-15 18:11:50 +02:00
Marcos Alconada 43d3f32d0c Update help_feedback.css 2019-10-15 18:11:21 +02:00
Marcos Alconada 5a73b67545 Update help_feedback.css 2019-10-15 17:59:22 +02:00
Marcos Alconada d04544fa66 Update HelpFeedBack.class.php 2019-10-15 16:34:01 +02:00
Marcos Alconada 03ada6fb1f Update HelpFeedBack.class.php 2019-10-15 16:28:12 +02:00
Marcos Alconada f8636e77cc Update HelpFeedBack.class.php 2019-10-15 12:45:40 +02:00
marcos a31e66a9bd add feedback 2019-10-15 12:16:50 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop' 
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
 2019-10-15 11:42:00 +02:00
Marcos Alconada 89843fcc3b Update functions_ui 2019-10-15 11:13:40 +02:00
artica 6c21d57677 Auto-updated build strings. 2019-10-15 00:01:09 +02:00
Daniel Barbero Martin 13a72426cd fixed diagnostics 2019-10-14 17:21:38 +02:00
Jose Gonzalez e0ff5bf9cc Solved an issue with japanese wiki 2019-10-14 17:13:13 +02:00
Jose Gonzalez 01148749a6 Added secondarygroups macro and updated spanish, english and japanses wiki 2019-10-14 17:10:48 +02:00
Daniel Rodriguez febe54e3c8 Merge branch '4779-call-set-planned_downtimes-no-se-muestra' into 'develop' 
Added date control

See merge request artica/pandorafms!2794
 2019-10-14 16:21:39 +02:00
artica 83b16d9d84 Auto-updated build strings. 2019-10-14 00:01:07 +02:00
artica 838fcfa3a1 Auto-updated build strings. 2019-10-13 00:01:06 +02:00
artica df2acbce96 Auto-updated build strings. 2019-10-12 00:01:10 +02:00
Daniel Barbero 66bad65550 refactoriced diagnostics pandoraFMS 2019-10-11 14:55:20 +02:00
Tatiana Llorente dd2ace99e1 Check permissions to reset a network map - #4728 2019-10-11 13:51:52 +02:00
Daniel Rodriguez e4775a3e6d Merge branch 'ent-4607-8644-informe-histograma-no-funciona-bien' into 'develop' 
Fixed bug in histogram graph report

See merge request artica/pandorafms!2803
 2019-10-11 13:06:27 +02:00
Daniel Rodriguez adaead5f8f Merge branch 'ent-4763-paginacion-datatables' into 'develop' 
datatables hide when only 1 page

See merge request artica/pandorafms!2784
 2019-10-11 12:46:22 +02:00
Daniel Rodriguez c1853523f5 Merge branch 'ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla' into 'develop' 
Ent 4545 bug creacion infrome con graficas max value fallo tabla

See merge request artica/pandorafms!2719
 2019-10-11 12:30:36 +02:00
manuel f139fb0d2c Merge branch 'develop' into ent-4618-8580-4526-Bug-en-los-CSV-report 2019-10-11 11:39:41 +02:00
Alejandro Fraguas 7fc31d127d Merge branch 'ent-4662-bug-creacion-agente-API-visualizacion-Metaconsola' into 'develop' 
Ent 4662 bug creacion agente api visualizacion metaconsola

See merge request artica/pandorafms!2764
 2019-10-11 11:25:16 +02:00
manuel a69cfb63f1 Fixed bug in histogram graph report 2019-10-11 09:04:13 +02:00
artica 9a165dc9d8 Auto-updated build strings. 2019-10-11 00:01:08 +02:00
Daniel Rodriguez f8dc0596ba Merge branch 'ent-4653-item-agent-modules-blank-on-template' into 'develop' 
Removed item agent/modules from templates

See merge request artica/pandorafms!2760
 2019-10-10 17:00:28 +02:00
Luis Calvo bf19fbffd3 Added API and cli function get_agents_id_by_alias 2019-10-10 14:25:17 +02:00
artica edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Tatiana Llorente 18679f90e5 Added token in visual styles to change the font size in items of reports - #4670 2019-10-09 16:24:37 +02:00
fbsanchez d09c071684 discovery ACL 2019-10-09 15:45:02 +02:00
manuel 93bca4673f Fixed bugs in reports 2019-10-09 13:15:07 +02:00
artica be2148ff26 Auto-updated build strings. 2019-10-09 00:01:09 +02:00
Jose Gonzalez 6ad9386cf6 Added date control 2019-10-08 15:42:55 +02:00
Daniel Rodriguez bc2e40d0a3 Merge branch '4748-API-call-set-planned_downtimes_created' into 'develop' 
Added control for same-day and different hours planned downtimes

See merge request artica/pandorafms!2788
 2019-10-08 11:37:10 +02:00
artica 2a76b06870 Auto-updated build strings. 2019-10-08 00:01:11 +02:00
Daniel Rodriguez bd7ee945f7 Merge branch 'ent-4454-No-aparece-el-icono-con-color-de-warning-en-el-Service-Tree-View' into 'develop' 
Fixed bad image for warning status - #4454

See merge request artica/pandorafms!2629
 2019-10-07 19:21:53 +02:00
Daniel Rodriguez e6724752ff Merge branch 'ent-4661-leyenda-de-las-graficas-en-classic-mode' into 'develop' 
Fixed Error

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

See merge request artica/pandorafms!2770
 2019-10-07 15:59:16 +02:00
Daniel Rodriguez 375fac7f3d Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop' 
Fixed modules_get_relations

See merge request artica/pandorafms!2751
 2019-10-07 14:01:24 +02:00
Daniel Rodriguez debbbdc4e5 Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop' 
Improved truncate system and solved issue

See merge request artica/pandorafms!2774
 2019-10-07 13:49:57 +02:00
Jose Gonzalez 7ac12e45ef Solved visual issue 2019-10-07 13:33:18 +02:00
Jose Gonzalez 2b2f8417a7 Added control for same-day and different hours planned downtimes 2019-10-07 12:40:59 +02:00
marcos.alconada a7b66e6365 revert changes 2019-10-07 12:07:31 +02:00
marcos.alconada 8c0c392197 revert chanegd 2019-10-07 11:39:06 +02:00
marcos.alconada 80e6d70b31 revert style 2019-10-07 11:29:42 +02:00
marcos.alconada a9e8b1113e add default comments when change owner or status on events 2019-10-07 11:15:25 +02:00
artica 745971dfa6 Auto-updated build strings. 2019-10-07 00:01:06 +02:00
artica 936ce0ee26 Auto-updated build strings. 2019-10-06 00:01:06 +02:00
artica d0dead58f0 Auto-updated build strings. 2019-10-05 00:01:09 +02:00
fbsanchez a4cff9770f Collaborative session @manuel.montes pagination fix in datatables (hide when only 1 page) 2019-10-04 14:17:14 +02:00
Daniel Rodriguez bfe32a5aed Merge branch 'ent-4699-Revision-completa-de-informes-Wizard-en-Meta' into 'develop' 
Fixed bug in meta serialize data

See merge request artica/pandorafms!2773
 2019-10-04 14:04:17 +02:00
Daniel Rodriguez 658d71568a Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop' 
the itil type is removed in the report types

See merge request artica/pandorafms!2757
 2019-10-04 13:55:54 +02:00
Daniel Rodriguez 915edd455d Merge branch 'ent-4098-historical_data-report-no-definido-para-metaconsola' into 'develop' 
Fixed historical_data report in metaconsole

See merge request artica/pandorafms!2722
 2019-10-04 13:53:29 +02:00
Tatiana Llorente 305d74878c Changed title of csv in events - #4625 2019-10-04 11:51:30 +02:00
artica cc239e5e68 Auto-updated build strings. 2019-10-04 00:01:09 +02:00
marcos.alconada 2938435988 fixed minor error 2019-10-03 17:46:26 +02:00
Daniel Rodriguez 5f463e51b8 Merge branch '4689-mostrar-instrucciones-en-la-vista-de-eventos' into 'develop' 
Fixed issue with instructions in events view

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

See merge request artica/pandorafms!2710
 2019-10-03 16:41:15 +02:00
Kike b25c9ca793 Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos 
Conflicts:
	pandora_console/include/functions_events.php
 2019-10-03 15:59:15 +02:00
Alejandro Fraguas e42932ad19 Merge branch 'ent-4543-Bug-en-Graficas-Personalizadas-con-Average-series-Visual' into 'develop' 
fixed summatory series custom graph

See merge request artica/pandorafms!2754
 2019-10-03 13:38:18 +02:00
Alejandro Fraguas e174f8dda9 Merge branch 'ent-4544-bug-custom-graph-csv-export' into 'develop' 
Fixed CSV custom graphs export

See merge request artica/pandorafms!2694
 2019-10-03 12:59:30 +02:00
artica 21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
marcos.alconada 2ea20c1605 fixed visual error 2019-10-02 14:42:51 +02:00
artica 8e204605e5 Auto-updated build strings. 2019-10-02 00:01:07 +02:00
Marcos Alconada f1d20d56e7 Update functions_ui.php 2019-10-01 16:26:22 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
manuel 454750aefe Fixed bugs in metaconsole reports 2019-10-01 12:46:09 +02:00
Jose Gonzalez f55b2ce80f Improved truncate system and solved issue 2019-10-01 11:22:25 +02:00
artica c600f74ee2 Auto-updated build strings. 2019-10-01 00:01:06 +02:00
Jose Gonzalez 5294e2f627 Now the supervisor control all servers and not only one 2019-09-30 15:40:40 +02:00
manuel d566da6fb1 Fixed bug in meta serialize data 2019-09-30 15:33:44 +02:00
Jose Gonzalez d878958502 Added notify when Console and Server have version mismatch 2019-09-30 12:48:46 +02:00
artica b072bb5314 Auto-updated build strings. 2019-09-30 00:01:06 +02:00
artica 7ae5a8e5be Auto-updated build strings. 2019-09-29 00:01:06 +02:00
artica 15752c10ef Auto-updated build strings. 2019-09-28 00:01:08 +02:00
Kike dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
marcos.alconada 4c93ca3d60 fixed minor error 2019-09-27 12:07:40 +02:00
artica dc3dd1cffa Auto-updated build strings. 2019-09-27 00:01:09 +02:00
marcos.alconada cc18d5d1ed Fixed Error 2019-09-26 17:51:26 +02:00
Jose Gonzalez 5fdf65c440 Modified the mode of creation of agents with API 2019-09-26 17:33:51 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
Daniel Rodriguez c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop' 
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
 2019-09-26 14:34:50 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Luis Calvo 8284dfc44f Removed item agent/modules from templates 2019-09-26 10:32:36 +02:00
alejandro-campos ad01cd0303 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-26 09:48:13 +02:00
alejandro-campos 91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
artica 0dd0c4c36d Auto-updated build strings. 2019-09-26 00:01:08 +02:00
Tatiana Llorente 5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
marcos.alconada 93941f334a the itil type is removed in the report types 2019-09-25 16:12:57 +02:00
Tatiana Llorente 84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 
Conflicts:
	pandora_console/extras/mr/32.sql
 2019-09-25 10:50:31 +02:00
Daniel Rodriguez e03e83d565 Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop' 
fixed error percentil label

See merge request artica/pandorafms!2734
 2019-09-25 10:27:13 +02:00
artica 0a6c5352e6 Auto-updated build strings. 2019-09-25 00:01:10 +02:00
fbsanchez 746f817fe4 Windows: Revisión general Pandora - Discovery 2019-09-24 19:07:55 +02:00
Daniel Barbero Martin 43aa13b4e5 fixed summatory series custom graph 2019-09-24 17:39:11 +02:00
Luis Calvo c93c29fd59 Added recursion to api_get_all_agents 2019-09-24 16:37:53 +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
Kike 4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
Daniel Rodriguez 8e728eed6b Merge branch 'ent-4632-alineamiento-erroneo-en-los-headers-y-footer-con-reported-pdf' into 'develop' 
changed style on tables pdf report

See merge request artica/pandorafms!2718
 2019-09-24 12:33:46 +02:00
Daniel Rodriguez 2798512208 Merge branch 'ent-4680-fallos-en-los-reports-de-eventos' into 'develop' 
Fixed bug in report items

See merge request artica/pandorafms!2750
 2019-09-24 12:06:14 +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
artica 1d58e25a88 Auto-updated build strings. 2019-09-24 00:01:11 +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 6aa0824390 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 16:59:55 +02:00
alejandro-campos b8e1caba9d minor fixes 2019-09-23 16:59:16 +02:00
Tatiana Llorente 3bfa7fb596 Added ACL in integria tabs 2019-09-23 16:56:29 +02:00
Daniel Maya 4e47aede4c Fixed modules_get_relations 2019-09-23 16:55:43 +02:00
manuel b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
alejandro-campos 8d2820df37 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 15:17:22 +02:00
alejandro-campos f73cd80336 minor changes in integria integration 2019-09-23 15:16:31 +02:00
Tatiana Llorente 59eed5f1af Minor fixes - #4644 2019-09-23 15:09:52 +02:00
Tatiana Llorente 51a1d7c0b7 Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-23 13:18:08 +02:00
Tatiana Llorente f9a903319c Adding tabs and new functions - #4644 2019-09-23 13:14:20 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
Daniel Rodriguez 596bd6a566 Merge branch 'ent-4667-aadcm-peta-la-ejecucion-de-tareas-programadas' into 'develop' 
web2image control phantomjs flow

See merge request artica/pandorafms!2739
 2019-09-23 11:40:08 +02:00
artica 2543f54413 Auto-updated build strings. 2019-09-23 00:01:17 +02:00
artica b763650177 Auto-updated build strings. 2019-09-22 00:01:06 +02:00
artica 27d8c5025e Auto-updated build strings. 2019-09-21 00:01:09 +02:00
Alejandro Fraguas 0418c86867 Merge branch 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' into 'develop' 
pandora HA review

See merge request artica/pandorafms!2654
 2019-09-20 13:57:03 +02:00
alejandro-campos be3de8dcfb Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-20 12:45:22 +02:00
alejandro-campos 0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Tatiana Llorente 375bfca6ff New view - Dashboard details of Integria IMS tickets - #4644 2019-09-20 12:27:36 +02:00
Daniel Rodriguez 409ac061e0 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop' 
Ent 4047 simplificacion de la configuracion del sistema de email

See merge request artica/pandorafms!2712
 2019-09-20 11:57:58 +02:00
Kike 279b360236 Fixed open and enterprise network map migration 2019-09-20 10:13:09 +02:00
artica d8ab1defcb Auto-updated build strings. 2019-09-20 00:01:09 +02:00
Daniel Rodriguez 28559f4fcb Merge branch 'ent-4435-consola-visual-host-alive-keep-alive' into 'develop' 
Add new visual console Host Alive Keep Alive

See merge request artica/pandorafms!2701
 2019-09-19 16:10:33 +02:00
manuel 43eb928aa8 Fixed csv reports download 2019-09-19 12:59:51 +02:00
fbsanchez 6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-19 10:18:15 +02:00
artica 14f73f147f Auto-updated build strings. 2019-09-19 00:01:10 +02:00
Tatiana Llorente 8acdde9f3a Added date filter - #4642 2019-09-18 18:19:29 +02:00
fbsanchez 42c0fa9a5a web2image control phantomjs flow 2019-09-18 16:58:02 +02:00
Tatiana Llorente eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Daniel Barbero Martin 056bbb7348 fixed minor error 2019-09-18 13:16:05 +02:00
Daniel Barbero Martin 84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
artica 47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +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 979f7beca4 created ajax file to manage incident fields autocompletion 2019-09-17 13:41:21 +02:00
alejandro-campos 87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente 326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +02:00
Tatiana Llorente 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
Daniel Rodriguez 1ad8c6fe2e Merge branch 'ent-4280-Nombres-duplicados-SNMP-console-y-trap-generator-en-ACL-Enterprise' into 'develop' 
Fixed duplicated names - #4280

See merge request artica/pandorafms!2658
 2019-09-17 10:47:05 +02:00
Alejandro Fraguas d9b697d076 Merge branch 'ent-4635-8710-Monitor-Report-informes-muestra-el-dato-al-reves' into 'develop' 
Fixed bug in item type monitor report

See merge request artica/pandorafms!2726
 2019-09-17 09:48:15 +02:00
artica 15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
artica 2e121e2cc5 Auto-updated build strings. 2019-09-16 00:01:08 +02:00
artica 05eeb6f3d2 Auto-updated build strings. 2019-09-15 00:01:08 +02:00
artica bc36ed132d Auto-updated build strings. 2019-09-14 00:01:23 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
Tatiana Llorente 89253f4111 Added option for custom delimiter in export csv for datatables - #4623 2019-09-13 10:27:14 +02:00
manuel 00fc4c9238 Fixed bug in item type monitor report 2019-09-13 09:39:09 +02:00
Tatiana Llorente e16855396a Merge remote-tracking branch 'origin/develop' into ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla 
Conflicts:
	pandora_console/include/functions_reporting.php
 2019-09-13 09:24:24 +02:00
artica 2f45d3d6ec Auto-updated build strings. 2019-09-13 00:01:11 +02:00
Alejandro Fraguas 3a85b434ca Merge branch 'ent-4558-8584-intracom-el-pdf-generado-desde-custom-report-es-ilegible-si-la-tabla-tiene-muchas-filas' into 'develop' 
Fixed max,min,avg report

See merge request artica/pandorafms!2720
 2019-09-12 17:29:09 +02:00
Daniel Maya 3d8486659e Fixed period in template 2019-09-12 12:52:40 +02:00
Daniel Maya 7bacb869f2 Fixed historical_data report in metaconsole 2019-09-12 12:02:28 +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
artica 602c9ccb5e Auto-updated build strings. 2019-09-12 00:01:26 +02:00
Daniel Maya d9dc03dd91 Fixed max,min,avg report 2019-09-11 18:08:40 +02:00
Tatiana Llorente 3f49988a19 Fixed bug in max, min and avg value in table of reports - #4545 2019-09-11 17:57:16 +02:00
marcos.alconada b9b4230a6e changed style on tables pdf report 2019-09-11 12:20:09 +02:00
Alejandro Fraguas a9e6409cf9 Merge branch 'ent-4587-Limpieza-de-sesiones' into 'develop' 
delete session open by api calls

See merge request artica/pandorafms!2691
 2019-09-11 09:40:18 +02:00
artica fdef0b5188 Auto-updated build strings. 2019-09-11 00:01:10 +02:00
Tatiana Llorente c842c96d08 Fixed duplicated names - #4280 2019-09-10 12:19:53 +02:00
Alejandro Fraguas b97080f13c Merge branch 'ent-4275-notificaciones-correo-no-escribe-bien-url' into 'develop' 
Added ui_get_full_url in all links

See merge request artica/pandorafms!2703
 2019-09-10 12:18:52 +02:00
Tatiana Llorente b198700172 Fixed duplicated names - #4280 2019-09-10 12:18:17 +02:00
alejandro-campos 93b9c76f58 Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-10 10:50:53 +02:00
artica 16912732d2 Auto-updated build strings. 2019-09-10 00:01:08 +02:00
marcos.alconada 83e5c14b1d add condition in query 2019-09-09 12:54:16 +02:00
artica 5526bb49ed Auto-updated build strings. 2019-09-09 00:01:07 +02:00
artica f088f47605 Auto-updated build strings. 2019-09-08 00:01:06 +02:00
artica 3680555bae Auto-updated build strings. 2019-09-07 00:01:10 +02:00
Daniel Rodriguez da7811953c Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop' 
Added mr and uncommented code

See merge request artica/pandorafms!2558
 2019-09-06 13:38:11 +02:00
artica ae474a2731 Auto-updated build strings. 2019-09-06 00:01:10 +02:00
Daniel Rodriguez d02f3621f3 Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' 
Removed autofill proxi in auth server

See merge request artica/pandorafms!2361
 2019-09-05 18:29:43 +02:00
Daniel Maya 86cf025317 Fixed some errors in visual console 2019-09-05 11:58:15 +02:00
fbsanchez 315d9728ec quick fix short news titles 2019-09-05 10:54:14 +02:00
artica a4739e4891 Auto-updated build strings. 2019-09-05 00:01:07 +02:00
Jose Gonzalez bb25679344 Added ui_get_full_url in all links 2019-09-04 14:12:38 +02:00
fbsanchez d0e6f0dbae Merge remote-tracking branch 'origin/develop' into ent-4190-mejoras-para-el-menu-de-gestionar-ha 2019-09-04 12:07:56 +02:00
artica 61c75118f2 Auto-updated build strings. 2019-09-04 00:01:10 +02:00
Daniel Rodriguez 8493ec20eb Merge branch 'ent-4580-8639-errores-al-generar-informes-dinamicos' into 'develop' 
Fixed date limit in historical_data

See merge request artica/pandorafms!2695
 2019-09-03 18:37:55 +02:00
Daniel Rodriguez f126b8b2a2 Merge branch 'ent-4503-XML-bloquea-vista-101-de-consola' into 'develop' 
Escape the double quotes that may have the name of the module - #4503

See merge request artica/pandorafms!2680
 2019-09-03 17:09:21 +02:00