a49d3bbe0e
Merge branch '2722-Labels-en-Visual-Console-2' into 'develop'
...
fix visual console's percentile item: label color not showing and removed label from view menu
See merge request artica/pandorafms!2048
Former-commit-id: f062ddec704f9f1a3b7c356d748f68efa4703a4e
2018-12-05 17:48:07 +01:00
0af861f5b9
fix visual console's percentile item: label color not showing and removed label from view menu
...
Former-commit-id: a19e1307b326a60bfef6441a7af0c7be2520ac6a
2018-12-05 16:25:46 +01:00
8861fce987
Merge branch '2234-Los-titulos-de-los-dashboards-publicos-no-se-muestran3' into 'develop'
...
Ordered titles in dashboard2
See merge request artica/pandorafms!2047
Former-commit-id: 9e67ad1f1bb7e1cf0f0e74d909fa95b0ede22fe6
2018-12-05 16:22:20 +01:00
5599c3bd85
Ordered titles in dashboard2
...
Former-commit-id: c0074389cfc8835a1b9596705640abafb363ca9a
2018-12-05 14:09:10 +01:00
1526aa6eee
Merge branch '2501-Crear-SO-con-la-API-2' into 'develop'
...
added success and error messages to api functions api_set_create_os and api_set_update_os
See merge request artica/pandorafms!2043
Former-commit-id: aaa52d060a7e61f1ed3bb3530c5b452db1c0def6
2018-12-05 08:34:56 +01:00
ceeb90b3ac
Merge branch 'ent-2583-open-networkmaps-zoom-and-lines' into 'develop'
...
Correcciones en los mapas de red
See merge request artica/pandorafms!2044
Former-commit-id: 75d6fd9576486344e30a7168068014cd739eb26c
2018-12-05 08:34:33 +01:00
bc255c09e8
Merge branch '2893-Error-configuración-personalizada-de-eventos_2' into 'develop'
...
Changed funciton size by length in jquery - #2893
See merge request artica/pandorafms!2041
Former-commit-id: d4b07122bd7b390f77edc4c746c966608aab1353
2018-12-05 08:34:11 +01:00
e6bac9a195
Merge branch 'lab/selenium-docker' into 'develop'
...
updates on pwrd, simplified
See merge request artica/pandorafms!2045
Former-commit-id: cfae76c639904ce34f2512ca1e4661826912c8eb
2018-12-05 08:33:47 +01:00
ea1eea5446
Merge branch '3153-Modificar-instalador-de-consola' into 'develop'
...
Show popup before drop database - #3153
See merge request artica/pandorafms!2042
2018-12-05 08:33:12 +01:00
99ac3e5748
Merge branch '3207-6970-update-manager-offline-no-funciona-v729' into 'develop'
...
Added debian dependency
See merge request artica/pandorafms!2046
2018-12-05 08:32:52 +01:00
fe47a9c07e
Auto-updated build strings.
2018-12-05 00:01:38 +01:00
60ac4e75df
Fix PID path not absolute message on certain systems
...
Former-commit-id: 91e9063535633dfd9d8e2fd5d309cfeb13d13131
2018-12-04 21:37:25 +01:00
cff621338f
Fixed file permissions pwrd
...
Former-commit-id: d50a2df513e0ee567ba79e2d3a4873a0b92b0a21
2018-12-04 21:28:43 +01:00
b542cb868b
updated pwrd, installer now allows user/directory locations
...
Former-commit-id: cb5c74a260dfcfadec820c0fbbd589e602ac6249
2018-12-04 21:27:46 +01:00
6a50366aea
Added debian dependency
2018-12-04 18:46:45 +01:00
b2758e6738
updates on pwrd, simplified
2018-12-04 18:22:11 +01:00
3c317c182d
Default value given to a textPath's startOffet attribute to fix an error
2018-12-04 16:42:19 +01:00
f81cbed374
Fixed an error which caused the networkmap elements to not have lines
2018-12-04 16:22:35 +01:00
795620f90f
added success and error messages to api functions api_set_create_os and api_set_update_os
2018-12-04 15:55:39 +01:00
2cb494bfe7
Show popup before drop database - #3153
2018-12-04 15:41:36 +01:00
94c6144653
Changed funciton size by length in jquery - #2893
2018-12-04 15:08:17 +01:00
d17b34a8f6
Merge branch '3209-Graficas_disponibilidad_muy_pequenas_en_PDF' into 'develop'
...
fixed minor error availability graph print to pdf
See merge request artica/pandorafms!2040
2018-12-04 14:16:59 +01:00
dfad4cf74f
Merge branch 'pandora_enterprise/#3135-no-funciona-encriptacion-del-pandora_encrypt_db' into 'develop'
...
Add a missing module to the Docker image and fix a related warning.
See merge request artica/pandorafms!2039
2018-12-04 13:05:58 +01:00
df3d142baf
fixed minor error availability graph print to pdf
2018-12-04 13:00:51 +01:00
e009ea5567
Add a missing module to the Docker image and fix a related warning.
2018-12-04 12:50:12 +01:00
daa928adb4
Merge branch '2029-Error-en-el-sumatorio-de-informes' into 'develop'
...
fixed bug in custom report's summatory
See merge request artica/pandorafms!2038
2018-12-04 12:21:47 +01:00
7e5667c227
Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm-2' into 'develop'
...
Fixed profile_delete_profile_and_clean_users to not fail when a profile is not assigned to an user
See merge request artica/pandorafms!2037
2018-12-04 12:21:26 +01:00
6f7ab8b435
fixed custom report's summatory in case module is uncompressed
2018-12-04 12:15:42 +01:00
ef28abc460
fixed bug in custom report's summatory
2018-12-04 11:55:52 +01:00
4aa21a86d8
Fixed profile_delete_profile_and_clean_users to not fail when a profile is not assigned to an user
2018-12-04 11:36:18 +01:00
973bd5f98c
Merge branch '3190-Bugarro_en_informe_servicios_SLA' into 'develop'
...
3190 bugarro en informe servicios sla
See merge request artica/pandorafms!2036
2018-12-04 11:07:26 +01:00
05e94ece90
Merge remote-tracking branch 'origin/develop' into 3190-Bugarro_en_informe_servicios_SLA
2018-12-04 10:20:09 +01:00
c63be5b4cc
fixed error print pdf chart slice bars
2018-12-04 10:19:26 +01:00
1e9be8d161
Merge branch '3170-Cambios_custom_fields_view' into 'develop'
...
new fields form custom field view
See merge request artica/pandorafms!2030
2018-12-04 10:17:03 +01:00
f7b5b6d57b
Merge branch 'ent-2252-5716-fallos-en-extension-chrome-de-eventos-2' into 'develop'
...
Fixed agent link on javascript chrome extension
See merge request artica/pandorafms!2035
2018-12-04 10:16:30 +01:00
df5c5df6d2
Merge branch '2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail2' into 'develop'
...
Fixed bug in agent detail filter
See merge request artica/pandorafms!2034
2018-12-04 10:16:05 +01:00
e27bf1a63c
Fixed agent link on javascript chrome extension
2018-12-04 10:06:43 +01:00
67bd22fed3
Merge remote-tracking branch 'origin/develop' into 3170-Cambios_custom_fields_view
2018-12-04 09:39:08 +01:00
222da4ee40
group filter custom field view
2018-12-04 09:36:48 +01:00
d9749aad03
Fixed bug in agent detail filter
2018-12-04 09:17:34 +01:00
426128bb51
Merge branch '3207-6970-update-manager-offline-no-funciona-v729' into 'develop'
...
3207 6970 update manager offline no funciona v729
See merge request artica/pandorafms!2033
2018-12-04 08:21:13 +01:00
abdd33949d
Merge branch '2877_Mejora_audit_log' into 'develop'
...
Fixed Audit log in profiles, collections and policies
See merge request artica/pandorafms!1876
2018-12-04 08:15:42 +01:00
500601c67f
Auto-updated build strings.
2018-12-04 00:01:28 +01:00
34986a5477
Merge branch 'develop' into 2877_Mejora_audit_log
...
# Conflicts:
# pandora_console/godmode/users/profile_list.php
2018-12-03 18:57:04 +01:00
a03adb1762
add field group filter
2018-12-03 18:00:41 +01:00
e5a658edf9
Merge remote-tracking branch 'origin/develop' into 3207-6970-update-manager-offline-no-funciona-v729
2018-12-03 17:02:15 +01:00
4157a85a24
added php-pecl-zip to centos spec, fixed dependency on suse rpm - old php5
2018-12-03 17:02:09 +01:00
a4f2a65e3a
Fixed the initial zoom and center of the networkmaps
2018-12-03 16:12:43 +01:00
4fa3f967f6
Merge branch '2888-Error-links-en-Show-link-to-public-dashboard_2' into 'develop'
...
Changed url for widgets in public dashboard Part2 - #2888
See merge request artica/pandorafms!2032
2018-12-03 15:50:20 +01:00
d9e3b58aee
Merge branch '2893-Error-configuración-personalizada-de-eventos' into 'develop'
...
Changed timestamp value by default - #2893
See merge request artica/pandorafms!1881
2018-12-03 15:36:10 +01:00
vgilc
alejandro-campos
manuel.montes
artica
fbsanchez
Alejandro Gallardo Escobar
tatiana.llorente@artica.es
daniel
Ramon Novoa
fermin831
samucarc