23369 Commits

Author SHA1 Message Date
fbsanchez
be6e1e93f9 spec minor changes 2020-01-08 11:24:38 +01:00
fbsanchez
e26e12ea9d spec changes reverted 2020-01-08 11:22:14 +01:00
fbsanchez
a9259d94f2 spec review 2020-01-08 10:45:16 +01:00
fbsanchez
c32e645e1b Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms 2020-01-08 10:37:43 +01:00
artica
64e63dad63 Auto-updated build strings. 2020-01-08 00:01:15 +01:00
Daniel Rodriguez
d16ecc54b6 Merge branch '5148-Tabs-vista-eventos' into 'develop'
Changed to 2px active tab

Closes pandora_enterprise#5148

See merge request artica/pandorafms!2959
2020-01-07 11:46:18 +01:00
Daniel Rodriguez
eea9b0337c Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop'
Ent 5081 fallo estético en el update manager offline

See merge request artica/pandorafms!2977
2020-01-07 11:12:59 +01:00
vgilc
8ecefd686f Merge branch 'ent-3967-imagen-en-consulta-a-db-interface' into 'develop'
Fix bug on reports db interface query

See merge request artica/pandorafms!2906
2020-01-07 10:58:37 +01:00
vgilc
3f2c93ea2b Merge branch 'ent-3977-Conteo-módulos-de-agente-con-grupos-secundarios' into 'develop'
Ent 3977 conteo módulos de agente con grupos secundarios

See merge request artica/pandorafms!2926
2020-01-07 10:57:44 +01:00
Daniel Maya
8572540f9a Ent 3977 conteo módulos de agente con grupos secundarios 2020-01-07 10:57:44 +01:00
vgilc
828203ed06 Merge branch 'ent-4437-ayuda-no-hierarchy' into 'develop'
Deleted help icon

See merge request artica/pandorafms!2616
2020-01-07 10:55:36 +01:00
vgilc
5f3889b5f6 Merge branch 'ent-4573-Cambio-en-el-switch-de-deshabilitar-agentes' into 'develop'
Change label for disabled status - #4573

See merge request artica/pandorafms!2693
2020-01-07 10:48:11 +01:00
vgilc
22e0a4c818 Merge branch 'ent-4620-Campo-module-inservible-en-open' into 'develop'
Ent 4620 campo module inservible en open

See merge request artica/pandorafms!2721
2020-01-07 10:46:13 +01:00
vgilc
44ec25bf0a Merge branch 'ent-4636-Eliminar-hint-de-la-vista-Monitors-View' into 'develop'
Remove hint in metaconsole monitoring view

See merge request artica/pandorafms!2723
2020-01-07 10:44:53 +01:00
Daniel Rodriguez
4464bf71d8 Merge branch 'ent-4880-error-borrar-historico-datos-cli' into 'develop'
Fixed CLI delete data

See merge request artica/pandorafms!2857
2020-01-07 10:25:38 +01:00
Daniel Rodriguez
8a6fa4f988 Merge branch 'ent-4881-entities-audit-OUM' into 'develop'
Fixed audit log OUM entities bug

See merge request artica/pandorafms!2902
2020-01-07 10:23:39 +01:00
vgilc
06e6fa261f Merge branch 'ent-4676-pequeño-bug-visual-en-ventana-modal-de-suscripcion-a-newsletter' into 'develop'
fixed visual error

See merge request artica/pandorafms!2756
2020-01-07 10:22:04 +01:00
vgilc
c14a462e63 Merge branch '5027-pandora-db-error-history-db-step' into 'develop'
Added control for int values

See merge request artica/pandorafms!2927
2020-01-07 10:20:26 +01:00
vgilc
996d322d5d Merge branch 'ent-5176-metaconsola-informes-tipo-texto' into 'develop'
Fixed visual bug in text report item

See merge request artica/pandorafms!2991
2020-01-07 10:17:10 +01:00
Daniel Rodriguez
fa9d60a3ef Merge branch 'ent-5128-Metaconsola-conteo-y-paginacion' into 'develop'
fix pagination in meta monitor view

See merge request artica/pandorafms!2963
2020-01-07 09:46:22 +01:00
Daniel Rodriguez
7bfd29da6f Merge branch 'ent-5183-error-con-logo-de-so-en-informes-pdf-meta' into 'develop'
Fixed bug in pdf metaconsole os icon

See merge request artica/pandorafms!2987
2020-01-07 09:45:56 +01:00
Daniel Rodriguez
de77e76c3a Merge branch 'ent-3270-Bug-en-las-consolas-visuales-de-tipo-bars-graph' into 'develop'
fix bug in bars graph visual console editor

See merge request artica/pandorafms!2849
2020-01-07 09:44:25 +01:00
Daniel Rodriguez
456fbc096e Merge branch 'ent-4572-Bugs-graficos-en-black-theme' into 'develop'
Fixed visual bugs in black theme - #4572

