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

14528 Commits

Author SHA1 Message Date
artica 7749e7c08a Auto-updated build strings. 2017-05-20 00:01:16 +02:00
enriquecd 3e230572ad Change permission filter for module bulk operations, PM change to AW - #902 2017-05-19 14:58:34 +02:00
vgilc daf3c5d3f7 Merge branch 'Ayuda-Upload_max_filesize-PHP-v7' into 'develop' 
Update en_GB translations - #886

See merge request !491
 2017-05-19 12:00:28 +02:00
enriquecd bb0eec8883 Update en_GB translations - #886 2017-05-19 11:44:12 +02:00
vgilc da314c7ed7 Merge branch '825-La-pantalla-de-login-con-mysql-parado-no-configurado-no-se-ve-correctamente-2' into 'develop' 
Fix logout bad permission with myslq service stopped dialog - #825

See merge request !490
 2017-05-19 11:24:09 +02:00
enriquecd 57393eb9cf Fix logout bad permission with myslq service stopped dialog - #825 2017-05-19 11:12:58 +02:00
artica 8d16f573cc Auto-updated build strings. 2017-05-19 00:01:19 +02:00
vgilc 1e8e804ffe Merge branch '700-date-format-in-charts-dev' into 'develop' 
Added date format to long periods of time

See merge request !487
 2017-05-18 17:19:07 +02:00
Arturo Gonzalez 8141dac798 Added date format to long periods of time 2017-05-18 17:01:15 +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 c10df32cf8 Merge branch '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente' into 'develop' 
Change load order of homeurl when load config, fix mysql login error dialog - #825

See merge request !461
 2017-05-18 15:29:01 +02:00
Enrique Camargo 2ccd799cbd Merge branch 'develop' into '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente' 
# Conflicts:
#   pandora_console/general/login_page.php
 2017-05-18 15:23:20 +02:00
enriquecd c4ffd0257f Free search input in event list view filter also by custom_data - #311 2017-05-18 14:59:17 +02:00
vgilc 51538db187 Merge branch 'ent-894-fallos-broker-asincronos-windows' into 'develop' 
Fixed async issues in windows brokers

See merge request !485
 2017-05-18 12:10:46 +02:00
fermin831 4b05351df0 Fixed async issues in windows brokers 2017-05-18 11:55:44 +02:00
vgilc 10e6153574 Merge branch '805-change-tip-icon-in-trap-editor-dev' into 'develop' 
Added new help tip icon to snmp console

See merge request !443
 2017-05-18 10:00:31 +02:00
Junichi Satoh 9d59f4cf2a Updated help. 2017-05-18 14:26:24 +09:00
artica 15b65ef3f8 Auto-updated build strings. 2017-05-18 00:01:18 +02:00
vgilc cba6f13a3d Merge branch '770-Bug_module_max,_module_min_en_Windows_Server_2016' into 'develop' 
The min, max limits for agent modules were exclusives, now are inclusives - #770

See merge request !445
 2017-05-17 17:53:35 +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 e89be76e61 Merge branch 'fixed-graphs-styles' into 'develop' 
Fixed graphs styles Gitlab: #537

See merge request !283
 2017-05-17 17:45:55 +02:00
vgilc ab51561ecf Merge branch 'Barra-de-scroll-en-ventana-de-error-de-permisos-de-config.php' into 'develop' 
Not show scroll bar in config permission error dialog in index - #728

See merge request !385
 2017-05-17 17:40:29 +02:00
vgilc 8be3e434c8 Merge branch '761-pandora-ux-widget-dev' into 'develop' 
761 pandora ux widget dev

See merge request !414
 2017-05-17 17:39:52 +02:00
vgilc d7b1d71b95 Merge branch 'ent-680-paquetes-deb-exigen-php5-4370' into 'develop' 
Added php5.6 deps to debian console package

See merge request !339
 2017-05-17 17:38:26 +02:00
artu30 e54eb93ea8 Merge branch 'develop' into '805-change-tip-icon-in-trap-editor-dev' 
# Conflicts:
#   pandora_console/operation/snmpconsole/snmp_view.php
 2017-05-17 17:37:10 +02:00
vgilc 15a63f6b2b Merge branch '735-Global-profile-user-with-pm-cannot-edit-module-treshold-in-policies-dev' into 'develop' 
Added lost id to dynamic threshold select

See merge request !384
 2017-05-17 17:31:26 +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 888d66ca4c Merge branch '732-Cambio-enlace-a-soporte-en-el-login-de-la-consola-(version-enterprise)-dev' into 'develop' 
Support link changed in pandora enterprise

See merge request !381
 2017-05-17 17:28:22 +02:00
vgilc 130362e8c7 Merge branch '766-Error-CRON-dev' into 'develop' 
Fixed error in cron

See merge request !398
 2017-05-17 17:25:42 +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 fbe59fddc2 Merge branch '715-Nueva-feature--agent_alias_cmd-dev' into 'develop' 
new feature: added agent_alias_cmd in pandora_agent

See merge request !373
 2017-05-17 17:21:31 +02:00
vgilc 3118a70f66 Merge branch 'dashboards-in-home-page-dev' into 'develop' 
Added dashboards to "edit my user" section

See merge request !391
 2017-05-17 17:20:29 +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 eb7514dcd0 Merge branch '700-wrong_format_in_graphs' into 'develop' 
Added new ranges to graph period

See merge request !355
 2017-05-17 17:17:47 +02:00
vgilc 28eaae4601 Merge branch '724-SNMP-Console--En-el-campo-Agente-mete-el-Agent-name-en-lugar-del-Alias-dev' into 'develop' 
Changed agent name by agent alias

See merge request !375
 2017-05-17 17:16:48 +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 7d62f6ff50 Merge branch '797-infinite-session-time-dev' into 'develop' 
797 infinite session time dev

See merge request !438
 2017-05-17 17:15:18 +02:00
vgilc d78058df44 Merge branch '703-MapQuest-Open-no-funciona' into 'develop' 
Change Map quest tile server url to free version - #703

See merge request !409
 2017-05-17 17:13:33 +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
vgilc a2f664f0c9 Merge branch 'ent-531-Macro-alert_unknown_instructions_' into 'develop' 
Added _alert_unkown_instructions_ macro

See merge request !279
 2017-05-17 17:10:46 +02:00
vgilc 56fd0f85ba Merge branch 'ent-565-pintado-del-menu-lateral-con-acl-enterprise-activado' into 'develop' 
Modified menu position to fit it with ACL enterprise

See merge request !304
 2017-05-17 17:10:11 +02:00
vgilc b384d058d9 Merge branch '653-ayuda-descuadrada' into 'develop' 
Fixed tet in a help pop-up.

See merge request !323
 2017-05-17 17:06:47 +02:00
enriquecd 2df8eb9454 Add icon to recon server row in operation column for pandora servers view - #442 2017-05-17 15:08:05 +02:00
vgilc a2e728679e Merge branch '187-proteccion-en-cascada-por-modulo-integria-4112' into 'develop' 
Add support for per-module alert cascade protection.

See merge request !479
 2017-05-17 13:35:44 +02:00
enriquecd 6e951bf50b Ignore 0 value modules interval when check last contact in agent details - #888 2017-05-17 13:26:10 +02:00
Ramon Novoa 0d91a0ac22 Add support for per-module alert cascade protection. 2017-05-17 13:03:16 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00