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

11242 Commits

Author SHA1 Message Date
vgilc a8d3ea7454 Merge branch '678-estadísticas-de-eventos-con-gráficas-desiguales' into 'develop' 
Fixed size graphs in event_statistics

See merge request !340
 2017-04-25 16:17:12 +02:00
vgilc 8802f1cdca Merge branch '605-ayuda-descolocada-modulos-webserver' into 'develop' 
Fixed text overflow in help window

See merge request !332
 2017-04-25 16:16:29 +02:00
Arturo Gonzalez 8383552a1f Added minor changes to ux widget 2017-04-25 16:16:25 +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
vgilc 48939e10e7 Merge branch '716-delete_all_checkbox_in_report_items' into 'develop' 
Added checkbox to selet all items in report (to delete them)

See merge request !366
 2017-04-25 16:06:34 +02:00
vgilc dfd0bb38e8 Merge branch '672-change_forums_url_in_wellcome_window' into 'develop' 
Changed forums url in wellcome window

See merge request !343
 2017-04-25 16:05:34 +02:00
enriquecd 7ee4c77897 Change update manager offline icon - #783 2017-04-25 15:37:52 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
Arturo Gonzalez 078d5e4357 Added data donut to ux widget 2017-04-25 15:34:11 +02:00
Daniel Maya bd5cda07c4 deleted 1.sql 2017-04-25 10:28:46 +02:00
daniel 13e2f2d05b fixed error duplicate alert SNMP 2017-04-25 09:30:59 +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
daniel 8e481dc473 fixed errors in agent detail acl strict 2017-04-24 10:41:23 +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
Arturo Gonzalez a2cff4195f Added code to autocomplete with ux transactions 2017-04-21 14:32:31 +02:00
artica f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
Arturo Gonzalez b10f1f422f Added more restrictions to user dashboard function 2017-04-20 18:02:34 +02:00
Arturo Gonzalez 87f3798499 Added dashboards to "edit my user" section 2017-04-20 17:36:26 +02:00
Arturo Gonzalez 82530c9b59 Added external query to mr 2017-04-20 16:18:37 +02:00
Arturo Gonzalez 5b015dbcb9 Added new icon to meta mail setup and change mail message 2017-04-20 16:11:45 +02:00
Arturo Gonzalez d93fa1bb3f Added new option to enable and disable reset pass 2017-04-20 15:31:39 +02:00
Arturo Gonzalez 14a3a79eb3 Changed cod type 2017-04-20 15:00:24 +02:00
vanessa gil c3ccb00b2a new file. 2017-04-20 13:36:03 +02:00
Arturo Gonzalez 4c07fe5d3f Added nodes regeneration in map group updates 2017-04-20 13:18:55 +02:00
Arturo Gonzalez ad065e2464 Changed cron help message 2017-04-20 12:56:22 +02:00
Arturo Gonzalez 63254ac7e4 Move mail setup section to enterprise setup 2017-04-20 12:54:15 +02:00
Arturo Gonzalez bfa3b43ee7 Added changes to reset password system 2017-04-20 12:36:33 +02:00
Arturo Gonzalez a1f23af142 Added new setup menu to mail 2017-04-20 12:15:45 +02:00
m-lopez-f fcf3da2acf Remove temporality links to help. And in future chenge this help 2017-04-20 12:10:52 +02:00
Arturo Gonzalez df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00
Arturo Gonzalez e26dfcd466 Move code to enterprise section 2017-04-20 11:18:43 +02:00
Arturo Gonzalez 727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
artica dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
Arturo Gonzalez 4a4f52c459 Added send mail function 2017-04-19 17:29:22 +02:00
Arturo Gonzalez 48f7fa50dd Added error control and email handler 2017-04-19 16:04:24 +02:00
enriquecd b21b3cabf6 Not show scroll bar in config permission error dialog in index - #728 2017-04-19 15:10:55 +02:00
Arturo Gonzalez bd30625532 Added return to login button 2017-04-19 15:10:51 +02:00
Arturo Gonzalez 7011eee871 Added a new page to reset password, for now without code, only visual page and error control 2017-04-19 13:26:20 +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
Arturo Gonzalez 8531e9847b Added lost id to dynamic threshold select 2017-04-18 17:46:50 +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 f01639a34d Merge branch '404-conf-del-satelite-se-mete-en-dataserver' into 'develop' 
Fixed problems with remote config view files of conf about server and satellite.

See merge request !329
 2017-04-18 16:01:55 +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
vgilc 61e328afa7 Merge branch '579-se-pueden-crear-module-templates-vacías' into 'develop' 
Deleted white space when saving modules template

See merge request !314
 2017-04-18 16:00:44 +02:00
vgilc de97b5eeab Merge branch 'ent-671-fallo-en-el-migrate-de-la-6-a-la-7-en-tbackup' into 'develop' 
Drop addcol procedure if not exists

See merge request !374
 2017-04-18 15:55:35 +02:00
Daniel Maya 8f1d93c008 Support link changed in pandora enterprise 2017-04-18 11:46:57 +02:00
Arturo Gonzalez 29ad608ddb Added ; to query transaction 2017-04-18 11:41:51 +02:00
Arturo Gonzalez 97abef62c4 Added db field to mr 2017-04-18 11:39:46 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user 
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
 2017-04-18 11:28:02 +02:00
