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

21455 Commits

Author SHA1 Message Date
Luis Calvo f6f96523a0 Added html enconde 2019-07-29 16:57:39 +02:00
Luis Calvo f7f81f5344 Custom fields url improved 2019-06-21 16:26:13 +02:00
Alejandro Fraguas 9a24c90725 Merge branch 'ent-4134-los-informes-no-funcionan-al-exportar-a-csv-json-ni-xml' into 'develop' 
Remove entities from json reports

See merge request artica/pandorafms!2512
 2019-06-19 14:17:58 +02:00
marcos.alconada 174db17a05 remove entities from reports 2019-06-19 12:33:11 +02:00
Daniel Rodriguez cfaeaa3c9c Merge branch 'ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor' into 'develop' 
Ent 3295 revision comportamiento metaconsola con nodo multi servidor

See merge request artica/pandorafms!2440
 2019-06-19 12:15:14 +02:00
fbsanchez 4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00
Rafael Ameijeiras 47fc2d70ad Merge branch 'ent-4235-deltete_forgoten_file' into 'develop' 
Ent 4235  deltete_forgoten_file

See merge request artica/pandorafms!2514
 2019-06-19 10:23:01 +02:00
Rafael Ameijeiras b428797004 delete_file 2019-06-19 10:12:06 +02:00
artica a5b140768a Auto-updated build strings. 2019-06-19 00:01:09 +02:00
Daniel Rodriguez a87e3ce97e Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop' 
Fixed bug in Agent-Module fullscreen view

See merge request artica/pandorafms!2299
 2019-06-18 17:00:15 +02:00
Alejandro Fraguas bb64524da9 Merge branch 'ent-4222-No-genera-custom-graphs-lines-average-summation' into 'develop' 
Fixed sum/avg graph infinite loop

See merge request artica/pandorafms!2513
 2019-06-18 16:58:33 +02:00
Tatiana Llorente 46f64f75c8 Fixed autorefresh in full screen - #3739 2019-06-18 14:54:40 +02:00
Luis Calvo d3016a2839 Fixed sum/avg graph infinite loop 2019-06-18 14:04:38 +02:00
marcos.alconada d39be510cf Remove entitites to availability reports 2019-06-18 14:03:51 +02:00
Alejandro Fraguas 10b337f713 Merge branch 'ent-4001-se-pueden-crear-reportes-de-tipo-general-sin-nombre' into 'develop' 
Add javascript for insert name to reports

See merge request artica/pandorafms!2424
 2019-06-18 13:53:52 +02:00
marcos.alconada dd78326a4c Remove entities from json reports 2019-06-18 13:38:22 +02:00
Daniel Rodriguez c68f2ada94 Merge branch 'ent-4085-no-se-muestra-lista-de-modulos-con-licencia-invalida' into 'develop' 
Fixed module_manager with Agent limit surpassed or license expired

See merge request artica/pandorafms!2475
 2019-06-18 13:02:43 +02:00
Daniel Maya 8f2feac676 Added DESTDIR in license.php 2019-06-18 11:35:59 +02:00
Alejandro Fraguas ec73be66f5 Merge branch 'ent-2707-System-Uptime-data-show-bug' into 'develop' 
Fixed bug data in history show

See merge request artica/pandorafms!2504
 2019-06-18 11:15:59 +02:00
artica f293aa2dc0 Auto-updated build strings. 2019-06-18 00:01:08 +02:00
Luis Calvo 6b2bb1a138 Merge remote-tracking branch 'origin/develop' into ent-2707-System-Uptime-data-show-bug 2019-06-17 16:59:33 +02:00
Daniel Rodriguez 2401ac5c6e Merge branch 'ent-4138-7696-Tipo-erróneo-módulos-Ifoperstatus-desde-satélite' into 'develop' 
Change module type ifOperStatus on Interface Wizard

See merge request artica/pandorafms!2473
 2019-06-17 16:34:14 +02:00
Daniel Rodriguez a583da3de3 Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop' 
Añadir el modo de edición a la vista de la consola visual

Closes pandora_enterprise#3981

See merge request artica/pandorafms!2482
 2019-06-17 15:07:12 +02:00
Alejandro Fraguas 4d68a3de22 Merge branch 'ent-3603-warning-php-de-error-de-segurirdad-en-acl' into 'develop' 
Ent 3603 warning php de error de segurirdad en acl

