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

3746 Commits

Author SHA1 Message Date
fermin831 0ec93011da Fixed security fail filling the plugin fields 2018-09-12 15:05:30 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
Alejandro Gallardo Escobar c20942f425 Now the status calculation can be configured for every visual console item 2018-09-05 15:25:19 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
nramon 862c1ae8a7 Merge branch '2063-Bug-cambio-hora-en-relojes-de-la-Consola-visual-dev' into 'develop' 
Fixed issue with timezone in visual console editor

See merge request artica/pandorafms!1724
 2018-09-03 15:47:55 +02:00
danielmaya fd27b6d445 Fixed issue with timezone in visual console editor 2018-09-03 14:43:21 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
vgilc 0aeef6367a Merge branch '1958-Informe-agrupado-de-grupo' into 'develop' 
fixed recursion option in custom report's item editor

See merge request artica/pandorafms!1719
 2018-08-29 08:26:58 +02:00
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
samucarc dae0021db9 Changed soft graphs hint 2018-08-28 11:02:27 +02:00
manuel.montes e59f123d19 Fixed bug in agent-manager 2018-08-28 10:23:25 +02:00
vgilc 266dba4600 Merge branch '2654-No-se-puede-editar-agente-y-no-aparece-QR2' into 'develop' 
Fixed bug in agent manager

See merge request artica/pandorafms!1711
 2018-08-27 09:15:11 +02:00
vgilc 69545d7ed8 Merge branch 'ent-2153-vistas-en-las-que-no-se-ha-tenido-en-cuenta-los-grupos-secundarios' into 'develop' 
Ent 2153 vistas en las que no se ha tenido en cuenta los grupos secundarios

See merge request artica/pandorafms!1708
 2018-08-27 09:10:00 +02:00
manuel.montes 5d495226d3 Fixed bug in agent manager 2018-08-23 08:28:02 +02:00
fermin831 399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +02:00
vgilc 69513fdc63 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario-3' into 'develop' 
Added secondary groups and no hierarchy documentation

See merge request artica/pandorafms!1700
 2018-08-21 08:34:53 +02:00
fermin831 b597c936e8 [Secondary groups] Avoid duplicates in manage agents 2018-08-20 12:02:34 +02:00
fermin831 168d081268 [Secondary groups] Added to manage agents view 2018-08-20 11:38:01 +02:00
fermin831 90e3a423c4 Added secondary groups and no hierarchy documentation 2018-08-17 15:45:59 +02:00
Alejandro Gallardo Escobar 1de746ab69 Fixed a problem with the autocomplete agent cache 2018-08-17 15:03:24 +02:00
Alejandro Gallardo Escobar 3320bf1fb2 Now the group item addition to the GIS layer is disabled if it is already in the list 2018-08-17 14:20:16 +02:00
Alejandro Gallardo Escobar 3edd42a453 Bug fixes on the gis map layer configuration 2018-08-17 14:10:47 +02:00
Alejandro Gallardo Escobar 8a5495a283 Merge branch 'develop' into ent-2335-gis-group-items 2018-08-17 11:17:29 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
fermin831 df46772733 [Secondary groups] Fixed modules edition problems 2018-08-16 14:55:48 +02:00
fermin831 304a3b40c2 Fixed overwrite primery group if user has no permissions for this group on update agent 2018-08-16 12:48:44 +02:00
fermin831 54803de45d Added missing enterprise_hook in get cps 2018-08-13 16:43:01 +02:00
Alejandro Gallardo Escobar dd6b9aed81 Refactored the layer configuration of the GIS maps to fix some bugs 2018-08-13 12:42:30 +02:00
fermin831 13ad7b4fc7 Fixed group all alert templates visualization 2018-08-13 11:24:32 +02:00
vgilc 9dd9ad71a8 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario' into 'develop' 
2609 cambios en la forma de gestionar grupos secundarios en la vista de usuario

See merge request artica/pandorafms!1665
 2018-08-13 10:28:14 +02:00
fbsanchez 8f329698d0 Vconsole templates, fixed permissions 2018-08-10 18:16:31 +02:00
fermin831 01b8ec8acb Deleted some unwanted traces 2018-08-08 13:20:15 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
vgilc fdedc78b24 Merge branch '2415-Plantillas_de_Consola_visual' into 'develop' 
2415 plantillas de consola visual

See merge request artica/pandorafms!1652
 2018-08-02 13:22:26 +02:00
vgilc 58aecc9039 Merge branch '2598-Error-de-permisos-en-acciones-de-alertas-dev' into 'develop' 
Fixed permissions in alert_actions

See merge request artica/pandorafms!1655
 2018-08-02 13:08:54 +02:00
daniel c78ac2f4d5 fixed minor error 2018-08-02 13:07:40 +02:00
daniel c3413bbf62 fixed minor error 2018-08-02 13:06:43 +02:00
danielmaya a9bb538e1a Fixed permissions in alert_actions 2018-08-02 12:47:42 +02:00
daniel 9d5004efbf fixed minor error 2018-08-02 11:07:22 +02:00
daniel ef2ff49504 mv enterprise visual console template 2018-08-02 11:03:13 +02:00
daniel d5f0429390 mv enterprise templates visual console 2018-08-02 10:57:00 +02:00
fbsanchez 4968ff3878 Included library from enterprise 2018-08-02 10:07:47 +02:00
daniel 2a7e710b9e fixed errors in template wizar visual console 2018-08-01 13:51:45 +02:00
daniel 62d2b509ad fixed minor error 2018-08-01 13:21:04 +02:00
daniel dc56e0712c delete template visual console 2018-08-01 13:20:20 +02:00
daniel 49aeb349eb create form templates visual console 2018-08-01 13:10:10 +02:00
daniel 92911e8fb8 fixed js wizard template visual console 2018-08-01 12:24:27 +02:00