Daniel Maya 42c7a400f0 Changed name by alias when deleting agent 2017-04-18 10:42:23 +02:00
artica e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
enriquecd 1348256d1a Change sec url string in message section - #684 /4 2017-04-17 19:30:44 +02:00
enriquecd ee128242bc Change sec url string in message and vconsole section - #688 - 2 2017-04-17 18:51:59 +02:00
Daniel Maya f13085ed3a Changed agent name by agent alias 2017-04-17 14:45:42 +02:00
fermin831 bf368a155b Drop addcol procedure if not exists 2017-04-17 13:25:36 +02:00
vgilc 86a4ca2a80 Merge branch '581-Error-en-custom-graphs' into 'develop' 
When there is no custom graph redirects to the graph list

See merge request !363
 2017-04-17 09:47:11 +02:00
vgilc 8caaed72c0 Merge branch '519-Today_button_in_planned_downtime_datepicker' into 'develop' 
Added buttonpanel to set today in planned downtime datepicker

See merge request !365
 2017-04-17 09:21:07 +02:00
artica 9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica 98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica 5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica 3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
Arturo Gonzalez 23b9e7c08d Added checkbox to selet all items in report (to delete them) 2017-04-12 11:35:26 +02:00
artica b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
Arturo Gonzalez 055ab9040d Added buttonpanel to set today in planned downtime datepicker 2017-04-11 16:34:07 +02:00
Daniel Maya a81dcdcfc5 When there is no custom graph redirects to the graph list 2017-04-11 15:30:32 +02:00
artica ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
mlopez c316462802 Update public_console.php 2017-04-10 17:53:01 +02:00
m-lopez-f f8d3c8804e Gis Maps Feature: When scrolling in map, change font-size of labels. 2017-04-10 17:46:32 +02:00
Arturo Gonzalez 893707a024 Remove trace 2017-04-10 14:39:31 +02:00
Arturo Gonzalez 9cd99307dd Added selector in visual conf to select a csv divider 2017-04-10 13:58:42 +02:00
Arturo Gonzalez 41b49770ee Added new ranges to graph period 2017-04-10 11:10:32 +02:00
Arturo Gonzalez f05d687fb3 Added some modifications to implements a default filter by user in event section 2017-04-10 09:53:32 +02:00
vanessa gil db08e242d0 new file. 2017-04-10 08:54:41 +02:00
vanessa gil 301f357873 new file. 2017-04-10 08:54:41 +02:00
artica ea6deaea04 Auto-updated build strings. 2017-04-10 08:54:41 +02:00
vanessa gil 8065ca21a5 removed file. 2017-04-10 08:54:41 +02:00
artica b3d6575176 Auto-updated build strings. 2017-04-10 00:01:18 +02:00
artica 20caf87fd5 Auto-updated build strings. 2017-04-09 00:01:19 +02:00
artica 16b0bc83a1 Auto-updated build strings. 2017-04-08 00:01:18 +02:00
vgilc 5e4032e4de Merge branch '33-buscador-en-gestion-de-agentes-es-case-sensitive-integria-4398' into 'develop' 
Make case insensitive search bar in agent manager - #33

See merge request !320
 2017-04-07 12:52:17 +02:00
vgilc 553e58deba Merge branch '99-problemas-visualizacion-graficas-combinadas-tipo-gauge-bullet-chart-y-pie-chart-en-consolas-visuales' into 'develop' 
Filter custom graph size in  visual console editor, autoset size - #99

See merge request !287
 2017-04-07 12:51:37 +02:00
vgilc af13e0f31d Merge branch '101-fallo-en-el-filtro-de-eventos-en-el-filtrado-de-cadena-pandora7' into 'develop' 
Added safe output to free search at loading event filter

See merge request !298
 2017-04-07 12:51:00 +02:00
vgilc 999162f380 Merge branch '38-no-funciona-event-alerts-sobre-alertas-de-snmp-traps-integria-4383' into 'develop' 
Alert in sound console with snmp alerts events - #38

See merge request !291
 2017-04-07 12:50:31 +02:00
vgilc c3157f2aea Merge branch '106-faltan-los-no-iniciados-en-agents_get_status' into 'develop' 
Added not init state if there are no initialized modules

Closes #106

See merge request !309
 2017-04-07 12:49:53 +02:00
vgilc 7d5a8fd84e Merge branch '107-sell-en-network-components' into 'develop' 
Dont show "sell" message in manage_network_component header - #107

See merge request !312
 2017-04-07 12:48:57 +02:00
vgilc ca7d887bd4 Merge branch '108-tooltip-de-descripcion-cortado-por-comillas' into 'develop' 
Show quotes in module template managment items description - #108

See merge request !316
 2017-04-07 12:48:18 +02:00
vgilc 991bca7f6c Merge branch 'ent-402-plantilla-de-modulo-local-linux-zombie-processes-fallo' into 'develop' 
Modified Zombie processes local_component

See merge request !267
 2017-04-07 12:47:24 +02:00
vgilc ebec14322c Merge branch 'ent-449-umbrales-en-las-graficas-de-modulos' into 'develop' 
Fit thresholds on module graphs

See merge request !288
 2017-04-07 12:46:28 +02:00
vgilc 814db18d15 Merge branch 'cherry-pick-4563ef34' into 'develop' 
Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533

See merge request !264
 2017-04-07 12:44:47 +02:00
vgilc 78567fa588 Merge branch 'ent-554-informes-pdf-de-netflow-no-funcionan' into 'develop' 
Fixed pdf netflow reports

