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

13536 Commits

Author SHA1 Message Date
enriquecd b6e9ed3604 Add titles to all levels buttons in lateral menu buttons / 2 - #234 2017-02-07 17:43:22 +01:00
Enrique Camargo 3f893be7d5 Merge branch '48-aumentar-altura-de-las-filas-de-la-tabla-agent-contact-en-la-vista-de-agente' into 'develop' 
Increase cell height in agent contact table of agent view - #48

See merge request !131
 2017-02-07 17:06:23 +01:00
enriquecd da366da872 Increase cell height in agent contact table of agent view - #48 2017-02-07 17:04:24 +01:00
Enrique Camargo 1ba76736b8 Merge branch '7-cambiar-color-de-grafica-de-acceso-integria-3271' into 'develop' 
Change water mark logo - #7

See merge request !129
 2017-02-07 15:54:42 +01:00
enriquecd cb6c67de15 Change water mark logo - #7 2017-02-07 15:53:24 +01:00
Enrique Camargo ddb7487dde Merge branch '234-Añadir-titles-botones-menu-lateral' into 'develop' 
Add titles to lateral menu buttons - #234

See merge request !127
 2017-02-07 15:12:25 +01:00
enriquecd 8622b90b13 Add titles to lateral menu buttons - #234 2017-02-07 14:53:32 +01:00
Arturo Gonzalez f2ad744428 Fixed open maps migration. Ticket #231 2017-02-07 14:45:27 +01:00
Enrique Camargo 97c17595bd Merge branch '230-se-descojona-la-solapa-cuando-el-nombre-del-servicio-tiene-mas-de-10-caracteres-open' into 'develop' 
Show only service name in green header for service maps - #230

See merge request !125
 2017-02-07 14:13:01 +01:00
enriquecd 18f1c96917 Show only service name in green header for service maps - #230 2017-02-07 13:58:04 +01:00
Ramon Novoa fa1edc0973 Fix the path to test.sh. 2017-02-07 13:16:45 +01:00
Ramon Novoa edae9ebd0e Copy the repo before running any tests. 2017-02-07 13:01:34 +01:00
Arturo Gonzalez cafda2a116 Added new option to see the menu bar in classic mode. Ticket #234 2017-02-07 12:58:29 +01:00
Ramon Novoa 559d7ca217 Clone the repo from scratch for every GitLab CI job. 2017-02-07 12:11:54 +01:00
Ramon Novoa 0d28b1c3d7 Add a basic .gitlab-ci.yml. 2017-02-07 11:27:53 +01:00
Ramon Novoa 18a84a7d58 Fix undeclared variables in Core.pm. 2017-02-07 11:22:57 +01:00
Arturo Gonzalez 4e479ccb47 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-02-07 10:42:58 +01:00
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
artica 4cb1f6466a Auto-updated build strings. 2017-02-07 00:01:16 +01:00
Arturo Gonzalez 3e0b0f231b Added more fields to alert macro fields. Ticket #233 2017-02-06 16:20:39 +01:00
daniel de0a318dc9 Merge branch '46-feature-cambio-de-nombre-modulos-generados-por-el-wizard-snmp-integria-4414' into 'develop' 
Resolve "Feature cambio de nombre modulos generados por el wizard SNMP [INTEGRIA: #4414]"

See merge request !122
 2017-02-06 10:55:26 +01:00
daniel 188807c4cf change name modules create from wizard SNMP 2017-02-06 10:54:51 +01:00
daniel 7db496e7a1 Merge branch '44-las-plantillas-de-modulos-no-guardan-la-unidad-de-los-modulos-creados-por-componentes-integria-4412' into 'develop' 
fixed errors in modules templates

See merge request !120
 2017-02-06 09:46:30 +01:00
