7532 Commits

Author SHA1 Message Date
Arturo Gonzalez
4ce9a96b74 Fixed last timestamp in interface charts 2017-07-31 12:50:50 +02:00
vgilc
dc462550ef Merge branch 'reset_commit_acl_open' into 'develop'
Revert "Use session and not exec sql if already exists acl perms in session - #1017"

See merge request !697
2017-07-31 10:26:40 +02:00
artica
6a4a199c96 Auto-updated build strings. 2017-07-31 00:01:13 +02:00
artica
50c4419ef7 Auto-updated build strings. 2017-07-30 00:01:13 +02:00
artica
cc40fcccc2 Auto-updated build strings. 2017-07-29 00:01:14 +02:00
daniel
179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017"
This reverts commit 78bb583824ebe779b263852493d1e2a4144235b0.
2017-07-28 12:46:17 +02:00
artu30
14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev'
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
2017-07-28 10:30:17 +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
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
artica
55c70098ba Auto-updated build strings. 2017-07-28 00:01:13 +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
artica
729503f509 Auto-updated build strings. 2017-07-26 00:01:13 +02:00
Arturo Gonzalez
6b30accd11 Added new function to redirect with dbclick when fictinal have a map link 2017-07-25 15:38:28 +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
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
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
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
Daniel Maya
f060a2cdd8 Extended number of characters allowed 2017-07-19 16:12:09 +02:00
Arturo Gonzalez
5baa1ae559 Added styles to service map elements 2017-07-19 15:40:33 +02:00
Daniel Maya
06eadbaf81 Fixed urlencode in event popup 2017-07-19 10:52:01 +02:00
Arturo Gonzalez
1ff3202c43 Added the last things to the new vc item (module events) 2017-07-19 10:36:24 +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
Arturo Gonzalez
e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
2017-07-18 11:57:13 +02:00
Arturo Gonzalez
bec023dc4d Fixed meta event table in cli and api functions 2017-07-18 11:36: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