See merge request !294
 2017-04-07 12:42:07 +02:00
vgilc 9d7d4b9cad Merge branch '566-visual-console-graficas-de-area-y-creador-de-elementos-open' into 'develop' 
Adjust area graph position in vconsole dashboard / open - #566

See merge request !302
 2017-04-07 12:38:53 +02:00
vgilc ab70607156 Merge branch '562-problema-acls-politicas-7-open' into 'develop' 
Change sec param in policies section, gpolicies to gmodules / 7 / open - #562

See merge request !301
 2017-04-07 12:37:35 +02:00
vgilc d3ac848caf Merge branch 'ent-671-fallo-en-el-migrate-de-la-6-a-la-7-en-tbackup' into 'develop' 
Added procedure to avoid migrate fail in tbackup

See merge request !328
 2017-04-07 12:17:47 +02:00
Daniel Maya 6d1dc162e8 Added floating control in agents/modules, event list and snmp traps list 2017-04-07 12:08:42 +02:00
vanessa gil ef95602157 delete file 2017-04-07 10:48:28 +02:00
artica 6b0d42c4a4 Auto-updated build strings. 2017-04-07 00:01:16 +02:00
Arturo Gonzalez df42f2a26b Fixed bad bucle 2017-04-06 17:38:05 +02:00
Daniel Maya eb4b5b9f43 added home screen in the creation and modification of users 2017-04-06 16:17:54 +02:00
vanessa gil 3d506d2967 new file. 2017-04-06 15:43:02 +02:00
vanessa gil 12548bddc8 new file. 2017-04-06 14:13:19 +02:00
Arturo Gonzalez 22813cc412 Added changes to events query vars 2017-04-06 14:03:49 +02:00
Arturo Gonzalez e576f6d3e8 Added some tags fixes to event filter 2017-04-06 13:20:34 +02:00
Arturo Gonzalez dc654b0f3e Added "none" filter and fixed tags update error 2017-04-06 13:00:30 +02:00
Arturo Gonzalez 5185105c03 Added default filter elements to filter table and filter tags. 2017-04-06 11:45:22 +02:00
artica 37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
vanessa gil 5582240770 removed file. 2017-04-05 17:47:27 +02:00
Arturo Gonzalez a6209c15ca Added event filter field to user in creation and edition 2017-04-05 17:44:24 +02:00
enriquecd cbd07089c6 Make combobox of custom graph editor in agent view width adaptable - #114 2017-04-05 16:52:37 +02:00
Arturo Gonzalez 640fee4b82 Added lost url to um open online 2017-04-05 16:23:30 +02:00
vanessa gil 0d21e46939 new file. 2017-04-05 11:09:48 +02:00
Arturo Gonzalez 629439f271 Added some modifications to adapt um and rr in meta 2017-04-05 10:26:12 +02:00
artica d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
Arturo Gonzalez 94d85d9f6e Translations changed 2017-04-04 17:35:11 +02:00
Arturo Gonzalez 790eb164da Changed forums url in wellcome window 2017-04-04 17:09:26 +02:00
vgilc 3f27e0a306 Revert "Merge branch 'remove-traces-debug' into 'develop'" 
This reverts merge request !266
 2017-04-04 13:48:11 +02:00
vgilc 6b2cdb9784 Merge branch 'remove-traces-debug' into 'develop' 
remove debug console.log traces.

See merge request !266
 2017-04-04 13:47:41 +02:00
vgilc fb0cca8bad Merge branch 'cherry-pick-b333e79e' into 'develop' 
Fixed name of agents and images status in report Agents/Modules. Gitlab: #553

See merge request !286
 2017-04-04 09:16:01 +02:00
artica 6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
Arturo Gonzalez 12203f9c2b Added time improvements to networkmaps 2017-04-03 14:20:11 +02:00
vgilc 6fbd8b9978 Merge branch '673-674-networkmap_visual_changes' into 'develop' 
Added visual changes to module nodes in networkmap and added a new option to change the node name

See merge request !334
 2017-04-03 13:53:17 +02:00
vgilc 4c8ebe44a3 Merge branch '112-error-footer-en-mapas-de-red' into 'develop' 
Reposition of footer after load ajax elements in networkmap dialog - #112

See merge request !337
 2017-04-03 13:50:00 +02:00
Daniel Maya 37c9a721e8 Fixed size graphs in event_statistics 2017-04-03 09:59:36 +02:00
artica b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica 6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica 1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
enriquecd 3d89007adb Reposition of footer after load ajax elements in networkmap dialog - #112 2017-03-31 14:16:52 +02:00
Daniel Maya 7450e19d96 Added tooltips in recon 2017-03-31 13:56:43 +02:00
fermin831 2177d465d2 Added php5.6 deps to debian console package 2017-03-31 13:24:42 +02:00
Arturo Gonzalez 5f29a8f831 Added visual changes to module nodes in networkmap and added a new option to change the node name 2017-03-31 13:18:28 +02:00
Daniel Maya a4d5de69b4 Fixed text overflow in help window 2017-03-31 13:03:54 +02:00
vanessa gil a445877497 new file. 2017-03-31 10:36:05 +02:00
artica 3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
m-lopez-f 599a8b7e11 Fixed problems with remote config view files of conf about server and satellite. 2017-03-30 17:27:19 +02:00
fermin831 4178343313 Added procedure to avoid migrate fail in tbackup 2017-03-30 17:11:49 +02:00
Arturo Gonzalez a67d40a447 Added a few modifications to move the footer when nodes table is too long and recolocate interface text with every movement to see it well 2017-03-30 15:56:00 +02:00
m-lopez-f ce5b5dab66 Fixed images. Only simple images in item Agent/modules report 2017-03-30 13:23:30 +02:00
m-lopez-f af7af852b7 Fixed tet in a help pop-up. 2017-03-30 12:33:23 +02:00
artica da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
enriquecd a0d16eff76 Make case insensitive search bar in agent manager - #33 2017-03-29 13:30:43 +02:00
enriquecd 4d4f4669ac Show quotes in module template managment items description - #108 2017-03-29 11:25:50 +02:00
Daniel Maya ea47372c06 Deleted white space when saving modules template 2017-03-29 11:01:15 +02:00
enriquecd 6003db1ebc Dont show "sell" message in manage_network_component header - #107 2017-03-29 10:52:50 +02:00
vgilc f7b4523b1f Merge branch 'problems-with-interfaces-snmp' into 'develop' 
Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541

