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

22417 Commits

Author SHA1 Message Date
Luis 0c72fe718c Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2019-09-18 16:42:09 +02:00
Luis Calvo 4628e41f69 Added missing changes to pandora_migratte 2019-09-18 16:39:05 +02:00
Jose Gonzalez be1cde5466 Deleted tests 2019-09-18 15:41:20 +02:00
Jose Gonzalez a4e22d325d Solved issue 2019-09-18 15:39:33 +02:00
Tatiana Llorente eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
Daniel Rodriguez c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop' 
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
 2019-09-18 14:41:35 +02:00
Luis Calvo ad10d5dff3 Fixed notifiation text misprint 2019-09-18 13:41:31 +02:00
Jose Gonzalez 73a341912f Changed caption Expires 2019-09-18 13:35:11 +02:00
Daniel Barbero Martin 056bbb7348 fixed minor error 2019-09-18 13:16:05 +02:00
Luis Calvo 43af2269ee Fixed default values uncompress data 2019-09-18 11:51:01 +02:00
Daniel Barbero Martin 84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
Daniel Rodriguez c20fcd6366 Merge branch 'ent-4419-error-sql-filtrar-instrucciones-de-evento' into 'develop' 
Event column instructions maked unsortabe

See merge request artica/pandorafms!2733
 2019-09-18 10:58:36 +02:00
artica 47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
Luis Calvo 0c60f13ccd Event column instructions maked unsortabe 2019-09-17 19:54:34 +02:00
alejandro-campos f2a6dbb60e Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria 2019-09-17 14:56:54 +02:00
alejandro-campos 979f7beca4 created ajax file to manage incident fields autocompletion 2019-09-17 13:41:21 +02:00
alejandro-campos 87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente 326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +02:00
Tatiana Llorente 027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
Luis Calvo e409b33c6c Added changes to treport_content_template to db 2019-09-17 12:32:07 +02:00
Daniel Rodriguez 66a97f2f66 Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2669
 2019-09-17 11:36:07 +02:00
Daniel Rodriguez 1ad8c6fe2e Merge branch 'ent-4280-Nombres-duplicados-SNMP-console-y-trap-generator-en-ACL-Enterprise' into 'develop' 
Fixed duplicated names - #4280

See merge request artica/pandorafms!2658
 2019-09-17 10:47:05 +02:00
Alejandro Fraguas d9b697d076 Merge branch 'ent-4635-8710-Monitor-Report-informes-muestra-el-dato-al-reves' into 'develop' 
Fixed bug in item type monitor report

See merge request artica/pandorafms!2726
 2019-09-17 09:48:15 +02:00
artica 15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
Daniel Rodriguez c7b62e8404 Merge branch 'ent-3314-Agents/Modules-item-error-on-report' into 'develop' 
Ent 3314 agents/modules item error on report

See merge request artica/pandorafms!2296
 2019-09-16 15:37:58 +02:00
Alejandro Fraguas f86e2cdae4 Merge branch 'ent-4650-modifaciones-qa-env' into 'develop' 
exclude publishing while QA_ENV is active

See merge request artica/pandorafms!2730
 2019-09-16 14:38:26 +02:00
Luis Calvo 0b8ff69a36 Fixed modules first load on edit agent/module item report 2019-09-16 12:57:37 +02:00
Luis Calvo b79cf8fda5 Merge remote-tracking branch 'origin/develop' into ent-3314-Agents/Modules-item-error-on-report 2019-09-16 11:42:47 +02:00
Luis Calvo e89efea022 Added column 'uncompressed_module' to 'treport_content' 2019-09-16 11:18:01 +02:00
fbsanchez 1596078bcb exclude publishing while QA_ENV is active 2019-09-16 11:14:00 +02:00
Luis Calvo a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00
Alejandro Fraguas 18abd5e3d6 Merge branch 'ent-4648-no-funciona-refresh-de-las-consolas-visuales-publicas' into 'develop' 
Fixed refresh

See merge request artica/pandorafms!2729
 2019-09-16 10:30:32 +02:00
Luis daa70f84db Merge branch 'develop' into 'ent-3314-Agents/Modules-item-error-on-report' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
 2019-09-16 10:09:52 +02:00
artica 2e121e2cc5 Auto-updated build strings. 2019-09-16 00:01:08 +02:00
artica 05eeb6f3d2 Auto-updated build strings. 2019-09-15 00:01:08 +02:00
artica bc36ed132d Auto-updated build strings. 2019-09-14 00:01:23 +02:00
Daniel Maya a4a84c154f Fixed refresh 2019-09-13 12:04:30 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
fbsanchez 3eabfb7456 Added a subroutine to get a list of enabled servers 2019-09-13 11:35:57 +02:00
manuel 00fc4c9238 Fixed bug in item type monitor report 2019-09-13 09:39:09 +02:00
artica 2f45d3d6ec Auto-updated build strings. 2019-09-13 00:01:11 +02:00
fbsanchez aa6c105841 Update 32.sql missed ';' 2019-09-12 17:47:49 +02:00
Alejandro Fraguas 3a85b434ca Merge branch 'ent-4558-8584-intracom-el-pdf-generado-desde-custom-report-es-ilegible-si-la-tabla-tiene-muchas-filas' into 'develop' 
Fixed max,min,avg report

See merge request artica/pandorafms!2720
 2019-09-12 17:29:09 +02:00
alejandro-campos 46b9841c47 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email 2019-09-12 15:37:45 +02:00
alejandro-campos 2218ad7d60 Added email check functionality 2019-09-12 15:37:16 +02:00
Daniel Maya 3d8486659e Fixed period in template 2019-09-12 12:52:40 +02:00
Daniel Maya 7bacb869f2 Fixed historical_data report in metaconsole 2019-09-12 12:02:28 +02:00
fbsanchez ebcce5cad4 Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha' 
# Conflicts:
#   pandora_console/extras/mr/32.sql
 2019-09-12 11:17:44 +02:00
Alejandro Fraguas a56d5dcad5 Merge branch 'ent-4147-file-repository-manager-a-combo-multiselect' into 'develop' 
Changed checkboxes for combo multiselect in File repository manager

See merge request artica/pandorafms!2700
 2019-09-12 11:12:05 +02:00
artica 602c9ccb5e Auto-updated build strings. 2019-09-12 00:01:26 +02:00