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 |
|
Tatiana Llorente
|
770ac250d8
|
Merge branch 'develop' into 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW'
Conflicts:
pandora_console/operation/snmpconsole/snmp_view.php
|
2019-09-11 18:17:39 +02:00 |
|
Daniel Maya
|
d9dc03dd91
|
Fixed max,min,avg report
|
2019-09-11 18:08:40 +02:00 |
|
Alejandro Fraguas
|
3eadb07058
|
Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop'
Fixed bug in custom unit #4166
See merge request artica/pandorafms!2675
|
2019-09-11 16:47:40 +02:00 |
|
Ramon Novoa
|
9809443016
|
Add IO::Socket::SSL to the list of dependencies.
|
2019-09-11 13:36:14 +02:00 |
|
Ramon Novoa
|
4f2b2df1b0
|
Comment mta_address by default.
|
2019-09-11 12:42:52 +02:00 |
|
marcos.alconada
|
b9b4230a6e
|
changed style on tables pdf report
|
2019-09-11 12:20:09 +02:00 |
|
Alejandro Fraguas
|
a9e6409cf9
|
Merge branch 'ent-4587-Limpieza-de-sesiones' into 'develop'
delete session open by api calls
See merge request artica/pandorafms!2691
|
2019-09-11 09:40:18 +02:00 |
|
Ramon Novoa
|
39d5285720
|
Re-read the configuration from the DB periodically.
|
2019-09-11 09:25:40 +02:00 |
|
artica
|
fdef0b5188
|
Auto-updated build strings.
|
2019-09-11 00:01:10 +02:00 |
|
Ramon Novoa
|
33d9ce9de8
|
Add SSL/STARTTLS support to pandora_sendmail.
|
2019-09-10 15:53:47 +02:00 |
|
Tatiana Llorente
|
c842c96d08
|
Fixed duplicated names - #4280
|
2019-09-10 12:19:53 +02:00 |
|
Alejandro Fraguas
|
b97080f13c
|
Merge branch 'ent-4275-notificaciones-correo-no-escribe-bien-url' into 'develop'
Added ui_get_full_url in all links
See merge request artica/pandorafms!2703
|
2019-09-10 12:18:52 +02:00 |
|
Tatiana Llorente
|
b198700172
|
Fixed duplicated names - #4280
|
2019-09-10 12:18:17 +02:00 |
|
alejandro-campos
|
4722d4a08b
|
changed setup option text
|
2019-09-10 11:38:02 +02:00 |
|
alejandro-campos
|
93b9c76f58
|
Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email
|
2019-09-10 10:50:53 +02:00 |
|
alejandro-campos
|
c2e47e0ffa
|
Revert "ddded comment"
This reverts commit 4ec832f523cd3688da6675a4bf417dafb6018a5e.
|
2019-09-10 10:06:33 +02:00 |
|
alejandro-campos
|
4ec832f523
|
ddded comment
|
2019-09-10 10:03:30 +02:00 |
|
artica
|
16912732d2
|
Auto-updated build strings.
|
2019-09-10 00:01:08 +02:00 |
|
Manuel Montes
|
90c94e74d9
|
Fixed bug in list graphs view
|
2019-09-09 21:02:53 +02:00 |
|
marcos.alconada
|
83e5c14b1d
|
add condition in query
|
2019-09-09 12:54:16 +02:00 |
|
artica
|
5526bb49ed
|
Auto-updated build strings.
|
2019-09-09 00:01:07 +02:00 |
|
artica
|
f088f47605
|
Auto-updated build strings.
|
2019-09-08 00:01:06 +02:00 |
|
artica
|
3680555bae
|
Auto-updated build strings.
|
2019-09-07 00:01:10 +02:00 |
|
Daniel Rodriguez
|
da7811953c
|
Merge branch 'ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono' into 'develop'
Added mr and uncommented code
See merge request artica/pandorafms!2558
|
2019-09-06 13:38:11 +02:00 |
|
Daniel Rodriguez
|
566b7ec7bd
|
Merge branch 'ent-3898-name-alias-statistics-SNMP' into 'develop'
Changed name for alias when identify an agent in SNMP statistics
See merge request artica/pandorafms!2698
|
2019-09-06 12:51:19 +02:00 |
|
artica
|
ae474a2731
|
Auto-updated build strings.
|
2019-09-06 00:01:10 +02:00 |
|
Daniel Rodriguez
|
d02f3621f3
|
Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop'
Removed autofill proxi in auth server
See merge request artica/pandorafms!2361
|
2019-09-05 18:29:43 +02:00 |
|
fbsanchez
|
a0b71bb432
|
module_interval in broker (linux agents)
|
2019-09-05 17:40:46 +02:00 |
|
Daniel Rodriguez
|
64fc679d89
|
Merge branch 'ent-4599-no-se-muestran-items-vista-de-consola-visual-de-meta' into 'develop'
Fixed some errors in visual console
See merge request artica/pandorafms!2708
|
2019-09-05 15:27:41 +02:00 |
|
Daniel Rodriguez
|
9c6bf8184f
|
Merge branch 'ent-4457-bug-visual-style-font' into 'develop'
font size for jap and chinese adjusted agents
See merge request artica/pandorafms!2635
|
2019-09-05 13:32:07 +02:00 |
|
marcos.alconada
|
9e4b5ca5c8
|
Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font
|
2019-09-05 12:03:37 +02:00 |
|