See merge request !277
 2017-03-29 10:12:53 +02:00
artica a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
vgilc 81e15f3d9c Merge branch '555-Network_maps_must_show_all_mm_links' into 'develop' 
555 network maps must show all mm links

See merge request !311
 2017-03-28 16:38:14 +02:00
mlopez f2b0d28d63 Update functions_flot.php 2017-03-28 14:54:57 +02:00
Arturo Gonzalez a8b7f055f4 Added a lot of changes to networkmaps 2017-03-28 14:37:40 +02:00
m-lopez-f 881b86031c Fixed visual of graphs in dashboardswhen used mobile version. 2017-03-28 13:01:40 +02:00
Daniel Maya 967b43061d Added not init state if there are no initialized modules 2017-03-28 11:59:30 +02:00
Arturo Gonzalez bcb8968bec Added a few modifications to networkmaps 2017-03-28 11:32:58 +02:00
artica f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
Arturo Gonzalez a0d9ddd8e6 Added some changes to networkmap 2017-03-27 17:55:17 +02:00
m-lopez-f 7dc9f9f21b Fixed styles of diferents graphs in dashboards when active mobile version. 2017-03-27 17:06:55 +02:00
Arturo Gonzalez 27e8ddcdaf Added AMA edges to list of links with the same parent and children 2017-03-27 16:37:26 +02:00
Arturo Gonzalez 311143067a Fixed identical text to multiple links delimiter 2017-03-27 16:28:24 +02:00
Arturo Gonzalez 9512d61e16 Added interface text to add i.link or u.link 2017-03-27 16:03:25 +02:00
fermin831 d7fbc62eca Modified menu_calculate_top to works well with fixed menu option 2017-03-27 15:47:48 +02:00
Arturo Gonzalez 949fbc3660 Added the second interface text 2017-03-27 15:33:27 +02:00
fermin831 2b74fbe57e Modified menu position to fit it with ACL enterprise 2017-03-27 15:32:05 +02:00
Arturo Gonzalez fc7afffb2c Added curved lines to networkmap to support more than 1 MM edges between the same node 2017-03-27 14:28:11 +02:00
daniel 13620b1489 fixed custom logo login 2017-03-27 12:01:31 +02:00
vgilc ad77133ebd Merge branch '532-autenticacion-doble-metaconsola' into 'develop' 
Fixed bug in qr

See merge request !271
 2017-03-27 10:14:23 +02:00
Arturo Gonzalez d4a373173b Merge branch 'develop' into 555-Network_maps_must_show_all_mm_links 2017-03-27 09:15:34 +02:00
artica 10b145463f Auto-updated build strings. 2017-03-27 00:01:16 +02:00
artica 149e8be750 Auto-updated build strings. 2017-03-26 00:01:17 +01:00
artica d1c4512977 Auto-updated build strings. 2017-03-25 00:01:19 +01:00
enriquecd f3b5e3bb03 Adjust area graph position in vconsole dashboard / open - #566 2017-03-24 15:08:35 +01:00
enriquecd 15749e323f Change sec param in policies section, gpolicies to gmodules / 7 / open - #562 2017-03-24 13:07:49 +01:00
Arturo Gonzalez 2c3412a8a2 Init to show all mm links (between the same agent) 2017-03-24 12:47:28 +01:00
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
fermin831 531e3a1391 Added safe output to free search at loading event filter 2017-03-24 10:46:41 +01:00
artica bac8b24853 Auto-updated build strings. 2017-03-24 00:01:21 +01:00
vanessa gil 644eeaa7aa delete file 2017-03-23 16:51:00 +01:00
Ramon Novoa 895ec34a4f Remove the layer 2 recon script from the DB (not from the disk yet, for 
upgrades).
 2017-03-23 16:15:57 +01:00
