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

14751 Commits

Author SHA1 Message Date
enriquecd d9e6585234 Change agent / module icons height a width - #1114 2017-07-12 11:20:19 +02:00
vgilc f907f3cdb7 Merge branch '1088-Macros-en-automatic-combined-graph-plantillas-de-informes' into 'develop' 
Fix automatic combined graph macros in name and labels - #1088

See merge request !657
 2017-07-12 10:12:45 +02:00
artica 7536b1fd56 Auto-updated build strings. 2017-07-12 00:01:15 +02:00
enriquecd 39fb79bbb4 Fix automatic combined graph macros in name and labels - #1088 2017-07-11 18:22:25 +02:00
vgilc 1a120c7844 Merge branch '984-vc-background-in-text-section-dev' into 'develop' 
Changed text line

See merge request !656
 2017-07-11 10:11:13 +02:00
Arturo Gonzalez 2402141c4f Changed text line 2017-07-11 10:04:26 +02:00
artica 2872686042 Auto-updated build strings. 2017-07-11 00:01:16 +02:00
artica ede763cecf Updated version and build strings. 2017-07-10 15:11:14 +02:00
vgilc fd4dc4174c Merge branch 'alertas-trap-snmp-no-interpretan-macros-con-valor-0' into 'develop' 
Make explicit comparisons to avoid trouble with values that evaluate to false.

See merge request !651
 2017-07-10 12:54:47 +02:00
vgilc 200bcc3b49 Merge branch 'error-en-dataserver' into 'develop' 
Fix a warning when there are multiple empty addresses.

See merge request !653
 2017-07-10 12:52:59 +02:00
Ramon Novoa 48d303cf8f Fix a warning when there are multiple empty addresses. 2017-07-10 12:20:23 +02:00
artica 7002f24586 Auto-updated build strings. 2017-07-10 00:01:15 +02:00
artica 6fff54b0f0 Auto-updated build strings. 2017-07-09 00:01:15 +02:00
artica f1520483fd Auto-updated build strings. 2017-07-08 00:01:21 +02:00
vgilc a9a78dbc31 Merge branch '975-Fixed-ntwmaps-generation-in-windows-dev' into 'develop' 
Added a virgensita de guadalupe fix to generate networkmaps in windows systems

See merge request !648
 2017-07-07 13:26:29 +02:00
Arturo Gonzalez a9ca7b6a8d Added a virgensita de guadalupe fix to generate networkmaps in windows systems 2017-07-07 13:21:05 +02:00
vgilc c19aaa1d64 Merge branch '151-actualizar-el-cliente-de-ehorus' into 'develop' 
Replaced references to switch.ehorus.com with portal.ehorus.com.

See merge request !647
 2017-07-07 11:05:25 +02:00
vgilc 35d722a13f Merge branch 'upload-new-ehorus-bundle' into 'develop' 
Upload new ehorus buldle

See merge request !633
 2017-07-07 10:52:57 +02:00
vgilc e49c2351ae Merge branch '1075-Operaciones-masivas-ponen-postprocess-a-0-dev' into 'develop' 
Fixed post process in Edit modules in bulk

See merge request !638
 2017-07-07 09:38:48 +02:00
vgilc 3c2ef0ea2c Merge branch '155-4248-calculo-dinamico-de-umbrales-en-tipos-booleanos-sla-disponibilidad' into 'develop' 
Fixes boolean modules threshold calc

Closes #155

See merge request !646
 2017-07-07 09:37:37 +02:00
artica 60e92e759b Auto-updated build strings. 2017-07-07 00:01:19 +02:00
fbsanchez ff6173ae54 Fixes boolean modules threshold calc 2017-07-06 14:10:08 +02:00
artica 872e36672c Auto-updated build strings. 2017-07-06 00:01:16 +02:00
vgilc ca45db3ba3 Merge branch '884-low-width-in-groups-select-agent-manager-section-dev' into 'develop' 
Fixed field

See merge request !623
 2017-07-05 12:06:54 +02:00
