Daniel Rodriguez
073ca73b2a
Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop'
...
Added token in visual styles to change the font size in items of reports - #4670
See merge request artica/pandorafms!2798
2019-11-12 18:09:39 +01:00
Alejandro Fraguas
adc0f24f8e
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop'
...
Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace
See merge request artica/pandorafms!2825
2019-11-07 15:48:12 +01:00
Daniel Rodriguez
e81932cf0d
Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop'
...
Fixed visual styles ticket 4809
See merge request artica/pandorafms!2867
2019-11-06 16:23:51 +01:00
Daniel Rodriguez
0647b156a5
Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop'
...
fix bug in user list permission checks
See merge request artica/pandorafms!2865
2019-11-06 16:06:49 +01:00
manuel
a486738920
Fixed visual styles ticket 4809
2019-11-06 10:31:26 +01:00
alejandro-campos
4b9d6f1ae2
fix bug in user list permission checks
2019-11-05 17:18:38 +01:00
Daniel Rodriguez
dd86598298
Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop'
...
Fixed visual bug in general report item
See merge request artica/pandorafms!2854
2019-11-05 16:43:52 +01:00
fbsanchez
b1d4bfe149
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
...
Conflicts:
pandora_console/pandoradb_data.sql
2019-11-05 11:16:26 +01:00
Tatiana Llorente
c83b85c225
Ent 4801 error informes pdf csv
2019-11-04 18:41:03 +01:00
Alejandro Fraguas
cf3bcefddf
Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop'
...
Fixed planned downtime acl
See merge request artica/pandorafms!2829
2019-11-04 11:25:17 +01:00
manuel
d0c2c0d1eb
Fixed visual bug in general report item
2019-11-04 10:39:16 +01:00
fbsanchez
e12bcb2ac4
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-28 12:59:02 +01:00
fbsanchez
709f4cac81
WebSocket configuration, quickShell settings, quickShell proxied url compatibility
2019-10-23 19:56:48 +02:00
fbsanchez
5b3fd5dd79
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:41 +02:00
fbsanchez
eb98f695f9
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:34 +02:00
Luis Calvo
33d26144f1
Fixed planned downtime acl
2019-10-22 16:00:01 +02:00
manuel
bbeb750e46
Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta
...
Conflicts:
pandora_console/include/functions_graph.php
2019-10-22 15:51:38 +02:00
manuel
deb217906c
Fixed bug in templates
2019-10-22 15:41:13 +02:00
Marcos Alconada
6963ce894b
Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola'
...
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
2019-10-22 13:26:15 +02:00
marcos
70978f838c
fixed visual error metaconsole
2019-10-22 13:22:13 +02:00
Daniel Rodriguez
0cf3e01f74
Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop'
...
Ent 1880 umbrales inversos en negativo
See merge request artica/pandorafms!2818
2019-10-22 12:56:21 +02:00
fbsanchez
6c52462c8c
Modular WebSocket engine, added ssh and telnet to quickshell extension
2019-10-21 17:36:26 +02:00
Daniel Rodriguez
547607c21e
Merge branch 'ent-4794-Permiso-Manage-Users-no-funciona' into 'develop'
...
Ent 4794 permiso manage users no funciona
See merge request artica/pandorafms!2804
2019-10-21 10:48:36 +02:00
Daniel Rodriguez
e5890b038d
Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop'
...
Ent 4069 graphs containers in custom graphs error
See merge request artica/pandorafms!2787
2019-10-17 14:20:06 +02:00
Tatiana Llorente
adf3b08537
Add text (inv) in the help of the thresholds for inverse intervals - #1880
2019-10-17 11:50:50 +02:00
Daniel Rodriguez
e80ef83d66
Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop'
...
When an item is updated, it is redirected to the item lists
See merge request artica/pandorafms!2755
2019-10-17 10:13:40 +02:00
Alejandro Fraguas
039d854441
Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop'
...
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos
See merge request artica/pandorafms!2800
2019-10-16 14:16:13 +02:00
marcos
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
Alejandro Fraguas
8407d7fe9a
Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop'
...
Added current gis location to agent gis view list
See merge request artica/pandorafms!2772
2019-10-14 15:57:27 +02:00
Luis Calvo
a1c4b3eaeb
Fixed minor bug
2019-10-14 13:38:10 +02:00
Jose Gonzalez
5ffa93bb25
Modified character for string fusion
2019-10-11 13:49:19 +02:00
Tatiana Llorente
8c556d7d19
Changed permissions for management users - #4794
2019-10-11 11:47:38 +02:00
Tatiana Llorente
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
Tatiana Llorente
18679f90e5
Added token in visual styles to change the font size in items of reports - #4670
2019-10-09 16:24:37 +02:00
fbsanchez
d09c071684
discovery ACL
2019-10-09 15:45:02 +02:00
manuel
93bca4673f
Fixed bugs in reports
2019-10-09 13:15:07 +02:00
Daniel Rodriguez
2eca6c7df3
Merge branch 'ent-4717-nombre-de-extensiones-erroneo-en-menu-php' into 'develop'
...
Deleted unnecessary "if" statement
See merge request artica/pandorafms!2759
2019-10-08 15:32:55 +02:00
Daniel Rodriguez
0b14cb64b6
Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop'
...
Fixed module update bug
See merge request artica/pandorafms!2769
2019-10-08 14:30:49 +02:00
Luis Calvo
941362776e
Fixed keepcounters ckbox bug
2019-10-08 14:06:30 +02:00
Alejandro Fraguas
13b3099553
Merge branch 'ent-4775-Error-masivas-de-agente-sin-cambios' into 'develop'
...
added condition in agent massive edition
See merge request artica/pandorafms!2791
2019-10-08 13:11:55 +02:00
alejandro-campos
646f2607ab
added condition in agent massive edition
2019-10-07 19:02:19 +02:00
Daniel Rodriguez
375fac7f3d
Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop'
...
Fixed modules_get_relations
See merge request artica/pandorafms!2751
2019-10-07 14:01:24 +02:00
Tatiana Llorente
3b85842fb2
Hidden Graph Container section from open version - #4069
2019-10-07 12:44:00 +02:00
Daniel Rodriguez
658d71568a
Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop'
...
the itil type is removed in the report types
See merge request artica/pandorafms!2757
2019-10-04 13:55:54 +02:00
Daniel Rodriguez
6802b32d93
Merge branch 'ent-4578-No-se-registran-los-nombres-de-los-items-text-en-reports' into 'develop'
...
Fixed visual bug in item names from report template
See merge request artica/pandorafms!2707
2019-10-03 17:35:03 +02:00
marcos.alconada
ec86380ee7
changed hint from home screen edit user
2019-10-03 14:27:10 +02:00
Alejandro Fraguas
a40592b041
Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop'
...
Fixed bug in list graphs view
See merge request artica/pandorafms!2711
2019-10-03 10:37:49 +02:00
Luis Calvo
1eb0b27da3
Fixed module update bug
2019-09-27 16:09:11 +02:00
alejandro-campos
5e0b7fc2b7
fixed integria logo redirection in integria setup
2019-09-27 09:07:09 +02:00
alejandro-campos
2ec562fcc0
changed help in setup integria
2019-09-26 13:36:14 +02:00