vanessa gil d006c81eb0 delete files. 2017-03-23 15:53:44 +01:00
enriquecd 0b6227b1bf Change strings in minor release update manager / open - #486 2017-03-23 15:53:05 +01:00
daniel 26acc537a4 fixed minor error in networkmap for defect spring2 2017-03-23 13:10:50 +01:00
Daniel Maya 6948a2fa56 Added start time in snmp interface graphics 2017-03-23 12:32:30 +01:00
fermin831 0660d28ed3 Fixed pdf netflow reports 2017-03-23 11:54:04 +01:00
enriquecd 22af4e703a Alert in sound console with snmp alerts events - #38 2017-03-23 10:31:04 +01:00
daniel 0c52b0487f fixed visual error in recorn task 2017-03-23 09:57:50 +01:00
artica db7d154aa9 Auto-updated build strings. 2017-03-23 00:01:20 +01:00
daniel 173141c90a add news field trecorn-task migrate 2017-03-22 16:31:34 +01:00
daniel 81cf7aba11 add news checkbox for vlan_enabled and snmp_enabled 2017-03-22 16:30:15 +01:00
daniel aeb8e74bdc delete help in visual setup 2017-03-22 15:54:53 +01:00
daniel c309ec3ed4 fixed minor error 2017-03-22 15:41:34 +01:00
daniel 07e5274d0d fixed error in login page errors and change icon pdf report 2017-03-22 15:26:54 +01:00
enriquecd e2567f7b6a Resolve jquery library bug (holagram dashboard) - #546 2017-03-22 12:06:29 +01:00
fermin831 c014e00f33 Fit thresholds on module graphs 2017-03-22 11:30:41 +01:00
vanessa gil b00ddd9beb new file. 2017-03-22 11:29:28 +01:00
vanessa gil 5cf45a08ec new file 2017-03-22 11:10:09 +01:00
vanessa gil 2b7e5de6a1 new file 2017-03-22 11:03:38 +01:00
vanessa gil f1a33bcc3e Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-22 10:48:37 +01:00
vanessa gil be188dcf68 new file 2017-03-22 10:47:51 +01:00
Junichi Satoh e1dea64ed7 Updated japanese translations. 2017-03-22 18:45:32 +09:00
vanessa gil 7c94400e7b MR 2017-03-22 10:29:10 +01:00
enriquecd 62541482ab Filter custom graph size in visual console editor, autoset size - #99 2017-03-22 10:10:56 +01:00
m-lopez-f 36255d9693 Remove rotate legend in graphs. Gitlab: #537 2017-03-22 09:08:49 +01:00
artica dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
m-lopez-f 145c521c11 Fixed name of agents in report Agents/Modules. Gitlab: #553 2017-03-21 16:54:06 +01:00
m-lopez-f 34ecf27ac4 Revert "Fixed name of agents in report Agents/Modules. Gitlab: #553" 
This reverts commit b333e79ea8.
 2017-03-21 16:53:03 +01:00
m-lopez-f b333e79ea8 Fixed name of agents in report Agents/Modules. Gitlab: #553 2017-03-21 16:50:27 +01:00
Arturo Gonzalez 6731eb7da4 Fixed async error 2017-03-21 15:13:04 +01:00
Arturo Gonzalez 576b834d25 Fixed error in rr 2017-03-21 14:58:42 +01:00
Arturo Gonzalez 8ae921402c Added mr folder cleaner 2017-03-21 14:48:12 +01:00
m-lopez-f 77ee30df20 Fixed merge request 2017-03-21 13:44:41 +01:00
vanessa gil 0b564c2866 new file 2017-03-21 13:43:01 +01:00
vanessa gil 2994a9f8a1 new file. 2017-03-21 13:32:08 +01:00
Arturo Gonzalez f6b7c5ce19 Clean mr folder before um process 2017-03-21 13:29:06 +01:00
Arturo Gonzalez a8e1cdba8f Added a change when mr is in updated folder. 2017-03-21 13:24:15 +01:00
m-lopez-f e34ec2109a Fixed problem with extension backup. Add new column in migrate sql. 2017-03-21 13:15:45 +01:00
vanessa gil c23767c5d7 new mr file. 2017-03-21 13:11:17 +01:00
fermin c1f00a63a4 Merge branch 'ent-526-Las-graficas-estaticas-en-la-7-estan-mal' into 'develop' 
Position watermark inside the static graphs

See merge request !284
 2017-03-21 13:07:52 +01:00
Arturo Gonzalez e8fbd1f7d1 Added minor change to um and rr system 2017-03-21 12:57:02 +01:00
fermin831 e3341ab15f Position watermark inside the static graphs 2017-03-21 12:33:00 +01:00
Daniel Maya 8cc316ff83 Fixed sql bug in custom report 2017-03-21 12:28:30 +01:00
vanessa gil d6fb515034 new file. 2017-03-21 12:23:46 +01:00
vanessa gil d5a70bc15e Deleted files. 2017-03-21 12:04:05 +01:00
daniel 8365afbe76 fixed errors in helps pandora and visual styles 2017-03-21 11:44:46 +01:00
Arturo Gonzalez b64afb7d6f Added a few changes to um and rr 2017-03-21 10:39:39 +01:00
vgilc 5278d2a8a8 Merge branch '98-agentes-codificados-en-vista-de-gis-data-dentro-de-la-vista-de-agente' into 'develop' 
Show agent alias in gis maps with entities - #98

See merge request !281
 2017-03-21 10:35:47 +01:00
