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

22535 Commits

Author SHA1 Message Date
Calvo bd1e50dd48 Removed automatic assignation of PHP configuration variables 2021-09-15 12:20:40 +02:00
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
Calvo e30fb70f11 Fix tag treeview level2 2021-09-14 13:03:38 +02:00
vgilc 538da5ff30 Merge branch 'ent-7998-actualizar-mr' into 'develop' 
updated MR and current_package token

See merge request artica/pandorafms!4406
 2021-09-14 10:24:44 +00:00
Calvo c1332a1064 updated MR and current_package token 2021-09-14 12:20:53 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
alejandro.campos@artica.es ae2dc6a0b6 moved to mr 49 2021-09-13 14:54:33 +02:00
Daniel Maya 3dc9165209 #7976 Fixed agent limit 2021-09-13 13:30:14 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
Calvo b039935470 Update Mr to 49 2021-09-13 10:45:22 +02:00
Calvo bb1e0a0b8b API set create alert template metaconsole support 2021-09-13 10:10:52 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
Calvo 82e5b649d6 Css content moved to js to allow translation 2021-09-10 15:10:20 +02:00
Daniel Rodriguez 4a8461c2d3 Merge branch 'ent-7885-12292-General-Report-no-ordena-como-debe' into 'develop' 
Ent 7885 12292 general report no ordena como debe

See merge request artica/pandorafms!4378
 2021-09-10 11:17:54 +00:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop' 
add update manager black background update manager

See merge request artica/pandorafms!4270
 2021-09-10 11:11:24 +00:00
Daniel Rodriguez 8ea02ab4c2 Merge branch 'ent-7991-bug-selector-css' into 'develop' 
Fix name for css

Closes pandora_enterprise#7991

See merge request artica/pandorafms!4397
 2021-09-10 11:08:24 +00:00
Jose Gonzalez a774d67f2a Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-10 12:50:23 +02:00
Junichi Satoh 1c3ec719d7 Updated Japanese console translations. 2021-09-10 17:57:44 +09:00
Marcos Alconada 99a47b0739 set style on um-last and next button 2021-09-10 07:49:40 +00:00
Daniel Maya 10f1894b82 #7982 Added id_template_fields and id_template_conditions 2021-09-10 09:46:00 +02:00
Jose Gonzalez 316611f432 Fix name for css 2021-09-10 09:25:01 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
Daniel Rodriguez 1a66858020 Merge branch 'ent-7984-falla-chequeo-de-acls-en-la-api' into 'develop' 
Fixed API access

See merge request artica/pandorafms!4395
 2021-09-09 08:07:15 +00:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
Daniel Rodriguez a18fd6ab0f Merge branch 'ent-7706-descuadre-texto-e-icono-de-los-botones' into 'develop' 
fixed icon button position

See merge request artica/pandorafms!4243
 2021-09-08 14:40:34 +00:00
Daniel Rodriguez 2e7dadb04e Merge branch 'ent-7591-mensaje-error-timeout-snmp-en-browser' into 'develop' 
Fix format on snmp browser error messages

See merge request artica/pandorafms!4276
 2021-09-08 14:37:14 +00:00
Daniel Rodriguez 3b5545cde4 Merge branch 'ent-7720-bug-visual-en-correlacion-de-alertas' into 'develop' 
fixed error

See merge request artica/pandorafms!4244
 2021-09-08 13:35:45 +00:00
Daniel Rodriguez 4372837f36 Merge branch 'ent-7961-bug-visual-en-las-graficas-de-log-viewer' into 'develop' 
Log viewer graph capture model visual  bug

See merge request artica/pandorafms!4393
 2021-09-08 13:23:22 +00:00
Daniel Rodriguez 6fff287b70 Merge branch 'ent-7314-comillas-comandos-remotos' into 'develop' 
Added tip for notice to users for use single quotation

Closes pandora_enterprise#7314

See merge request artica/pandorafms!4376
 2021-09-08 13:14:54 +00:00