daniel 0a26a31bd3 fixed errors in modules templates 2017-02-06 09:45:46 +01:00
Arturo Gonzalez 74dc73f744 Added new fitler option to netflow. Ticket #207 2017-02-06 09:29:13 +01:00
artica d7dc408f4e Auto-updated build strings. 2017-02-06 00:01:14 +01:00
artica 7e65547661 Auto-updated build strings. 2017-02-05 00:01:15 +01:00
artica 4a06176731 Auto-updated build strings. 2017-02-04 00:01:17 +01:00
Enrique Camargo 0a40939d47 Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-integria-4405' into 'develop' 
Resolve "La ayuda del post-procesado de módulos crea confusión entre . y , [INTEGRIA: #4405]"

See merge request !117
 2017-02-03 15:18:39 +01:00
enriquecd 80ec4e06ec Postprocess module help error reference with coma format and is with dot - #43 2017-02-03 15:13:32 +01:00
fbsanchez 047f7de972 Update df_percent (windows agent plugin) 2017-02-03 12:41:47 +01:00
daniel 25f734c3bc Merge branch '42-rendimiento-del-shortcut-bar-integria-4409' into 'develop' 
delete shortcut bar

See merge request !115
 2017-02-03 12:25:07 +01:00
Ramon Novoa 93180afcf1 Update the logo and screenshots URLs. 2017-02-03 12:24:05 +01:00
daniel 543fd0c7ea delete shortcut bar 2017-02-03 12:23:58 +01:00
artica 423a6c434d Auto-updated build strings. 2017-02-03 00:01:19 +01:00
Enrique Camargo 3d2dbeb41a Merge branch '41-error-500-en-consola-falta-enterprise_hook-integria-4406' into 'develop' 
Add enterprise_hook filter to all config_agents_has_remote_configuration functions - #41

See merge request !113
 2017-02-02 19:15:10 +01:00
enriquecd f9817a26ad Add enterprise_hook filter to all config_agents_has_remote_configuration functions - #41 2017-02-02 19:12:22 +01:00
Enrique Camargo 332d69d4df Merge branch '40-ancho-de-los-combobox-integria-4407' into 'develop' 
No width limit in graph editor agents selector - #40

See merge request !111
 2017-02-02 18:40:48 +01:00
enriquecd c9373e95fb No width limit in graph editor agents selector - #40 2017-02-02 18:38:48 +01:00
Enrique Camargo a1fe59a83b Merge branch '38-no-funciona-event-alerts-sobre-alertas-de-snmp-traps-integria-4383' into 'develop' 
Fix sound console for snmp traps alert, multiple selection and fix icons - #38

See merge request !110
 2017-02-02 17:48:18 +01:00
enriquecd 5d7d655833 Fix sound console for snmp traps alert, multiple selection and fix icons - #38 2017-02-02 17:46:59 +01:00
daniel 00ceae446b Merge branch '39-macro-para-el-dato-anterior-integria-4395' into 'develop' 
add new macro in alerts

See merge request !108
 2017-02-02 16:12:31 +01:00
daniel a6fadecd47 add new macro in alerts 2017-02-02 16:11:46 +01:00
Ramon Novoa af276ab7ac Do not constrain UTC time offsets. 2017-02-02 12:50:24 +01:00
Ramon Novoa 68ddaeb31d Revert "Show free space in windows agent - #31" 
This reverts commit 1ecf471ab8.
 2017-02-02 12:50:24 +01:00
Ramon Novoa 608163fa7e Remove PandoraAgent.exe from the repo. 2017-02-02 12:50:24 +01:00
daniel ffb5df9f23 Merge branch 'resolve-conflict-events-reports' into 'develop' 
fixed errors in reports evnts

See merge request !106
 2017-02-02 10:14:52 +01:00
daniel 5dad591b02 fixed errors in reports evnts 2017-02-02 10:13:58 +01:00
artica 707381284e Auto-updated build strings. 2017-02-02 00:01:16 +01:00
Enrique Camargo 06a0b3b885 Merge branch '25-edicion-de-timethreshold-en-accion-de-alerta-integria-4372' into 'develop' 
Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25

See merge request !105
 2017-02-01 19:22:03 +01:00