artica e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica 53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica 6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
Arturo Gonzalez d426cbbe4a Added the last correction to UM online open 2017-03-17 15:00:14 +01:00
Arturo Gonzalez c9fd56df75 Fixed errors in um online open 2017-03-17 14:22:04 +01:00
Arturo Gonzalez 8fc433f2a8 Added code to control the ocassional errors 2017-03-17 14:13:45 +01:00
Arturo Gonzalez 750203033f Added minor fixes to um open 2017-03-17 14:05:53 +01:00
Arturo Gonzalez 89727824a4 Fixed error in um online open 2017-03-17 13:56:38 +01:00
daniel aec7df9137 fixed minor error 2017-03-17 13:40:17 +01:00
m-lopez-f 169d388fe4 Fixed errors merge 2017-03-17 13:35:19 +01:00
m-lopez-f 9e1b467850 new changes in graphs 2017-03-17 13:30:11 +01:00
daniel 4277661cc4 fixed minor errors in login page 2017-03-17 13:29:26 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
enriquecd 27d4a6c316 Show agent alias in gis maps with entities - #98 2017-03-17 11:55:34 +01:00
daniel 8d4b730b6c fixed minor errors 2017-03-17 11:37:43 +01:00
vanessa gil cb1cd58d83 new file 2017-03-17 11:36:10 +01:00
Arturo Gonzalez 011517f61d Fixed "cancel" text in offline um dialogs 2017-03-17 11:29:31 +01:00
fermin831 1d5afbb36a Added _alert_unkown_instructions_ macro 2017-03-17 11:23:28 +01:00
m-lopez-f b8045691bd Ad margin in second graph. 2017-03-17 11:20:54 +01:00
m-lopez-f 2cce1d20c3 Remove debug traces 2017-03-17 11:07:13 +01:00
m-lopez-f 26b3754ee8 Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541 2017-03-17 10:13:57 +01:00
daniel 060e8f1ddc merge develop 2017-03-17 10:12:53 +01:00
daniel 3c19207961 fixed images custom logo 2017-03-17 10:03:18 +01:00
Arturo Gonzalez 25fb6bd894 Added minor fixes to rr 2017-03-17 09:57:10 +01:00
fermin831 65033788f0 Added macro _agentos_ 2017-03-17 09:37:10 +01:00
daniel 3ff7d28240 fixed minor error in icon open source 2017-03-17 09:34:31 +01:00
daniel 3b54116147 fixed errors in css 2017-03-17 09:20:38 +01:00
Arturo Gonzalez 5a1192c412 Added more changes to um online open with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez ff596fa797 Added a lot of changes in update manager online open to integrate with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez cadfc0a30f Added code to rr system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 54642bef87 Added more code to um and rr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 2e7f7a1a38 Added changes to rr apply 2017-03-17 09:19:55 +01:00
Arturo Gonzalez d5fd732d8c Added a few modifications in RR system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 0321f8a895 Revert "Added some modifications about RR" 
This reverts commit e9cb769cbf.
 2017-03-17 09:19:55 +01:00
Arturo Gonzalez cc79905e6a Added some modifications about RR 2017-03-17 09:19:55 +01:00
enriquecd f0cbe509f9 Not show graph icons legend - #96 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 0ce515197b new sql mr 2017-03-17 09:19:55 +01:00
vanessa gil 08c20fcfab new file 2017-03-17 09:19:55 +01:00
Hirofumi Kosaka 6ef5614904 Fixed 2 wrong ACL check about reporting. 
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
 2017-03-17 09:19:55 +01:00
vanessa gil cb3c9c0cdb New file 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 5f72dbafcc Debug UM and RR system 2017-03-17 09:19:55 +01:00
artica a7fdf6b579 Auto-updated build strings. 2017-03-17 09:19:55 +01:00
enriquecd 8da7194590 Show agent - module in pdf reports item - #528 2017-03-17 09:19:55 +01:00
m-lopez-f 9b5a8773c3 Revert "Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533" 
This reverts commit 4563ef34a4.
 2017-03-17 09:19:55 +01:00
vanessa gil 16febc3d67 New mr. 2017-03-17 09:19:55 +01:00
m-lopez-f 4446cd1425 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-17 09:19:55 +01:00
Arturo Gonzalez f1ca499cd9 Update translations 2017-03-17 09:19:55 +01:00
vanessa gil f4051b825a Deleted files. 2017-03-17 09:19:55 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
Arturo Gonzalez e713b843dc Added a message whe system have a mr pending 2017-03-16 19:18:42 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Daniel Maya 317b5cfb04 Fixed the migration to pandora 7 2017-03-16 19:03:15 +01:00
daniel e888675766 fixed minor error 2017-03-16 18:43:07 +01:00
daniel 1325601082 fixed errors 2017-03-16 18:41:53 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez b9702a5b00 Added a lot of changes in update manager online open to integrate with mr 2017-03-16 18:07:19 +01:00
m-lopez-f 139c4d0d40 Fixed styles and reorganizate elements of graphs. Gitlab: #537 2017-03-16 16:38:24 +01:00
Arturo Gonzalez c8a0946eda Added code to rr system 2017-03-16 16:28:27 +01:00
Daniel Maya 44231b6515 Fixed bug in qr 2017-03-16 16:14:11 +01:00
Arturo Gonzalez 54959257c0 Added more code to um and rr 2017-03-16 16:00:57 +01:00
Arturo Gonzalez 2b9e75237a Added changes to rr apply 2017-03-16 15:45:26 +01:00
Arturo Gonzalez c7fb00b46a Added a few modifications in RR system 2017-03-16 14:56:10 +01:00
daniel b9b040665e add new custom field in visual styles meta 2017-03-16 14:35:31 +01:00
Arturo Gonzalez 0c51650590 Revert "Added some modifications about RR" 
This reverts commit e9cb769cbf.
 2017-03-16 14:31:33 +01:00