fbsanchez 52ba314612 Fixed API access 2021-09-08 14:28:48 +02:00
José González 740a82253a Fixed quot string 2021-09-08 12:20:38 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop' 
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
 2021-09-08 10:14:22 +00:00
Daniel Maya 240caa3ad1 #7969 Fixed span with truncate 2021-09-08 12:14:03 +02:00
Calvo 44663c914a Log viewer graph capture model visual bug 2021-09-08 10:44:57 +02:00
artica 7e5dc6a9c4 Auto-updated build strings. 2021-09-08 01:00:19 +02:00
artica ecd818bbb7 Auto-updated build strings. 2021-09-07 01:00:19 +02:00
Calvo 62775e0dae Fix api group_id_by_name with url enconde separator 2021-09-06 18:13:14 +02:00
Jose Gonzalez e8eb77058b Fix 2021-09-06 15:19:23 +02:00
Jose Gonzalez bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Daniel Rodriguez 42d8bb6003 Merge branch 'ent-7801-Vulnerabilidad-File-Manager' into 'develop' 
Fix vulnerability

Closes pandora_enterprise#7801

See merge request artica/pandorafms!4385
 2021-09-06 11:23:26 +00:00
artica 6bb994f4b7 Auto-updated build strings. 2021-09-06 01:00:37 +02:00
artica 42a999b207 Auto-updated build strings. 2021-09-05 01:00:13 +02:00
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
Daniel Rodriguez 3f5d37493e Merge branch 'ent-7955-500-en-link-al-agente-desde-widget-list-of-latest-events-dashboard-metaconsola' into 'develop' 
fixed error with node link events list dashboard

See merge request artica/pandorafms!4382
 2021-09-03 09:44:49 +00:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
marcos 8b048c8c19 fixed error with node link events list dashboard 2021-09-02 16:43:16 +02:00
Jose Gonzalez ce2bdc1917 Fixed issues uploading files and fix vulnerability 2021-09-02 13:38:55 +02:00
Jose Gonzalez 0c96fd6f71 Merge remote-tracking branch 'origin' into ent-7804-modificar-comportamiento-file-manager 2021-09-02 12:43:05 +02:00
marcos 3547c09a16 add black theme on update manager online 2021-09-02 12:05:54 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
marcos f49d6d3088 fixed error with node link events list dashboard 2021-09-01 16:54:07 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop' 
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
 2021-09-01 13:18:10 +00:00
Daniel Rodriguez fedc46dc1d Merge branch 'ent-7953-mapas-con-estilos-mal' into 'develop' 
Fix map styles

See merge request artica/pandorafms!4380
 2021-09-01 09:11:01 +00:00
Daniel Rodriguez 8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop' 
add not option in monitor detail filter

See merge request artica/pandorafms!4112
 2021-09-01 08:54:49 +00:00
Daniel Rodriguez f94ad30df4 Merge branch 'ent-7506-ediciones-acciones-modo-advanced-no-amplia' into 'develop' 
fixed error with manual resize advanced action alerts

See merge request artica/pandorafms!4381
 2021-09-01 08:52:53 +00:00
Jose Gonzalez 73cd0fd17e Changed content of advice 2021-09-01 10:29:25 +02:00
Calvo de0352f81c MR changes 2021-09-01 09:35:31 +02:00
Calvo d5910e8a3a Merge remote-tracking branch 'origin/develop' into ent-7587-error-nombre-idioma-aleman 2021-09-01 09:14:39 +02:00
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
Daniel Rodriguez a853c8a0c6 Merge branch 'ent-7786-agentes-asignados-a-politicas-en-metaconsola' into 'develop' 
Ent 7786 agentes asignados a politicas en metaconsola

See merge request artica/pandorafms!4280
 2021-08-31 13:47:00 +00:00
Daniel Rodriguez f12f3d6cf4 Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop' 
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes

See merge request artica/pandorafms!4375
 2021-08-31 10:05:31 +00:00
