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

14885 Commits

Author SHA1 Message Date
daniel 179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017" 
This reverts commit 78bb583824.
 2017-07-28 12:46:17 +02:00
vgilc 94f6683c16 Merge branch '1114-En-la-vista-de-agente-modulo-se-distorsionan-las-imágenes-2' into 'develop' 
Change agent / module icons height a width - #1114

See merge request !659
 2017-07-28 10:25:14 +02:00
vgilc 9c534ce2dc Merge branch '1127-Elementos-desplazados-en-mapas-GIS-con-Google-maps-dev' into 'develop' 
Expand layer

See merge request !685
 2017-07-28 10:24:44 +02:00
vgilc 9a791dc0a5 Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop' 
Added some fixes to reset pass feature

See merge request !677
 2017-07-28 10:23:31 +02:00
vgilc ca43066ce8 Merge branch '1085-Añadir-sección-Description-a-HTML-view-meta-enterprise-open' into 'develop' 
Add report info option in metaconsole 7 open - #1085

See merge request !687
 2017-07-28 10:22:42 +02:00
vgilc e2a175327e Merge branch '1140-Gráficas_con_entities' into 'develop' 
fixed errors entities in mail

See merge request !682
 2017-07-28 10:21:04 +02:00
vgilc 333171c2b6 Merge branch '1124-4288-agrupar-graficas-combinadas-ii_open' into 'develop' 
fixed errors in graph container

See merge request !688
 2017-07-28 10:19:15 +02:00
vgilc f0afe8431f Merge branch '1120-Nombre-de-agente-en-mapas-GIS-dev' into 'develop' 
Change agent name by alias in gis map

See merge request !678
 2017-07-28 10:16:27 +02:00
vgilc b745bfb884 Merge branch '597-Optimizacion_query_pandora_server' into 'develop' 
fixed query in server

See merge request !694
 2017-07-28 10:14:19 +02:00
artica 55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +02:00
vgilc 3b6e05d0f5 Merge branch '1117-module-macros-in-module-agent-final-mix-dev' into 'develop' 
Added a last fix

See merge request !696
 2017-07-27 12:46:09 +02:00
Arturo Gonzalez 02ce575d9f Added a last fix 2017-07-27 12:39:38 +02:00
vgilc 2cd4c1da7d Merge branch '1117-module-macros-in-module-agent-again-dev' into 'develop' 
Added some changes about update modules from local component with macros

See merge request !695
 2017-07-27 11:24:20 +02:00
Arturo Gonzalez 39f4b48d84 Added some changes about update modules from local component with macros 2017-07-27 11:08:19 +02:00
daniel 8252362879 fixed query in server 2017-07-27 09:33:52 +02:00
artica 9d6bd697a7 Auto-updated build strings. 2017-07-27 00:01:13 +02:00
artica a9d76e2748 Updated version and build strings. 2017-07-26 17:03:41 +02:00
vgilc e0e17fb4dd Merge branch '1157-No-se-guarda-token-Query-History-Database-en-informe-SQL-2' into 'develop' 
Adapt historical_db checkbox for sql reports to sql templates - #1157

See merge request !693
 2017-07-26 13:58:18 +02:00
enriquecd 240b6e017f Adapt historical_db checkbox for sql reports to sql templates - #1157 2017-07-26 13:50:55 +02:00
vgilc 5bdb095510 Merge branch '1117-module-macros-in-module-agent-dev' into 'develop' 
Changed some lines in configurar_agente

See merge request !692
 2017-07-26 13:48:36 +02:00
Arturo Gonzalez 82b6904289 Changed some lines in configurar_agente 2017-07-26 13:36:42 +02:00
artica 729503f509 Auto-updated build strings. 2017-07-26 00:01:13 +02:00
vgilc a2d15f9f34 Merge branch '1129-new-events-bar-in-metaconsole-dev' into 'develop' 
1129 new events bar in metaconsole dev

See merge request !690
 2017-07-25 10:45:10 +02:00
Arturo Gonzalez 836cc384e9 Added good colours to meta tactical events bar 2017-07-25 08:36:21 +02:00
artica daa952649b Auto-updated build strings. 2017-07-25 00:01:13 +02:00
Arturo Gonzalez 9ddb47741f Added new events bar to meta 2017-07-24 16:34:22 +02:00
vgilc bb8a8daddf Merge branch '663-Anadir_algun_tipo_de_elemento_o_icono_para_saber_cuando_es_un_agente_de_red,_satelite_o_software' into 'develop' 
add new field table view agents for type of agent

See merge request !689
 2017-07-24 15:59:48 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
vgilc 65a1ebae77 Merge branch '375_Agente_xml_buffer_y_modo_secundario_always' into 'develop' 
fixed errors in agent buffered always

See merge request !686
 2017-07-24 11:11:01 +02:00
Ramon Novoa 17229cbcd7 Add a script to count .data files by agent. 2017-07-24 11:09:41 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
artica f3d6d7262e Auto-updated build strings. 2017-07-24 00:01:17 +02:00
artica c51cf9774f Auto-updated build strings. 2017-07-23 00:01:13 +02:00
artica b5caec31b5 Auto-updated build strings. 2017-07-22 00:01:45 +02:00
enriquecd 75a9a41a0b Add report info option in metaconsole 7 open - #1085 2017-07-21 14:57:03 +02:00
daniel aa5d18ff3f fixed errors in agent buffered always 2017-07-21 14:45:23 +02:00
Daniel Maya b4765a0a9a Expand layer 2017-07-21 12:19:56 +02:00
artica 1d35620ea6 Auto-updated build strings. 2017-07-21 00:01:16 +02:00
vgilc 74f3c15f91 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes-open-u-2' into 'develop' 
Fix labels - #1088

See merge request !684
 2017-07-20 15:58:57 +02:00
enriquecd ef007f8a6f Fix labels - #1088 2017-07-20 15:53:43 +02:00
vgilc 4185cc6687 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes-open-u' into 'develop' 
1088 macros en automatic combined graph plantillas de informes open u

See merge request !683
 2017-07-20 15:34:03 +02:00
Enrique Camargo 9cc461ec8b Update functions_reporting.php 2017-07-20 15:23:46 +02:00
enriquecd f88f375ea3 Filter agents by server automatico module graph and fix bug - #1088 2017-07-20 15:14:20 +02:00
daniel 66d9dd9d27 fixed errors entities in mail 2017-07-20 13:36:16 +02:00
vgilc 8971560f5d Merge branch '412-consola-visual-Módulo-imagen-2-size' into 'develop' 
Fix restore element width when press double click over data image simple_value - #412

See merge request !681
 2017-07-20 09:42:31 +02:00
artica 728fb7cc69 Auto-updated build strings. 2017-07-20 00:01:18 +02:00
enriquecd 31a8995176 Fix restore element width when press double click over data image simple_value - #412 2017-07-19 19:02:20 +02:00
Daniel Maya 5fd6c03917 Change agent name by alias in gis map 2017-07-19 12:32:45 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +02:00