Arturo Gonzalez e9cb769cbf Added some modifications about RR 2017-03-16 14:22:42 +01:00
enriquecd 8a547961c4 Not show graph icons legend - #96 2017-03-16 12:45:33 +01:00
fermin831 d7dcd7f339 Modified Zombie processes local_component 2017-03-16 12:23:43 +01:00
Arturo Gonzalez 37fd8f8851 new sql mr 2017-03-16 12:23:25 +01:00
vanessa gil 5d09cfdef3 new file 2017-03-16 12:03:29 +01:00
Hirofumi Kosaka f4c812c469 Fixed 2 wrong ACL check about reporting. 
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
 2017-03-16 19:54:05 +09:00
vanessa gil e7fa5d1f00 New file 2017-03-16 11:15:36 +01:00
Arturo Gonzalez 51cd53b3b3 Debug UM and RR system 2017-03-16 10:46:41 +01:00
m-lopez-f b937db8f35 remove debug console.log traces. 2017-03-16 09:10:22 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
enriquecd 00f0a171b4 Show agent - module in pdf reports item - #528 2017-03-15 18:45:52 +01:00
m-lopez-f 5d1088dfa9 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-15 17:23:26 +01:00
m-lopez-f 18123ac62d Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-15 17:23:08 +01:00
m-lopez-f 7a7a42b04e Revert "Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533" 
This reverts commit 4563ef34a4.
 2017-03-15 17:22:50 +01:00
vanessa gil 309ed42a8f New mr. 2017-03-15 17:20:16 +01:00
m-lopez-f 994432c335 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-15 17:19:07 +01:00
m-lopez-f 4563ef34a4 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-15 17:18:53 +01:00
Arturo Gonzalez e5011a010b Update translations 2017-03-15 17:13:21 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
vanessa gil def9172bb9 Deleted files. 2017-03-15 17:04:40 +01:00
daniel 6191ac705a delete img 2017-03-15 16:53:15 +01:00
daniel 3d4bd9f23a delete img 2017-03-15 16:52:15 +01:00
Arturo Gonzalez fa885faf8e Added a new fine filter to RR 2017-03-15 16:45:55 +01:00
Arturo Gonzalez 41f40d8310 Update translations in develop 2017-03-15 16:00:19 +01:00
vgilc 41c774ac99 Merge branch 'cherry-pick-22138f62' into 'develop' 
DEVELOP::: Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529

See merge request !257
 2017-03-15 15:58:45 +01:00
vanessa gil a094f67dd9 New file. 2017-03-15 15:50:36 +01:00
daniel aec0d91109 login page new 2017-03-15 15:23:28 +01:00
Arturo Gonzalez 794b292078 Changed translations in mr 2017-03-15 14:37:52 +01:00
Arturo Gonzalez d9d01a453a Added a last modifications to um offline and online open 2017-03-15 13:53:44 +01:00
Enrique Camargo b580793d5f Merge branch '95-query-sql-con-usuario-especifico-en-consola-snmp' into 'develop' 
Filter snmp console sql sentence by user profile and group - #95

See merge request !255
 2017-03-15 13:35:37 +01:00
Arturo Gonzalez 0db1dc50c7 Added a lot of code to um offline and online open. 2017-03-15 13:20:05 +01:00
m-lopez-f 22f7bae5ae Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529 2017-03-15 12:17:01 +01:00
Daniel Maya f00cf520ce Fixed problem with the module graph type line in the public visual console 2017-03-15 11:43:13 +01:00
enriquecd 52fb7ccfd7 Filter snmp console sql sentence by user profile and group - #95 2017-03-15 11:37:47 +01:00
vanessa gil 025b8329ea Deleted oracle and postgre files. 2017-03-15 10:34:25 +01:00
Arturo Gonzalez adb055b13c Added a lot of code to um and rr new system 2017-03-15 10:24:29 +01:00
daniel a87839bd07 login page 2017-03-15 10:12:18 +01:00
Arturo Gonzalez a4512ceae2 Added a few modifications to rr 2017-03-15 09:36:31 +01:00
Arturo Gonzalez ebf6c26e0a Added new translations to pandorafms. Ticket #347 2017-03-15 09:05:23 +01:00
Junichi Satoh c835f48b6f Updated Japanese translations. 2017-03-15 13:44:55 +09:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
Arturo Gonzalez 3485497639 Remuve traces 2017-03-14 19:14:56 +01:00
Arturo Gonzalez 1adb43bfb0 Added a few things to um and rr 2017-03-14 19:11:39 +01:00
Arturo Gonzalez a582cb9204 Added a few things to mr 2017-03-14 18:53:49 +01:00
Arturo Gonzalez e7339e3f87 Added few things to mr 2017-03-14 18:37:24 +01:00
Arturo Gonzalez cdcd48ca17 Debug traces 2017-03-14 18:24:23 +01:00
Arturo Gonzalez cfcac5e95f Added a few things to mr 2017-03-14 18:17:06 +01:00
vanessa gil a85298d432 new file 2017-03-14 17:11:47 +01:00
vanessa gil 26339b39f0 delete file 2017-03-14 16:57:51 +01:00
vanessa gil 01945c3cb5 new mr 2017-03-14 16:56:00 +01:00
vanessa gil 32f984020b new mr 
o
 2017-03-14 16:51:38 +01:00