Daniel Rodriguez f53969731a Merge branch 'ent-7638-11735-vista-de-eventos-en-dashboard-menus-descolocados' into 'develop' 
fixed error with wrong event list dialog in dashboard

See merge request artica/pandorafms!4374
 2021-08-31 10:03:30 +00:00
marcos 3cb2b92774 fixed error with manual resize advanced action alerts 2021-08-31 11:47:36 +02:00
fbsanchez 88e4a804f5 Fix map styles 2021-08-31 11:05:41 +02:00
artica 966a5df96a Auto-updated build strings. 2021-08-31 01:00:50 +02:00
Daniel Maya 1e845cb5e3 #7867 Fixed id_agent 2021-08-30 12:13:33 +02:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
Daniel Maya 1d8dd85bbc #7885 Fixed order 2021-08-30 10:49:07 +02:00
Daniel Rodriguez 3be0c18165 Merge branch 'ent-7889-vulnerabilidad-xss-en-elementos-de-servicios' into 'develop' 
Ent 7889 vulnerabilidad xss en elementos de servicios

See merge request artica/pandorafms!4360
 2021-08-30 08:45:13 +00:00
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00
artica dd538c48bb Auto-updated build strings. 2021-08-28 01:00:24 +02:00
Daniel Rodriguez fae4b284e4 Merge branch 'ent-7945-500-al-crear-informe' into 'develop' 
Ent 7945 500 al crear informe

See merge request artica/pandorafms!4373
 2021-08-27 12:07:24 +00:00
Daniel Rodriguez a0ff35670b Merge branch 'ent-7747-bug-en-descarga-de-plugins' into 'develop' 
Plugins get file correct downlad link

See merge request artica/pandorafms!4247
 2021-08-27 10:49:36 +00:00
José González 84b8973027 Added tip for notice to users for use single quotation 2021-08-27 12:49:27 +02:00
Daniel Rodriguez a89faed47c Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop' 
Fixed issue with last_data obtain

Closes pandora_enterprise#7823

See merge request artica/pandorafms!4338
 2021-08-27 10:46:39 +00:00
Daniel Rodriguez 16fff8b2f5 Merge branch 'ent-7619-cambiar-parametros-lanzar-snmpwalk-configuracion-modulo' into 'develop' 
Change snmpwalk behaviour in module configuration

Closes pandora_enterprise#7619

See merge request artica/pandorafms!4221
 2021-08-27 10:45:42 +00:00
Daniel Maya c4e6c52fe2 #7915 fixed custom field filter 2021-08-27 11:24:23 +02:00
marcos 05de5f643f fixed error with wrong event list dialog in dashboard 2021-08-27 09:20:30 +02:00
artica 72e46df88b Auto-updated build strings. 2021-08-27 01:00:23 +02:00
marcos 2ed657c166 updates 2021-08-26 12:42:16 +02:00
Daniel Rodriguez c172afe1ce Merge branch 'ent-7940-Bug-items-de-informes-en-open' into 'develop' 
Ent 7940 bug items de informes en open

See merge request artica/pandorafms!4372
 2021-08-26 10:13:13 +00:00
Daniel Maya 0a79014480 #7495 fixed report name 2 2021-08-26 12:03:14 +02:00
Daniel Maya 88c42d953f #7495 fixed report name 2021-08-26 12:01:59 +02:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
Daniel Rodriguez f33ccf1db9 Merge branch 'ent-7613-wizard-configuracion-inicial' into 'develop' 
Fix select2 write search field on dialog

See merge request artica/pandorafms!4242
 2021-08-26 08:55:57 +00:00
artica a8fcec1f6a Auto-updated build strings. 2021-08-26 01:00:50 +02:00
Jose Gonzalez 18cdc49b88 bad intentions directory creation avoided and solved some issues 2021-08-25 17:13:07 +02:00
Daniel Rodriguez d701e50b9f Merge branch 'ent-7684-mostrar-campo-con-el-nombre-de-nodo-que-viene-en-metaconsola-en-la-vista-de-detalle-del-evento' into 'develop' 
add node name on event details

