27693 Commits

Author SHA1 Message Date
Daniel Rodriguez
31871bb792 Merge branch 'ent-7687-modificar-image-um-2' into 'develop'
new background image UM

See merge request artica/pandorafms!4201
2021-06-14 14:18:10 +00:00
marcos
2e5073e1ba new background image UM 2021-06-14 16:12:48 +02:00
Daniel Rodriguez
9d57f181f9 Merge branch 'ent-7687-modificar-image-um' into 'develop'
changed UM image background

See merge request artica/pandorafms!4198
2021-06-14 13:31:37 +00:00
Marcos Alconada
42274e7252 changed UM image background 2021-06-14 13:31:37 +00:00
Daniel Rodriguez
08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop'
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
2021-06-14 11:56:43 +00:00
fbsanchez
cdad04f9cd Update the DB schema when upgrading from RPMs.
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
Daniel Rodriguez
42f5727b18 Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop'
Avoid die while decoding erroneus json data

See merge request artica/pandorafms!4116
2021-06-14 11:39:41 +00:00
José González
e17b63e6fc Fixed issue with single line 2021-06-14 08:16:35 +02:00
artica
595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica
e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica
8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
José González
6db03d943d Merge branch 'develop' into 'ent-7594-custom-profile-acl-enterprise'
# Conflicts:
#   pandora_console/index.php
2021-06-11 13:57:10 +00:00
José González
b3aa47877d Fixed issue with meta 2021-06-11 15:54:04 +02:00
Daniel Rodriguez
81c2ebc43b Merge branch 'ent-7678-treeview-modules-no-funciona' into 'develop'
Fix treeview modules sql inner condition

See merge request artica/pandorafms!4195
2021-06-11 08:44:44 +00:00
Daniel Rodriguez
0adcf5aac2 Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop'
add new link documentation

See merge request artica/pandorafms!4188
2021-06-11 08:32:06 +00:00
Daniel Rodriguez
d0c122c193 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4194
2021-06-11 08:24:27 +00:00
artica
876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
Calvo
e0b3536d1b Fix treeview modules sql inner condition 2021-06-10 18:00:53 +02:00
marcos
1165ea11b9 cambio de fuentes css 2021-06-10 17:42:39 +02:00
artica
ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Daniel Rodriguez
e0464c70a9 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4192
2021-06-10 14:48:21 +00:00
marcos
45667da362 cambio de fuentes css 2021-06-10 16:21:06 +02:00
marcos
e75abd1d2f cambio de fuentes css 2021-06-10 16:13:45 +02:00
marcos
4502550353 Merge remote-tracking branch 'origin/develop' into ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global 2021-06-10 13:40:37 +02:00
Daniel Rodriguez
168e191734 Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4191
2021-06-10 08:19:12 +00:00
Marcos Alconada
665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
marcos
e0a7a8a8ee cambio de fuentes css 2021-06-10 09:20:26 +02:00
artica
5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Rodriguez
2aac302edd Merge branch 'revert-d58e9f63' into 'develop'
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"

See merge request artica/pandorafms!4189
2021-06-09 16:13:01 +00:00
Daniel Rodriguez
4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
marcos
50282dccf4 add new link documentation 2021-06-09 16:55:25 +02:00
Daniel Rodriguez
d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
2021-06-09 13:59:29 +00:00
Marcos Alconada
2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Rodriguez
95832cd071 Merge branch 'ent-7652-iconos-para-black-theme' into 'develop'
changed icons for black theme

See merge request artica/pandorafms!4186
2021-06-09 13:12:47 +00:00
Marcos Alconada
8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Daniel Rodriguez
73f54c3375 Merge branch 'ent-7661-Error-500-al-editar-las-opciones-avanzadas-de-un-informe' into 'develop'
fixed bug

See merge request artica/pandorafms!4185
2021-06-09 12:37:59 +00:00
Daniel Rodriguez
79499204ce Merge branch 'ent-fix-planned-downtime' into 'develop'
Fixed problems in planned downtime

See merge request artica/pandorafms!4181
2021-06-09 10:49:48 +00:00
alejandro.campos@artica.es
13850e52d5 fixed bug 2021-06-09 10:41:45 +02:00
artica
2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
marcos
9023adb98c cambio de fuentes css 2021-06-08 17:53:33 +02:00
marcos
91e0750885 cambio de fuentes css 2021-06-08 17:05:36 +02:00
Jose Gonzalez
9f120280a2 Change token for hash generation 2021-06-08 14:21:33 +02:00
Daniel Rodriguez
4fa8e5cf29 Merge branch 'ent-7617-macro-address-no-funciona-en-modulos-de-red' into 'develop'
Fixed macro address on network server modules

See merge request artica/pandorafms!4170
2021-06-08 10:53:15 +00:00
Luis
72cb359133 Fixed macro address on network server modules 2021-06-08 10:53:15 +00:00
Kevin
d6f5b58902 Fixed permissions 2021-06-08 12:45:19 +02:00
marcos
0c455c1941 cambio de fuentes css 2021-06-08 12:33:45 +02:00
marcos
8f4e4c8cc7 cambio de fuentes css 2021-06-08 10:55:48 +02:00
marcos
c7ed8b547a cambio de fuentes css 2021-06-08 10:46:32 +02:00
marcos
6412cd59e8 cambio de fuentes css 2021-06-08 09:45:46 +02:00
marcos
56c3f13c89 cambio de fuentes css 2021-06-08 09:31:18 +02:00