vanessa gil 2ccde70442 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-14 16:46:57 +01:00
vanessa gil cc39f6d1a8 New file. 2017-03-14 16:46:21 +01:00
Arturo Gonzalez 252b43122e Added a new index.pot 2017-03-14 16:29:58 +01:00
Arturo Gonzalez aa157b575d Added new translation and fix an error. 2017-03-14 16:28:30 +01:00
Arturo Gonzalez 00ffbb6fcb New index.pot. Ticket #347 2017-03-14 16:21:07 +01:00
Arturo Gonzalez 0b62513fea Updated translations. Ticket #347 2017-03-14 16:17:13 +01:00
Daniel Maya f4350aed6b Ticket 477. Fixed some bug in the visual console 2017-03-14 15:54:46 +01:00
vanessa gil fd4b62f604 Delete files 2017-03-14 15:47:11 +01:00
Arturo Gonzalez 6aa97917f2 Added new verification when mr filename is wrong. Ticket #510 2017-03-14 15:20:22 +01:00
Enrique Camargo 8b2c0d2e51 Merge branch '94-icono-fantasma-extension-fantasma' into 'develop' 
Not show Check ACL extension tab in agent view - #94

See merge request !252
 2017-03-14 14:10:57 +01:00
Arturo Gonzalez be6cc9ea79 Added the last dialog to um. Ticket #486 2017-03-14 13:52:29 +01:00
Arturo Gonzalez fe23e81481 Fixed negative id to pandorafms node in networkmaps. 2017-03-14 13:38:19 +01:00
enriquecd 79b5f73844 Not show Check ACL extension tab in agent view - #94 2017-03-14 13:28:39 +01:00
Daniel Maya cdd2363912 ticket 348. Fixed problem of access to the database 2017-03-14 13:14:39 +01:00
Arturo Gonzalez 36fda7a23d Added interface modules to db (to next relations with this interfaces) 2017-03-14 12:24:37 +01:00
vanessa gil f18f2e1068 New file. 2017-03-14 12:11:16 +01:00
Arturo Gonzalez 9cd9eb6fb4 Added filter to non-relation modules. (networkmap) 2017-03-14 11:30:41 +01:00
Arturo Gonzalez cb84e69ada Added warning img to mr advice. Ticket #486 2017-03-14 10:48:29 +01:00
Arturo Gonzalez 73c31012d9 Added new visual styles to um and rr systems. Ticket #486 2017-03-14 10:36:10 +01:00
vanessa gil f49d7f3eec New file. 2017-03-14 10:21:38 +01:00
Arturo Gonzalez 6f935f27ce Fixed recon task field to get subnet (networkmaps) 2017-03-14 08:53:41 +01:00
Arturo Gonzalez b70e8b8f6f Added all type of recon task to networkmap editor. 2017-03-14 08:35:16 +01:00
Ramon Novoa e12b7f0b58 Recon tasks do not generate random names currently. 2017-03-14 08:28:30 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
Enrique Camargo 294477a982 Merge branch '517-footer-metaconsola-vs-footer-consola-open' into 'develop' 
Print metaconsole footer in buttom and change marks order - open - #517

See merge request !244
 2017-03-13 17:46:42 +01:00
Arturo Gonzalez ca8910ad90 Added an image to new dialog styles. Ticket #486 2017-03-13 17:33:49 +01:00
artu30 2c8af1d54a Merge branch 'new_jquery_dialog_view' into 'develop' 
New styles to jquery dialog. (Header done)

See merge request !250
 2017-03-13 17:06:00 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop' 
Move mr to um

See merge request !249
 2017-03-13 16:45:54 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
daniel 4e18b82165 Merge branch '493-fallan-los-adjuntos-de-graficas-en-los-envios-de-mail-de-alerta-open' into 'develop' 
493 fallan los adjuntos de graficas en los envios de mail de alerta open

See merge request !248
 2017-03-13 14:03:12 +01:00
daniel 5872cd1f49 fixed errors in install.php mysql 2017-03-13 13:32:05 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
enriquecd d87dae44db Select user_id(name inserted manually by user) info to show and order (fullname is empty often) - 92 2017-03-13 11:50:37 +01:00
daniel 43aaee9ae3 add templates for email in templates alerts and mail to admin command 2017-03-13 11:16:35 +01:00
m-lopez-f ed83c756e2 Fixed problems with search data in general search. Gitlab: #508 2017-03-13 09:49:19 +01:00
Arturo Gonzalez b5168928e8 Merge branch 'develop' into move_mr_to_um 2017-03-13 08:42:08 +01:00
daniel 7605de5794 Revert "add new templates for email in mail to admin and templates field3 and recovery" 
This reverts commit c347164f73.
 2017-03-13 08:40:20 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
enriquecd 6b625197ec Print metaconsole footer in buttom and change marks order - open - #517 2017-03-10 17:42:55 +01:00
daniel c347164f73 add new templates for email in mail to admin and templates field3 and recovery 2017-03-10 15:30:56 +01:00
Alejandro Gallardo Escobar c795f56feb Fixed functions_agents.php 2017-03-10 14:58:19 +01:00
Enrique Camargo 3902314e82 Merge branch '92-ordenacion-de-usuarios' into 'develop' 
Massive operation profile actions - users select box  now is  ordered by user_id(primary name) - #92

See merge request !243
 2017-03-10 14:20:14 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
enriquecd 1dce7623f8 Massive operation profile actions - users select box now is ordered by user_id(primary name) - #92 2017-03-10 13:58:36 +01:00
Alejandro Gallardo Escobar cc16225e31 Added a function to generate random identifiers for the agent name 2017-03-10 13:46:53 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00