See merge request artica/pandorafms!4274
 2021-08-25 13:01:02 +00:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez e6c5d1a6ef Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop' 
Change time check for cron

Closes pandora_enterprise#7392

See merge request artica/pandorafms!4296
 2021-08-25 12:57:40 +00:00
Daniel Rodriguez 61baf63a6a Merge branch 'ent-7819-500-al-ordernar-items-de-informes' into 'develop' 
fixed error 500 when sort report items

See merge request artica/pandorafms!4314
 2021-08-25 12:52:33 +00:00
Daniel Rodriguez 3be8971360 Merge branch 'ent-7887-Vulnerabilidad-xss-en-operaciones-masivas-de-módulos' into 'develop' 
Ent 7887 vulnerabilidad xss en operaciones masivas de módulos

See merge request artica/pandorafms!4365
 2021-08-25 12:52:06 +00:00
Daniel Maya c8fb8a441f #7940 Fixed server filter in open 2021-08-25 13:43:13 +02:00
fbsanchez 8b941b4d30 Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-25 11:13:35 +02:00
José González 8982e3d49b Fixed typo 2021-08-25 10:38:22 +02:00
José González 357b47a6d5 Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-25 10:27:56 +02:00
artica f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
Jose Gonzalez 1bbcc47344 Merge remote-tracking branch 'origin' into ent-7911-errores-file-manager 2021-08-24 16:17:33 +02:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop' 
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
 2021-08-24 12:28:03 +00:00
marcos 24a66f0173 updates 2021-08-24 13:30:50 +02:00
José González a930dc1d8a Merge branch 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' of https://brutus.artica.es:8081/artica/pandorafms into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-24 11:52:51 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
artica 5163f2831d Auto-updated build strings. 2021-08-24 01:00:38 +02:00
fbsanchez 9bdbad17db Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-23 15:40:23 +02:00
José González 6358f3fc9b Fixed issues with files upload 2021-08-23 15:35:47 +02:00
Daniel Rodriguez 3dc6db320e Merge branch 'ent-7725-bug-en-creacion-de-itmes-sla' into 'develop' 
Fixed SLA report items creating empty extra item

See merge request artica/pandorafms!4253
 2021-08-23 10:50:10 +00:00
Daniel Rodriguez 9cf9d99e7b Merge branch 'ent-7908-BIS-Error-visual-menu-principal-consola' into 'develop' 
Fix visual issue with position

Closes pandora_enterprise#7908

See merge request artica/pandorafms!4367
 2021-08-23 10:49:39 +00:00
Daniel Rodriguez 76ead757b0 Merge branch 'ent-7689-busqueda-de-usuarios-con-paginacion' into 'develop' 
fixed error with pagination user filter

See merge request artica/pandorafms!4209
 2021-08-23 10:48:46 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
Daniel Rodriguez 8a7dbf653b Merge branch 'ent-7909-campos-Data-no-muestran-valores-String' into 'develop' 
Fix issues with string values

Closes pandora_enterprise#7909

See merge request artica/pandorafms!4366
 2021-08-23 08:37:58 +00:00
José González 9c508e05c1 Fix visual issue with position 2021-08-23 10:04:34 +02:00
marcos 4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
marcos 61409b72b4 Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail 2021-08-23 08:52:17 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
artica e3619915cc Auto-updated build strings. 2021-08-23 01:00:21 +02:00
artica a8ae80f8a6 Auto-updated build strings. 2021-08-22 01:00:15 +02:00
artica 0f34554ba6 Auto-updated build strings. 2021-08-21 01:00:32 +02:00
José González 2f0681c29b Fix issues with string values 2021-08-20 14:11:03 +02:00
Daniel Rodriguez 8b9cb51d1e Merge branch 'ent-7884-metaconsola-no-se-pueden-crear-items-en-consola-visual' into 'develop' 
Fix issue with redeclaration of functions_metaconsole.php

