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

10964 Commits

Author SHA1 Message Date
Hirofumi Kosaka 5807e55459 Modified SNMP Console to prefer agent aliases as SNMP agent if registered. #149 2017-05-19 16:49:54 +09:00
artica 8d16f573cc Auto-updated build strings. 2017-05-19 00:01:19 +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
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
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
artica 15b65ef3f8 Auto-updated build strings. 2017-05-18 00:01:18 +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 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 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
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
Arturo Gonzalez 19a12b23ef Added white start to snmp traps 2017-05-17 11:37:19 +02:00
Daniel Maya 1897ee59a3 fixed problem with parent agents 2017-05-17 10:34:35 +02:00
artica ead3556700 Auto-updated build strings. 2017-05-17 00:01:21 +02:00
enriquecd 71d868220a Hide scroll bars when vconsole is in fullscreen mode, also in dashboard when there is only one vconsole widget - #865 2017-05-16 12:36:58 +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
enriquecd ab9930d4f3 Fix background color, countdown refresh box, and make graphs dynamics - #865 2017-05-12 11:41:45 +02:00
artica 3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +02:00
enriquecd 12dde46552 Change load order of homeurl when load config, fix mysql login error dialog - #825 2017-05-11 15:44:18 +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
Arturo Gonzalez c1ef7b00db Added float parser to module threshold 2017-05-11 10:55:33 +02:00
artica 46e16f65ea Auto-updated build strings. 2017-05-11 00:01:21 +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
m-lopez-f 808e579af7 Merge branch 'develop' into fixed-graphs-styles 2017-05-10 11:07:39 +02:00