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

2722 Commits

Author SHA1 Message Date
vgilc 9c534ce2dc Merge branch '1127-Elementos-desplazados-en-mapas-GIS-con-Google-maps-dev' into 'develop' 
Expand layer

See merge request !685
 2017-07-28 10:24:44 +02:00
vgilc f0afe8431f Merge branch '1120-Nombre-de-agente-en-mapas-GIS-dev' into 'develop' 
Change agent name by alias in gis map

See merge request !678
 2017-07-28 10:16:27 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
Daniel Maya b4765a0a9a Expand layer 2017-07-21 12:19:56 +02:00
Daniel Maya 5fd6c03917 Change agent name by alias in gis map 2017-07-19 12:32:45 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop' 
Add data image option to simple data visual console element - #412

See merge request !584
 2017-07-17 17:03:04 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop' 
Added refresh by user

See merge request !607
 2017-07-17 10:54:06 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen' 
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
 2017-07-17 10:39:20 +02:00
vgilc c2c677de65 Merge branch '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' into 'develop' 
Changed agent name by alias

See merge request !590
 2017-07-13 12:11:18 +02:00
vgilc 38b42a26a2 Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop' 
845 mejoras en snmp browser dev

See merge request !602
 2017-07-13 12:07:46 +02:00
vgilc fb57ea216e Merge branch '997-Active-SNMP-filters-in-snmp-console-dev' into 'develop' 
Added active filters to snmp console

See merge request !611
 2017-07-13 12:02:39 +02:00
vgilc cc9191b676 Merge branch 'develop' into '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' 
# Conflicts:
#   pandora_console/operation/snmpconsole/snmp_view.php
 2017-07-13 11:59:19 +02:00
vgilc bbc54cfcfc Merge branch '890-No-esta-funcionando-el-GIS-en-Pandora-dev' into 'develop' 
Fixed display of data

See merge request !617
 2017-07-13 11:53:00 +02:00
vgilc 24728cc062 Merge branch '1042-Descuadre-en-consola-visual-dev' into 'develop' 
Fixed visual console render img

See merge request !612
 2017-07-13 11:51:25 +02:00
vgilc 43f7bcde39 Merge branch '1041-module-charts-with-standar-perms-dev' into 'develop' 
Added second check to period field in module charts (admin have diferent field name)

See merge request !610
 2017-07-13 11:42:11 +02:00
vgilc 614fbebded Merge branch '868-Consola-visual-a-pantalla-completa-no-hace-autorefresco' into 'develop' 
Change ajax call method get to post for autorefresh and use new timecount param - #868

See merge request !555
 2017-07-13 11:39:25 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +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
nramon d7b45cb027 Merge branch '149-SNMP-console-doesnt-show-agent-aliases' into 'develop' 
Modified SNMP Console to prefer agent aliases as SNMP agent if registered.  #149

Closes #149

See merge request !489
 2017-06-28 08:37:29 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +02:00
Daniel Maya 8d378b4b60 Fixed display of data 2017-06-26 11:29:56 +02:00
vgilc 1f2c3f3ad7 Merge branch '929-fixed-netflow-live-view-in-meta-dev' into 'develop' 
Fixed nwtflow live view filter table

See merge request !531
 2017-06-23 14:11:15 +02:00
vgilc a151a7e0b8 Merge branch '884-groups-hierachy-in-select-dev' into 'develop' 
Fixed groups select width

See merge request !523
 2017-06-23 14:02:50 +02:00
Daniel Maya b19164cbd2 Fixed visual console render img 2017-06-22 11:55:30 +02:00
Arturo Gonzalez e6efe5825b Added active filters to snmp console 2017-06-22 09:28:07 +02:00
Arturo Gonzalez ec2872b83b Added second check to period field in module charts (admin have diferent field name) 2017-06-21 16:41:31 +02:00
Arturo Gonzalez e86c87d23b Added refresh by user 2017-06-21 13:50:05 +02:00
Daniel Maya b38b41b942 updated files 2017-06-20 15:32:24 +02:00
Daniel Maya 4398b47d92 updated 2017-06-20 10:31:14 +02:00
Daniel Maya 7bf9860aaa Changed agent name by alias 2017-06-15 15:40:12 +02:00
Daniel Maya e68858e4c2 new feature in snmp browser 2017-06-15 15:12:27 +02:00
daniel 80a38cbd9f add checkbox for show all events in view agent detail 2017-06-14 12:45:40 +02:00
vgilc 528b9abba6 Merge branch '996-Filtro-SNMP-desaparece-dev' into 'develop' 
Fixed problem with snmp filter

See merge request !574
 2017-06-14 11:48:49 +02:00
vgilc babc431c82 Merge branch '948-Borrado-de-traps-agrupados-dev' into 'develop' 
fixed deleting grouped traps

See merge request !549
 2017-06-14 11:48:01 +02:00
enriquecd 2ede057298 Add data image option to simple data visual console element - #412 2017-06-13 16:49:25 +02:00
Daniel Maya 96ef0fdc4f Fixed problem with snmp filter 2017-06-12 12:05:23 +02:00
enriquecd 777713f939 Fix bug when there is an event with a bad data in custom_data - #311 2017-06-07 17:55:53 +02:00
enriquecd 38464bf615 Change ajax call method get to post for autorefresh and use new timecount param - #868 2017-06-05 18:36:12 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
Daniel Maya ae30068397 fixed deleting grouped traps 2017-06-02 11:33:26 +02:00
vgilc 5ed3e01afc Merge branch '957-sound-events-style-dev' into 'develop' 
Added styles to sound events window

See merge request !543
 2017-06-02 10:34:05 +02:00
vgilc db43f909fd Merge branch '920-Wrong-visualization-with-custom-graphs-items-in-visual-console-dev' into 'develop' 
Changed custom graph size specs in visual console

See merge request !517
 2017-06-02 10:32:58 +02:00
Arturo Gonzalez 1362bbc555 Added styles to sound events window 2017-06-01 13:50:35 +02:00
vgilc 87f3cb46f6 Merge branch '923-New-sound-events-console-view-dev' into 'develop' 
Added new visual styles to event sound console

See merge request !513
 2017-05-31 17:46:11 +02:00
vgilc ef5680c718 Merge branch '877-bad-colours-and-status-hierachy-in-group-view-dev' into 'develop' 
Added changes to group view

See merge request !504
 2017-05-31 17:44:56 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
vgilc 70db081222 Merge branch '862-search-fields-going-wrong-dev' into 'develop' 
Added alias search to general search and case no case sensitive search to agent details search field

See merge request !466
 2017-05-31 17:39:44 +02:00
vgilc 05397a876f Merge branch '841-boolean-charts-in-agent-charts-section-dev' into 'develop' 
Added boolean modules to agent graphs section

See merge request !455
 2017-05-31 17:10:52 +02:00
vgilc c66810afea Merge branch '847-networkmap-autorefresh-dev' into 'develop' 
Fixed networkmap path in auto-refresh white list

See merge request !452
 2017-05-31 17:09:00 +02:00