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

695 Commits

Author SHA1 Message Date
danielmaya 17586472c8 Fixed connection to historical db 2018-02-19 12:04:02 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola 
Conflicts:
	pandora_console/include/functions_users.php
 2018-01-30 17:56:30 +01:00
fbsanchez 34c424953b Revised: dbuncompress 2018-01-25 12:41:44 +01:00
fbsanchez 2e1ab72a21 Reapplied #1000 solution 2018-01-24 17:28:00 +01:00
daniel 5d61ff5056 fixed error in ACL 2018-01-12 14:17:48 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
vgilc 8ea951a4bb Merge branch 'ent-1520-error-en-grafica-de-agente-no-dinamica' into 'develop' 
Fixed non interactive status graphs

See merge request artica/pandorafms!1063
 2017-12-21 10:48:17 +01:00
vgilc 60486c8a1e Merge branch '1659-Informe-de-eventos-de-módulos-en-plantillas-de-informes-de-la-metaconsola--Carrefour]-dev' into 'develop' 
Fixed reporting_event_report_module in metaconsole

See merge request artica/pandorafms!1128
 2017-12-21 09:53:47 +01:00
danielmaya b65d649750 Fixed reporting custom graph 2017-12-18 13:12:29 +01:00
enriquecd 628d5d2c62 Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open 2017-11-30 12:09:53 +01:00
vgilc 976fd7d315 Merge branch '1492-ACL-no-permiten-buscar-en-Monitor-View-dev' into 'develop' 
Fixed search in status monitor with ACL enterprise

See merge request artica/pandorafms!949
 2017-11-29 15:39:37 +01:00
danielmaya a3e47fb977 Fixed reporting_event_report_module in metaconsole 2017-11-28 15:56:46 +01:00
fermin831 ff58a171e9 Fixed non interactive status graphs 2017-11-14 12:20:28 +01:00
danielmaya 14fe06e536 Fixed pagination errors with free search 2017-11-13 12:07:53 +01:00
vgilc 3493b9c15c Revert "code backup" 
This reverts commit b9851a3a71
 2017-11-13 10:21:38 +01:00
vgilc 86a5599aad Revert "Fixed traces" 
This reverts commit 173efae22d
 2017-11-13 10:20:58 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
enriquecd 74fbd11628 Fix maximum data column - #654 2017-11-06 16:15:06 +01:00
danielmaya 173efae22d Fixed traces 2017-11-03 13:38:59 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop' 
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
 2017-11-02 15:35:38 +01:00
danielmaya 33bff02978 clear entities 2017-11-02 13:03:58 +01:00
vgilc a7e1e877e7 Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480-cherry' into 'develop' 
654 cambios en informes de maximo minimo y media 4480 cherry

See merge request artica/pandorafms!994
 2017-10-31 12:13:55 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
nramon 4e672cc758 Merge branch '655-module_data_increment_new_type_of_report' into 'develop' 
655 module data increment new type of report

See merge request artica/pandorafms!519
 2017-10-31 08:18:26 +01:00
Daniel Maya 718a2dbaff Fixed in visual map 2017-10-30 17:57:47 +01:00
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'" 
This reverts merge request !871
 2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop' 
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
 2017-10-30 15:51:51 +01:00
vgilc 0604dfedbf Merge branch '1433-Mensaje-No-data-to-show-diferentes-en-graficas-de-modulos-y-de-interfaces' into 'develop' 
Change image_problem no data sign to image_problem_area_small - #1433

See merge request artica/pandorafms!908
 2017-10-26 11:13:31 +02:00
enriquecd 138f187b51 Add hide no data item checkbox to report templates - open - #1326 2017-10-18 17:29:10 +02:00
enriquecd bd47d5362a Change image_problem no data sign to image_problem_area_small - #1433 2017-10-09 18:31:42 +02:00
fermin831 4530f2213c Fixed last value on general template reports and individual reports 2017-10-06 15:45:40 +02:00
enriquecd 788265713e Graph and table mode for max, min and avg reports an template reports - #654 2017-10-02 18:23:26 +02:00
daniel 00f779817d fixed errors in report interfaces 2017-09-25 13:26:04 +02:00
daniel feae62f11c add tip reports simple graph 2017-09-22 11:39:54 +02:00
Arturo Gonzalez f5e1410406 Added fix to macros in pdf view 2017-09-20 17:09:50 +02:00
Arturo Gonzalez 3f253b9db4 Added restriction when report comes from template 2017-09-20 15:44:30 +02:00
Arturo Gonzalez 36c13e44c6 Added some changes to label and name macros in custom graphs 2017-09-20 10:48:06 +02:00
Arturo Gonzalez e3c01374b1 Added changes to meta report templates 2017-09-18 10:18:38 +02:00
Arturo Gonzalez e3d42a878a Added changes to NODE 2017-09-15 13:21:51 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
vgilc c09033ae03 Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop' 
allow UNION sql reports

See merge request !704
 2017-08-18 13:01:53 +02:00
vgilc aa54f0cc9a Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 
fixed errors metaconsole reports serialize data

See merge request !712
 2017-08-14 12:24:43 +02:00
daniel c4171ac248 fixed errors metaconsole reports serialize data 2017-08-03 17:09:27 +02:00
Daniel Maya 78d4eb68bc Fixed problem in node 2017-08-03 13:29:18 +02:00
Daniel Maya 0932004781 Fixed label in automatic graph in node 2017-08-03 13:13:34 +02:00
Daniel Maya 362ab94781 Added label in automatic graph 2017-08-03 12:41:47 +02:00
daniel 20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
enriquecd ef007f8a6f Fix labels - #1088 2017-07-20 15:53:43 +02:00
Enrique Camargo 9cc461ec8b Update functions_reporting.php 2017-07-20 15:23:46 +02:00