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

7195 Commits

Author SHA1 Message Date
artica daa952649b Auto-updated build strings. 2017-07-25 00:01:13 +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
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
artica 1d35620ea6 Auto-updated build strings. 2017-07-21 00:01:16 +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
enriquecd f88f375ea3 Filter agents by server automatico module graph and fix bug - #1088 2017-07-20 15:14:20 +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
vgilc ef0e6a2093 Merge branch '713-Asignar-políticas-a-grupos-dev' into 'develop' 
713 asignar políticas a grupos dev

See merge request !667
 2017-07-19 09:55:10 +02:00
artica b8b6937284 Auto-updated build strings. 2017-07-19 00:01:16 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
artica d65ad2693e Auto-updated build strings. 2017-07-18 00:01:17 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop' 
Add data image option to simple data visual console element - #412

See merge request !584
 2017-07-17 17:03:04 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop' 
Added refresh by user

See merge request !607
 2017-07-17 10:54:06 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-07-17 10:39:20 +02:00
artica 3fb887f516 Auto-updated build strings. 2017-07-17 00:01:15 +02:00
artica c5c748c831 Auto-updated build strings. 2017-07-16 00:01:15 +02:00
artica 8f88f87203 Auto-updated build strings. 2017-07-15 00:01:15 +02:00
artica 65cbbd1bae Auto-updated build strings. 2017-07-14 00:01:19 +02:00
vgilc f8a1b77158 Merge branch '1115-Redimensiónde-los-iconos-y-texto-en-mapas-GIS' into 'develop' 
Hold mark labels font size when autorefresh and fix drag map font size bug - #1115

See merge request !660
 2017-07-13 17:16:49 +02:00
Daniel Maya 27077dad6f Resolving conflicts 2017-07-13 15:23:22 +02:00
Enrique Camargo 0ff56b0856 Update openlayers.pandora.js 2017-07-13 12:07:53 +02:00
vgilc 38b42a26a2 Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop' 
845 mejoras en snmp browser dev

See merge request !602
 2017-07-13 12:07:46 +02:00
vgilc fb57ea216e Merge branch '997-Active-SNMP-filters-in-snmp-console-dev' into 'develop' 
Added active filters to snmp console

See merge request !611
 2017-07-13 12:02:39 +02:00
vgilc 3e527dfec4 Merge branch '1003-No-se-muestra-correctamente-el-histórico-de-módulos-log4x-dev' into 'develop' 
Fixed sql error in tagente_datos_log4x

See merge request !576
 2017-07-13 11:50:03 +02:00
vgilc ab1980b5c8 Merge branch '977-change-format-in-module-data-dev' into 'develop' 
Changed format

See merge request !560
 2017-07-13 11:48:26 +02:00
vgilc 5711e3ae75 Merge branch '1017-Re-implementacion-de-ACL-Enterprise-open' into 'develop' 
Use session and not exec sql if already exists acl perms in session - #1017

See merge request !624
 2017-07-13 11:36:13 +02:00
artica b0c2a9e25c Auto-updated build strings. 2017-07-13 00:01:16 +02:00
enriquecd c9219107bf Hold mark labels font size when autorefresh and fix drag map font size bug - #1115 2017-07-12 18:49:39 +02:00
vgilc f907f3cdb7 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes' into 'develop' 
Fix automatic combined graph macros in name and labels - #1088

See merge request !657
 2017-07-12 10:12:45 +02:00
artica 7536b1fd56 Auto-updated build strings. 2017-07-12 00:01:15 +02:00
enriquecd 39fb79bbb4 Fix automatic combined graph macros in name and labels - #1088 2017-07-11 18:22:25 +02:00
Daniel Maya 57f6ad097a update 2017-07-11 10:10:48 +02:00
Arturo Gonzalez 2402141c4f Changed text line 2017-07-11 10:04:26 +02:00
artica 2872686042 Auto-updated build strings. 2017-07-11 00:01:16 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
artica 7002f24586 Auto-updated build strings. 2017-07-10 00:01:15 +02:00
artica 6fff54b0f0 Auto-updated build strings. 2017-07-09 00:01:15 +02:00
artica f1520483fd Auto-updated build strings. 2017-07-08 00:01:21 +02:00
Arturo Gonzalez a9ca7b6a8d Added a virgensita de guadalupe fix to generate networkmaps in windows systems 2017-07-07 13:21:05 +02:00
vgilc c19aaa1d64 Merge branch '151-actualizar-el-cliente-de-ehorus' into 'develop' 
Replaced references to switch.ehorus.com with portal.ehorus.com.

See merge request !647
 2017-07-07 11:05:25 +02:00
vgilc 35d722a13f Merge branch 'upload-new-ehorus-bundle' into 'develop' 
Upload new ehorus buldle

See merge request !633
 2017-07-07 10:52:57 +02:00
vgilc e49c2351ae Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 
Fixed post process in Edit modules in bulk

See merge request !638
 2017-07-07 09:38:48 +02:00