tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-16 23:38:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
34,376 Commits 34 Branches 30 Tags
Commit Graph

5147 Commits

Author SHA1 Message Date
Daniel Rodriguez
203310d13b Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop' 
remove vamos a ver

See merge request artica/pandorafms!4126
 2021-05-14 09:39:07 +00:00
Daniel Rodriguez
5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
alejandro.campos@artica.es
2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es
86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
alejandro.campos@artica.es
172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos
caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es
9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
marcos
d711d71392 remove vamos a ver 2021-05-13 13:09:42 +02:00
Daniel Rodriguez
ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada
f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Rodriguez
4e871ed296 Merge branch 'ent-6983-typo-en-traduccion' into 'develop' 
fixed wrong string

See merge request artica/pandorafms!4099
 2021-05-12 07:55:09 +00:00
Daniel Rodriguez
8a3d977e82 Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop' 
Ent 5401 búsqueda de módulo por id al llegar desde link de consola

See merge request artica/pandorafms!4026
 2021-05-11 15:38:01 +00:00
Daniel Rodriguez
fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop' 
fixed bug in file attachment

See merge request artica/pandorafms!4102
 2021-05-11 07:40:54 +00:00
Daniel Rodriguez
b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop' 
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
 2021-05-10 09:17:14 +00:00
Luis
a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
Daniel Rodriguez
a0197dab87 Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop' 
Ent 7453 busqueda alertas en vista de agente no funciona

See merge request artica/pandorafms!4084
 2021-05-10 09:15:40 +00:00
Daniel Rodriguez
514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop' 
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
 2021-05-10 09:08:59 +00:00
Daniel Rodriguez
6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis
f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Daniel Rodriguez
b609bbfdd9 Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop' 
Fixed metaconsole ACL on module graphs view

See merge request artica/pandorafms!3987
 2021-05-10 08:15:50 +00:00
alejandro.campos@artica.es
fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
marcos
e526cfbfad add not option in monitor detail filter 2021-05-07 11:16:28 +02:00
marcos
943232ed7e add not option in monitor detail filter 2021-05-07 09:32:54 +02:00
marcos
243d1fb1ec remove vamos a ver, que figura marcos 2021-05-06 17:09:50 +02:00
marcos
f03364bf96 add not option in monitor detail filter 2021-05-06 17:08:11 +02:00
José González
ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Daniel Rodriguez
77a1de6b1b Merge branch 'ent-7285-No-aparece-mensaje-en-el-TreeView-al-filtrar' into 'develop' 
Ent 7285 no aparece mensaje en el tree view al filtrar

See merge request artica/pandorafms!4018
 2021-05-06 12:26:58 +00:00
Daniel Rodriguez
8b3ad8602a Merge branch 'ent-7097-varios-bugs-mensajes' into 'develop' 
Ent 7097 varios bugs mensajes

Closes pandora_enterprise#7097

See merge request artica/pandorafms!3996
 2021-05-06 12:25:03 +00:00
Daniel Rodriguez
dd014596d6 Merge branch 'ent-7117-Guardar-puerto-al-crear-network-component-desde-el-SNMP-Browser' into 'develop' 
Ent 7117 guardar puerto al crear network component desde el snmp browser

See merge request artica/pandorafms!3943
 2021-05-06 12:06:21 +00:00
alejandro.campos@artica.es
256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
marcos
1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +02:00
José González
0dc1ec449c Added standard headers 2021-04-30 14:44:03 +02:00
José González
cea27392c8 Added standard header 2021-04-30 13:39:10 +02:00
José González
46a691c397 Added standard headers 2021-04-30 13:24:55 +02:00
José González
3f33a0ec29 Added standard header 2021-04-30 12:35:02 +02:00
José González
71c88313d5 Added standard header 2021-04-30 10:58:37 +02:00
José González
c54ad46f33 Added standard header 2021-04-29 15:35:33 +02:00
José González
9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
alejandro.campos@artica.es
22f151bc6d fixed bug in users search 2021-04-28 17:01:50 +02:00
Daniel Maya
a193234270 #7453 Fixed id alert_list 2021-04-28 16:46:27 +02:00
Daniel Rodriguez
e9956092d4 Merge branch 'ent-7399-Problemas-integracion-Ehorus-en-Pandora-FMS' into 'develop' 
Fixed errors display tab ehorus

See merge request artica/pandorafms!4078
 2021-04-28 11:24:45 +00:00
Daniel Maya
8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
Daniel Rodriguez
5857c0d231 Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop' 
Ent 7393 filtro de eventos en metaconsola severity

See merge request artica/pandorafms!4070
 2021-04-28 06:51:25 +00:00
Daniel Rodriguez
c54f542b45 Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop' 
fixed minnor error black theme 7376

See merge request artica/pandorafms!4064
 2021-04-27 14:05:08 +00:00
Daniel Rodriguez
55c38dfc03 Merge branch 'ent-7377-fallos-en-gis-maps' into 'develop' 
fixed error with creation and updating gis maps

See merge request artica/pandorafms!4072
 2021-04-27 11:44:55 +00:00
Marcos Alconada
c57ca2a2b8 fixed error with creation and updating gis maps 2021-04-27 11:44:55 +00:00
Daniel Rodriguez
e0c7fc8c1e Merge branch 'ent-7323-Bug-visuales-y-funcionamiento-parametros-de-filtros-de-eventos' into 'develop' 
fixed filter load in events view

See merge request artica/pandorafms!4048
 2021-04-27 10:33:15 +00:00
Daniel Barbero Martin
d3f3364830 Fixed errors display tab ehorus 2021-04-27 11:06:17 +02:00
Daniel Maya
dd124fa7d9 Fixed severity 2021-04-26 14:09:07 +02:00
marcos
f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00