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

23462 Commits

Author SHA1 Message Date
Daniel Barbero b40f5b17c1 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-09 09:43:57 +01:00
artica d8b97885a9 Auto-updated build strings. 2020-01-09 00:01:13 +01:00
Daniel Barbero Martin 909dc4bf7c fixed css 2020-01-08 18:08:20 +01:00
Daniel Barbero Martin c25a64e737 fix styles main.css 2020-01-08 18:00:32 +01:00
Daniel Barbero Martin a8e9c69e9a save min.js and min.js.map 2020-01-08 17:33:00 +01:00
Daniel Barbero Martin d97cdfbc7a fix element line 2020-01-08 17:28:03 +01:00
Daniel Rodriguez 1f15fd5dae Merge branch 'ent-5181-Pete-SQL-y-mal-funcionamineto-de-Auto-combined-graph' into 'develop' 
Ent 5181 pete sql y mal funcionamineto de auto combined graph

See merge request artica/pandorafms!3000
 2020-01-08 14:46:29 +01:00
Tatiana Llorente 2c019f04ee Fixed bug in auto combined graph 2020-01-08 11:37:44 +01:00
Daniel Rodriguez c30e9eb1fe Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop' 
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red

See merge request artica/pandorafms!2896
 2020-01-08 11:33:27 +01:00
Daniel Barbero Martin c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
artica 64e63dad63 Auto-updated build strings. 2020-01-08 00:01:15 +01:00
Daniel Barbero Martin da01883902 Fixed items vc line 2020-01-07 18:07:07 +01:00
Daniel Barbero Martin b49dd76ce4 Add images input 2020-01-07 15:43:44 +01:00
Daniel Barbero Martin 9e2c048895 new styles VC 2020-01-07 12:06:35 +01:00
Daniel Barbero Martin 4813bef53e Add new input linked visual console 2020-01-07 12:00:39 +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
Daniel Barbero Martin 04d39a0f70 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-07 08:02:20 +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
Daniel Barbero Martin 5e008e684d Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-02 17:45:52 +01:00