Closes pandora_enterprise#7884

See merge request artica/pandorafms!4362
 2021-08-20 09:13:38 +00:00
artica 7e71b6537f Auto-updated build strings. 2021-08-20 01:00:19 +02:00
alejandro.campos@artica.es c07a112f4b migrate histrogram report items 2021-08-19 16:23:52 +02:00
Jose Gonzalez 7c89b271ac Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-19 14:31:14 +02:00
Daniel Maya 9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Daniel Rodriguez ffa2aa717b Merge branch 'ent-7908-error-visual-grave-menu-principal-consola' into 'develop' 
Fix issue with initial visual problems

See merge request artica/pandorafms!4363
 2021-08-19 08:21:08 +00:00
José González b515bfe443 Fix merge 2021-08-19 09:39:13 +02:00
Jose Gonzalez 20c0d87165 Fix issue with initial visual problems 2021-08-19 08:18:06 +02:00
artica 38c044f2ae Auto-updated build strings. 2021-08-19 01:00:34 +02:00
Jose Gonzalez 1bba211086 Fix issue with redeclaration of functions_metaconsole.php 2021-08-18 15:07:34 +02:00
Daniel Maya fc4074b70b Fixed xss vulnerability 2021-08-18 13:57:47 +02:00
artica a1942147e4 Auto-updated build strings. 2021-08-18 01:00:49 +02:00
Daniel Rodriguez 8621d8cbb8 Merge branch 'ent-7824-problemas-vista-mobile' into 'develop' 
Fixed issues

Closes pandora_enterprise#7824

See merge request artica/pandorafms!4315
 2021-08-17 12:20:18 +00:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop' 
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
 2021-08-17 12:19:54 +00:00
Daniel Maya 0fd076810d Added services view widget 2 2021-08-17 13:32:54 +02:00
Daniel Rodriguez cf963992b0 Merge branch 'ent-7876-Datos-webserver-String-no-se-visualizan-en-botón-101' into 'develop' 
Ent 7876 datos webserver string no se visualizan en botón 101

See merge request artica/pandorafms!4341
 2021-08-17 07:10:04 +00:00
Daniel Rodriguez 44dcdb03bc Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop' 
Ent 7542 11882 buscador de acciones no funciona

See merge request artica/pandorafms!4343
 2021-08-17 07:09:26 +00:00
Daniel Rodriguez af6319eeb4 Merge branch 'ent-7531-menu-lateral-no-se-oculta-correctamente' into 'develop' 
Clean code and fix issue with lateral main menu

Closes pandora_enterprise#7531

See merge request artica/pandorafms!4213
 2021-08-17 07:08:34 +00:00
Daniel Rodriguez e75db62389 Merge branch 'ent-7124-vulnerabilidad-en-libreria-jquery' into 'develop' 
Upgraded jquery to 3.6.0, without npm

See merge request artica/pandorafms!4351
 2021-08-17 06:39:49 +00:00
artica 9f65e8deb0 Auto-updated build strings. 2021-08-17 01:00:44 +02:00
José González 1aa788bd83 Fix issue with colours in mobile view 2021-08-16 16:32:20 +02:00
José González 596a2d63f9 Merge remote-tracking branch 'origin' into ent-7824-problemas-vista-mobile 2021-08-16 11:33:40 +02:00
José González baa49edd24 Merge branch 'develop' into 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' 
# Conflicts:
#   pandora_console/include/functions_html.php
 2021-08-16 09:18:54 +00:00
alejandro.campos@artica.es 21e15752cf fixed select2 search in action update 2021-08-16 11:04:52 +02:00
José González 66ebe2ebf4 Merge branch 'develop' into 'ent-7531-menu-lateral-no-se-oculta-correctamente' 
# Conflicts:
#   pandora_console/index.php
 2021-08-16 08:12:40 +00:00