Commit Graph

6897 Commits

Author SHA1 Message Date
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
artica ead3556700 Auto-updated build strings. 2017-05-17 00:01:21 +02:00
artu30 1546e48e15 Merge branch 'develop' into '689-Change_translations_in_mr_and_um_section'
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
2017-05-16 11:57:58 +02:00
Arturo Gonzalez 0346b49f1e Fixed jquery request 2017-05-16 10:42:41 +02:00
artica 63cc6f5244 Auto-updated build strings. 2017-05-16 00:01:15 +02:00
artica 45239e4cdd Auto-updated build strings. 2017-05-15 00:01:14 +02:00
artica 31970c521d Auto-updated build strings. 2017-05-14 00:01:14 +02:00
artica afff44138c Auto-updated build strings. 2017-05-13 00:01:16 +02:00
artica 3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +02:00
vgilc 31bc5e08a1 Merge branch '787-help-in-cascade-protection-dev' into 'develop'
Changed help section in cascade protection help button and fixed help language.

See merge request !421
2017-05-11 12:12:08 +02:00
artica 46e16f65ea Auto-updated build strings. 2017-05-11 00:01:21 +02:00
artica 71f8f29107 Auto-updated build strings. 2017-05-10 00:01:15 +02:00
artica ce179c39aa Auto-updated build strings. 2017-05-09 00:01:18 +02:00
artica 3865f13f8f Auto-updated build strings. 2017-05-08 00:01:14 +02:00
artica 3935442574 Auto-updated build strings. 2017-05-07 00:01:14 +02:00
artica 2c56de48f8 Auto-updated build strings. 2017-05-06 00:01:15 +02:00
artica 02e1c6c8d2 Auto-updated build strings. 2017-05-05 00:01:17 +02:00
artica 96a13fe84c Auto-updated build strings. 2017-05-04 00:01:14 +02:00
artica 8b3102f29a Auto-updated build strings. 2017-05-03 00:01:14 +02:00
artica 026c498c46 Auto-updated build strings. 2017-05-02 00:01:14 +02:00
artica 186fc2422e Auto-updated build strings. 2017-05-01 00:01:14 +02:00
artica 17437c197f Auto-updated build strings. 2017-04-30 00:01:13 +02:00
artica 36dd55148a Auto-updated build strings. 2017-04-29 00:01:14 +02:00
artica 682b7938ab Auto-updated build strings. 2017-04-28 00:01:15 +02:00
Arturo Gonzalez ba312476e3 Changed help section in cascade protection help button and fixed help language. 2017-04-27 15:49:23 +02:00
fermin831 36aa71df56 Added macro _agentos_ to help actions 2017-04-27 10:14:50 +02:00
artica 7493da21cc Auto-updated build strings. 2017-04-27 00:01:16 +02:00
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
vgilc 1e5cf2d44e Merge branch '409-change-font-size-of-map-gis' into 'develop'
Gis Maps Feature: When scrolling in map, change font-size of labels.

See merge request !360
2017-04-25 16:27:37 +02:00
vgilc d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop'
Added macro _agentos_

See merge request !275
2017-04-25 16:18:00 +02:00
vgilc ea6afb3701 Merge branch '681-Añadir-control-flotante-a-vistas-fullscreen' into 'develop'
Added floating control in agents/modules, event list and snmp traps list

See merge request !351
2017-04-25 16:15:41 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
artica d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
enriquecd f2d52e80b6 Chango left margin in pie float - #99 2017-04-24 17:29:13 +02:00
enriquecd c7af5c3b07 Change default pie custom graph width size in visual console custom graph creator - #99 2017-04-24 16:09:09 +02:00
artica e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7.
2017-04-24 15:59:34 +02:00
artica 8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
enriquecd 7f927bfdd3 Change strings in minor release update manager / open / 2 - #486 2017-04-24 13:14:14 +02:00
artica 0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica 37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica 37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
artica f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
Arturo Gonzalez 4c07fe5d3f Added nodes regeneration in map group updates 2017-04-20 13:18:55 +02:00
artica dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
Enrique Camargo 6259a62095 Merge branch 'develop' into '486-Mejoras-visuales-de-las-ventanas-modales-de-las-MRs-open'
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
2017-04-19 11:39:57 +02:00
artica 43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
vgilc 6805dcf363 Merge branch '549-errores-en-dashboard-moviles' into 'develop'
Fixed a typo error

See merge request !382
2017-04-18 16:48:49 +02:00
m-lopez-f 3454490220 Fixed a typo error 2017-04-18 16:20:50 +02:00
vgilc 41e30eb39b Merge branch '546-widgets-de-dashboard-open' into 'develop'
Resolve jquery library bug (holagram dashboard) - #546

See merge request !289
2017-04-18 16:01:22 +02:00
vgilc 0d65afda8e Merge branch '549-errores-en-dashboard-moviles' into 'develop'
Fixed styles of diferents graphs in dashboards when active mobile version.

See merge request !306
2017-04-18 16:01:01 +02:00