See merge request artica/pandorafms!2713
2020-01-07 09:43:45 +01:00
Daniel Rodriguez
e6616374f0 Merge branch 'ent-5000-Bug-en-el-icono-de-graficas-de-Monitor-detail-con-modulos-con-tags' into 'develop'
fix bug when checking acl permissions with regard to secondary groups in monitor view

See merge request artica/pandorafms!2908
2020-01-07 09:41:11 +01:00
Daniel Rodriguez
1ced09986e Merge branch 'ent-5212-ventana-de-bienvenida-open' into 'develop'
Minor fix - opensource welcome icon

See merge request artica/pandorafms!2983
2020-01-07 09:38:20 +01:00
Daniel Rodriguez
efe1e78489 Merge branch 'ent-5102-Recursividad-no-funciona-en-Group-event-report' into 'develop'
fixed recursion in Group event report

See merge request artica/pandorafms!2969
2020-01-07 09:37:41 +01:00
Daniel Rodriguez
53ed9a52f4 Merge branch 'ent-4974-Error-de-formulario-en-el-Cron-form-y-Cron-to-de-las-opciones-de-modulo' into 'develop'
change days select in module cron

See merge request artica/pandorafms!2887
2020-01-07 09:30:53 +01:00
Daniel Rodriguez
8b2efab1b0 Merge branch 'ent-5130-metaconsola-vista-de-alertas-mostrar-nombre-completo' into 'develop'
Fixed bug in metaconsole alerts view

See merge request artica/pandorafms!2993
2020-01-07 09:29:46 +01:00
Daniel Rodriguez
997d1e46e5 Merge branch 'ent-4996-no-funciona-el-select-multiple-de-agente-en-el-wizard-de-consolas-visuales' into 'develop'
Added hint

See merge request artica/pandorafms!2904
2020-01-07 09:26:11 +01:00
Daniel Rodriguez
8c0904246d Merge branch 'ent-5091-Unificacion-de-tamaño-de-letra-en-informes' into 'develop'
Ent 5091 unificacion de tamaño de letra en informes

See merge request artica/pandorafms!2960
2020-01-07 09:25:32 +01:00
Tatiana Llorente
4cd1ca38a4 Ent 5091 unificacion de tamaño de letra en informes 2020-01-07 09:25:31 +01:00
Daniel Rodriguez
0c2c7d9f3b Merge branch 'ent-2813-Muestra-de-información-en-el-tree-view' into 'develop'
Added stopPropagation

See merge request artica/pandorafms!2940
2020-01-07 09:24:38 +01:00
artica
6e6e7ba249 Auto-updated build strings. 2020-01-07 00:01:09 +01:00
artica
ba9f6cd1a7 Auto-updated build strings. 2020-01-06 00:01:15 +01:00
artica
3f2884b282 Auto-updated build strings. 2020-01-05 00:01:08 +01:00
artica
9e5032e1e0 Auto-updated build strings. 2020-01-04 00:01:08 +01:00
fbsanchez
69be5aec24 Merge branch 'ent-5244-modulos-no-inicializan' into 'develop'
Fix perl date issue

See merge request artica/pandorafms!2997
2020-01-03 13:03:49 +01:00
artica
e66b8ca4e3 Auto-updated build strings. 2020-01-03 00:01:13 +01:00
fbsanchez
2e5a771663 timelocal to strftime 2020-01-02 16:00:01 +01:00
fbsanchez
14a2da39b1 minor fix 2020-01-02 15:49:32 +01:00
fbsanchez
dfca202dc4 Merge branch 'ent-5244-modulos-no-inicializan' of brutus.artica.es:artica/pandorafms into ent-5244-modulos-no-inicializan
Conflicts:
	pandora_server/lib/PandoraFMS/Core.pm
2020-01-02 15:47:00 +01:00
fbsanchez
70d51413c9 timelocal to strftime 2020-01-02 15:46:27 +01:00
fbsanchez
fb3e395958 Fix perl date issue 2020-01-02 14:03:14 +01:00
Jose Gonzalez
6422e34782 Modified General tab in META events 2020-01-02 12:50:35 +01:00
fbsanchez
154b0c367f Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms 2020-01-02 09:13:32 +01:00
artica
713737986b Auto-updated build strings. 2020-01-02 00:01:10 +01:00
artica
d386d3c390 Auto-updated build strings. 2020-01-01 00:01:10 +01:00
artica
5b346c1ed9 Auto-updated build strings. 2019-12-31 00:01:11 +01:00
Alejandro Fraguas
a8e8a38fc7 Merge branch 'ent-5154-DB-interface-apto-espacios-en-blanco-queries' into 'develop'
dbmanager blankspaces transparent to user

See merge request artica/pandorafms!2986
2019-12-27 12:25:30 +01:00
Alejandro Fraguas
48286d6920 Merge branch 'ent-4875-codigo-pisado-de-la-api' into 'develop'
Restore reverted changes

See merge request artica/pandorafms!2981
2019-12-27 10:28:25 +01:00