vgilc 129b64e870 Merge branch '884-low-width-in-groups-select-dev' into 'develop' 
Fixed selector

See merge request !622
 2017-07-05 12:06:39 +02:00
vgilc cbc813a3a5 Merge branch '975-fixed-windows-graphviz-bin-path-conf-value-dev' into 'develop' 
Fixed conf field

See merge request !629
 2017-07-05 12:01:46 +02:00
vgilc 0fd6d38a6b Merge branch '853-Custom-SQL-que-afecten-a-BDD-de-histórico-enterprise-open' into 'develop' 
Add historical db check to reports template SQL items - #853

See merge request !640
 2017-07-05 11:45:18 +02:00
vgilc 6cc4e1756a Merge branch '1025-problems-with-charts-when-have-history-db-data-dev' into 'develop' 
Added changes to resolve bad history database data

See merge request !643
 2017-07-05 11:42:15 +02:00
vgilc 3a3a7a83fe Merge branch 'ordenar-replicacion-de-eventos-y-update-agent-cache-al-final-del-arranque-del-server' into 'develop' 
Sync the agent cache in the background.

See merge request !639
 2017-07-05 11:39:58 +02:00
artica 7e376fc6dd Auto-updated build strings. 2017-07-05 00:01:15 +02:00
artica 2fef8a39dd Auto-updated build strings. 2017-07-04 00:01:16 +02:00
Arturo Gonzalez b282063325 Added changes to resolve bad history database data 2017-07-03 15:09:31 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
artica acbe200f90 Auto-updated build strings. 2017-07-03 00:01:16 +02:00
artica ef6cf3d5d7 Auto-updated build strings. 2017-07-02 00:01:15 +02:00
artica 83fef400ae Auto-updated build strings. 2017-07-01 00:01:18 +02:00
Ramon Novoa 9a85c47f9e Replaced references to switch.ehorus.com with portal.ehorus.com. 2017-06-30 21:14:55 +02:00
Ramon Novoa 0603a8408b Make explicit comparisons to avoid trouble with values that evaluate to false. 2017-06-30 20:39:41 +02:00
Ramon Novoa ce1491154e Sync the agent cache in the background. 
Ref artica/pandora_enterprise#871.
 2017-06-30 17:53:57 +02:00
Daniel Maya cfc7050bab Fixed post process in Edit modules in bulk 2017-06-30 14:18:23 +02:00
mariopulido b8c1227e7e Merge branch '1055_Vulnerabilidad_XSS_rev' into 'develop' 
fixed error XSS in login_page

See merge request !637
 2017-06-30 13:30:18 +02:00
daniel b4ca9c958d fixed error XSS in login_page 2017-06-30 13:26:05 +02:00
artica 5eb53d599a Auto-updated build strings. 2017-06-30 00:01:18 +02:00
m-lopez-f 25ede84c47 Upload new ehorus buldle 2017-06-29 16:10:25 +02:00
nramon 51412c8752 Merge branch '1055_Vulnerabilidad_XSS' into 'develop' 
fixed error xss in login page

See merge request !631
 2017-06-29 13:14:10 +02:00
daniel bea2a38969 fixed error xss in login page 2017-06-29 13:07:35 +02:00
nramon 204681dbc0 Merge branch '1064-Acumulación-de-XMLs-al-finalizar-paradas-planificadas-dev' into 'develop' 
Changed to disabled agents in planned downtime

See merge request !630
 2017-06-29 12:21:54 +02:00
nramon 031ff3f6d2 Merge branch '310-Mejoras_pandora_revent_para_TMB_rev' into 'develop' 
fixed autovalidate event in pandora_revent with extra_id

See merge request !621
 2017-06-29 09:15:39 +02:00
nramon 5669c1b1a0 Merge branch '874_Anadir_posibilidad_de_ver_todos_los_eventos_rev' into 'develop' 
fixed minor error

See merge request !628
 2017-06-29 09:15:24 +02:00
artica 470ff1857b Auto-updated build strings. 2017-06-29 00:01:17 +02:00