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

3143 Commits

Author SHA1 Message Date
enriquecd d413b7d22d Hide admin tools empty link in left menu bar for operator read users without permissions - #922 2017-05-25 18:37:26 +02:00
vgilc 8a1136d99e Merge branch '704-Agrupar-gráficas-dev' into 'develop' 
Fixed problem without graphics

See merge request !512
 2017-05-25 17:30:09 +02:00
Daniel Maya b3e530658a Fixed problem without graphics 2017-05-25 16:54:07 +02:00
Arturo Gonzalez 71b809ac25 Fixed wrong ids 2017-05-24 18:01:58 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
Arturo Gonzalez 8692a17567 Ficed bad include call 2017-05-23 15:36:35 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +02:00
artu30 a78b5cc60d Merge branch 'develop' into '777-translations-dev' 
# Conflicts:
#   pandora_console/godmode/update_manager/update_manager.offline.php
#   pandora_console/include/functions_update_manager.php
 2017-05-22 17:51:21 +02:00
vgilc 6bded36a60 Merge branch '599-csv_divider_selector' into 'develop' 
599 csv divider selector

See merge request !359
 2017-05-22 17:11:52 +02:00
vgilc f56587e11c Merge branch '851-module-threshold-with-decimals-dev' into 'develop' 
Added float parser to module threshold

See merge request !460
 2017-05-18 16:08:05 +02:00
vgilc 19a76701a3 Merge branch '813-Footer-no-muestra-la-versión-correctamente' into 'develop' 
Show package version rather build version in footer (ext. fix update manager css) - #813

See merge request !454
 2017-05-17 17:51:25 +02:00
vgilc 4cee2eaea8 Merge branch '836-bad-parents-line-position-in-visual-console-dev' into 'develop' 
836 bad parents line position in visual console dev

See merge request !448
 2017-05-17 17:48:53 +02:00
vgilc 6cc43b4dd6 Merge branch '587-asignar-pantalla-de-inicio-a-usuarios-desde-admin' into 'develop' 
added home screen in the creation and modification of users

See merge request !349
 2017-05-17 17:30:26 +02:00
vgilc b506e47150 Merge branch '622-fixed-qick-guide' into 'develop' 
Remove temporality links to help. And in future chenge this help

See merge request !386
 2017-05-17 17:28:46 +02:00
vgilc 4ced4feeed Merge branch '783-Imagen-incorrecta-offline-manager-7' into 'develop' 
Change update manager offline icon - #783

See merge request !406
 2017-05-17 17:22:13 +02:00
vgilc aed804e022 Merge branch '759-actualizador-pandora' into 'develop' 
Change update manager advice when there are db changes - #759

See merge request !410
 2017-05-17 17:19:39 +02:00
vgilc bce443e0ba Merge branch '824-Pandora-Administrators-y-umbrales-de-módulos' into 'develop' 
Make warning a critical limits fields not disabled for admin profile users - #824

See merge request !439
 2017-05-17 17:15:57 +02:00
vgilc 5e442bcb0b Merge branch '711-Agent-name-en-lugar-de-alias-en-visor-de-actividad-dev' into 'develop' 
Changed name by alias when deleting agent

See merge request !380
 2017-05-17 17:12:46 +02:00
vgilc b861d2a19e Merge branch '795-elements-colocation-in-scheduled-downtime-dev' into 'develop' 
Changed elements colocation in planned downtime elements

See merge request !426
 2017-05-17 17:12:05 +02:00
Daniel Maya 1897ee59a3 fixed problem with parent agents 2017-05-17 10:34:35 +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 c1ef7b00db Added float parser to module threshold 2017-05-11 10:55:33 +02:00
enriquecd 746eab7666 Show package version rather build version in footer (ext. fix update manager css) - #813 2017-05-10 13:18:45 +02:00
Arturo Gonzalez 6f40069aa9 Added a new system to draw lines in visual console when element have an image 2017-05-09 17:29:17 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
Arturo Gonzalez 600f4bc364 Changed bad jquery get call in alert actions and alerts snmp. 2017-05-08 15:54:35 +02:00
enriquecd e32a3e4a72 Make warning a critical limits fields not disabled for admin profile users - #824 2017-05-08 13:40:12 +02:00
Arturo Gonzalez a916844f70 Changed elements colocation in planned downtime elements 2017-05-03 17:24:33 +02:00
enriquecd af5be1bfb0 Disable dinamic image size input changer on vconsole editor mode - #786 2017-04-27 17:32:28 +02:00
vgilc 211183e382 Merge branch '786-consolas-visuales-en-modo-full-screen-no-respetan-el-color-de-fondo-open' into 'develop' 
Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786

See merge request !417
 2017-04-27 17:24:59 +02:00
vgilc b11865ccae Merge branch '782-Error-SQL-en-lista-de-alertas' into 'develop' 
Not use group filter sql if not exist filter_group data - #782

See merge request !412
 2017-04-27 16:31:45 +02:00
enriquecd a99eba3a45 Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786 2017-04-27 13:28:49 +02:00
vgilc e11acefe38 Merge branch '143-no-saca-correos-con-caracteres-no-ascii' into 'develop' 
fixed errors send email text-plain

See merge request !411
 2017-04-26 16:30:44 +02:00
enriquecd c2208e5e4a Use real background-color in visual console builder - #785 2017-04-26 13:01:38 +02:00
enriquecd d2b409d276 Not use group filter sql if not exist filter_group data - #782 2017-04-26 12:09:35 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
Arturo Gonzalez 6aab4e60ae Added buttons text to translate them 2017-04-26 09:50:42 +02:00
enriquecd 1a6051caeb Change update manager advice when there are db changes - #759 2017-04-25 17:24:32 +02:00
vgilc cdf95a47dd Merge branch '140-error-a-la-hora-de-duplicar-alertas-snmp' into 'develop' 
fixed error duplicate alert SNMP

Closes #140

See merge request !402
 2017-04-25 16:27:17 +02:00
vgilc 4b5da69e31 Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop' 
Change sec url string in message and vconsole section - #688 - 2

See merge request !378
 2017-04-25 16:21:00 +02:00
vgilc 5e72afaec8 Merge branch '679-añadir-tooltips-a-opciones-de-una-recon' into 'develop' 
Added tooltips in recon

See merge request !335
 2017-04-25 16:19:09 +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
enriquecd 7ee4c77897 Change update manager offline icon - #783 2017-04-25 15:37:52 +02:00
daniel 13e2f2d05b fixed error duplicate alert SNMP 2017-04-25 09:30:59 +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
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
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 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
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