See merge request artica/pandorafms!2510
 2019-06-17 14:24:33 +02:00
marcos.alconada 340e253901 Add global config to method getFirstLevel() to remove warning check_acl error 2019-06-17 13:38:05 +02:00
Luis Calvo 3daddc94d9 Fixed, only evaluate unit 2019-06-17 10:29:28 +02:00
marcos.alconada b627636863 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-17 10:02:11 +02:00
artica 38412f2c9a Auto-updated build strings. 2019-06-17 00:01:06 +02:00
artica ef280b1377 Auto-updated build strings. 2019-06-16 00:01:05 +02:00
artica 5b3e6143b3 Auto-updated build strings. 2019-06-15 00:01:07 +02:00
Luis Calvo 6f15e97a49 Modified module show data Sys Uptime format 2019-06-14 16:13:01 +02:00
Daniel Rodriguez 975d48a653 Merge branch 'ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra' into 'develop' 
Eventos en proceso no se validan ni por id_evento no por id_extra

See merge request artica/pandorafms!2481
 2019-06-14 15:51:18 +02:00
Alejandro Fraguas 08019f11c3 Merge branch 'ent-3463-csv-availability-reports-meta' into 'develop' 
Fixed reports export to csv meta bugs

See merge request artica/pandorafms!2489
 2019-06-14 13:54:50 +02:00
Daniel Rodriguez 4eab732c94 Merge branch 'ent-4179-No-se-guarda-certificado-SSL-en-el-setup-de-la-consola' into 'develop' 
fix bug: path of ssl certificate not being set on general settings

See merge request artica/pandorafms!2501
 2019-06-14 13:38:39 +02:00
Daniel Rodriguez 4362bf3131 Merge branch 'ent-3429-event-report-options-saving' into 'develop' 
Added missing options parameters

See merge request artica/pandorafms!2173
 2019-06-14 13:19:43 +02:00
Daniel Rodriguez 5c7b45173b Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop' 
fix bug in item edition in metaconsole

See merge request artica/pandorafms!2500
 2019-06-14 13:05:27 +02:00
Alejandro Fraguas b2dc732712 Merge branch '3702-bug-en-plugin-dns-servidor' into 'develop' 
DNS plugin updated

See merge request artica/pandorafms!2261
 2019-06-14 12:42:16 +02:00
Alejandro Fraguas 6c4dcdac87 Merge branch 'ent-4199-Fallo-estilo-visual-en-autoconfiguración-de-agentes-y-discovery-vmware' into 'develop' 
Ent 4199 fallo estilo visual en autoconfiguración de agentes y discovery vmware

See merge request artica/pandorafms!2498
 2019-06-14 10:14:27 +02:00
marcos.alconada bedca9150e Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-14 09:26:45 +02:00
artica 8f25aa09fc Auto-updated build strings. 2019-06-14 00:01:08 +02:00
Luis Calvo 33bdb26e80 Fixed bug data in history show 2019-06-13 17:36:00 +02:00
marcos.alconada ca89029c99 x 2019-06-13 17:29:07 +02:00
marcos.alconada 19b68ab784 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-13 15:18:17 +02:00
Alejandro Fraguas beea6941e5 Merge branch 'ent-4200-visual-console-omnipresent-group-summary' into 'develop' 
Fixed the omnipresent group summary bug

See merge request artica/pandorafms!2496
 2019-06-13 13:25:50 +02:00
alejandro-campos 52b1c5e39b fix bug: path of ssl certificate not being set on general settings 2019-06-13 13:18:17 +02:00
alejandro-campos 8554baef20 fix bug in item edition in metaconsole 2019-06-13 11:11:39 +02:00
Alejandro Fraguas fef1441d9f Merge branch 'ent-4197-#8171-Permisos-en-consolas-visuales-con-ACLS' into 'develop' 
Fixed bug in visual consoles permissions with ACLS

See merge request artica/pandorafms!2492
 2019-06-13 10:46:39 +02:00
marcos.alconada 91ccee06ab Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-13 10:06:56 +02:00
artica 60ee0dd0fd Auto-updated build strings. 2019-06-13 00:01:07 +02:00
Tatiana Llorente af62bb1ae3 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:47:53 +02:00