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

5680 Commits

Author SHA1 Message Date
Daniel Rodriguez 89dcde6ca7 Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop' 
minor changes

See merge request artica/pandorafms!4107
 2021-05-11 07:40:24 +00:00
Daniel Rodriguez ac0ef3c61c Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop' 
minor change in integria ims setup

See merge request artica/pandorafms!4104
 2021-05-11 07:39:16 +00:00
Daniel Rodriguez d1e0f070f1 Merge branch 'ent-7296-botones-descolocados-gestion-eventos-metaconsola' into 'develop' 
Event responses buttons visual bug

See merge request artica/pandorafms!4111
 2021-05-10 09:11:29 +00:00
Daniel Rodriguez 5a339ac76e Merge branch 'ent-7284-Warning-creación-agente' into 'develop' 
Ent 7284 warning creación agente

See merge request artica/pandorafms!4017
 2021-05-10 09:10:43 +00:00
Daniel Maya cdf0e1a4f4 Ent 7284 warning creación agente 2021-05-10 09:10:43 +00:00
Daniel Rodriguez 3d8f0b58d6 Merge branch 'ent-7258-spinner-infinito-agentes-report-sla-items' into 'develop' 
Fix bugs with SLA item reports

Closes pandora_enterprise#7258

See merge request artica/pandorafms!4000
 2021-05-10 09:09:36 +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
José González 0a7c960630 Added control for autocomplete input icon 2021-05-07 12:40:38 +02:00
Calvo 3359b21d5b Event responses buttons visual bug 2021-05-06 16:06:21 +02:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Daniel Rodriguez c39d013afb Merge branch 'ent-7227-Perfil-LM-no-permite-modificar-acciones-ni-templates' into 'develop' 
Ent 7227 perfil lm no permite modificar acciones ni templates

See merge request artica/pandorafms!3980
 2021-05-06 12:22:48 +00:00
Daniel Maya c003964394 Ent 7227 perfil lm no permite modificar acciones ni templates 2021-05-06 12:22:47 +00:00
Daniel Rodriguez 8e737502c5 Merge branch 'ent-7133-texto-ingles-discovery' into 'develop' 
Fixed text

Closes pandora_enterprise#7133

See merge request artica/pandorafms!3976
 2021-05-06 12:10:21 +00:00
Daniel Rodriguez 325e400b11 Merge branch 'ent-7109-Bug-al-duplicar-alertas-snmp' into 'develop' 
Ent 7109 bug al duplicar alertas snmp

See merge request artica/pandorafms!3934
 2021-05-06 12:07:16 +00:00
Daniel Rodriguez db92b65fd0 Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop' 
resolved error with sql message error external tools2

See merge request artica/pandorafms!3979
 2021-05-06 12:05:04 +00:00
alejandro.campos@artica.es aa4769d331 minor changes 2021-05-05 13:02:53 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
Daniel Rodriguez 28984aa414 Merge branch 'ent-7384-bug-acl-en-usuario-con-permiso-rr-u-o-rw' into 'develop' 
fixed error with rr and rw in report list - acls

See merge request artica/pandorafms!4068
 2021-04-27 14:07:48 +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 425dc74123 Merge branch 'ent-7378-create-workunit-alerts-action-form' into 'develop' 
Controlled if Integria IMS is selected for show Create workunit switch

Closes pandora_enterprise#7378

See merge request artica/pandorafms!4066
 2021-04-27 11:45:30 +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
marcos 2db8c73743 fixed error with rr and rw in report list - acls 2021-04-26 10:30:51 +02:00
José González 68e1e72b46 Controlled if Integria IMS is selected for show Create workunit switch 2021-04-23 13:43:16 +02:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
marcos 0ff28fb9a2 fixed error with icon groups policies 2021-04-22 16:09:05 +02:00
daniel a2a3e67d49 Ent 7363 bug al copiar consola visual 2021-04-22 07:07:22 +00:00
Calvo 00e61aba79 Fixed infinite spinner on agent field grouped general report 2021-04-21 10:59:39 +02:00
vgilc a990689e59 Merge branch 'ent-7268-Falla-sincronizacion-de-inventario-Integria-Pandora' into 'develop' 
changed request protocol

See merge request artica/pandorafms!4033
 2021-04-20 07:31:13 +00:00
vgilc 55677850a6 Merge branch 'ent-7317-11690-problema-grave-consolas-visuales-modo-legacy-activado' into 'develop' 
fixeed visual error vc legacy mode

See merge request artica/pandorafms!4036
 2021-04-20 07:30:11 +00:00
marcos 4655668ca4 fixeed visual error vc legacy mode 2021-04-19 14:16:30 +02:00
Daniel Rodriguez 59ec6c850d Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop' 
Added control for max agents in groups

Closes pandora_enterprise#6387

See merge request artica/pandorafms!3800
 2021-04-19 07:17:56 +00:00
Jose Gonzalez 0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez 3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Marcos Alconada 317bf0da3d minnor error fixed 2021-04-15 10:33:31 +00:00
alejandro.campos@artica.es ada6bccfd6 changed request protocol 2021-04-15 12:12:06 +02:00
Daniel Rodriguez a93a3b7967 Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop' 
Fixed and improved alert functions.

See merge request artica/pandorafms!3957
 2021-04-14 13:15:29 +00:00
Daniel Rodriguez 72480bdb1a Merge branch 'ent-7287-selectores-desplegados-en-home-screen' into 'develop' 
fixed visual error selects home view

See merge request artica/pandorafms!4028
 2021-04-13 14:48:36 +00:00
Daniel Rodriguez fff13ad2ac Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' 
Minor changes

See merge request artica/pandorafms!3930
 2021-04-13 14:31:37 +00:00
marcos 87362d07f4 fixed visual error selects home view 2021-04-13 15:37:44 +02:00
Jose Gonzalez 3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
José González 4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
Daniel Rodriguez eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Jose Gonzalez 62264c9d07 Added boolean casting for check acl 2021-04-09 14:05:33 +02:00
Daniel Rodriguez 1fb259c35f Merge branch 'ent-7260-no-esta-funcionando-operaciones-masivas-agentes-edicion' into 'develop' 
fixed error on bulk operations edit agents

See merge request artica/pandorafms!3995
 2021-04-09 09:21:36 +00:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00