Commit Graph

17549 Commits

Author SHA1 Message Date
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +01:00
Jose Gonzalez 6de51b5617 Fixed minor issues 2023-02-10 14:55:03 +01:00
Jose Gonzalez 6a46af495d Fix issue with dev environment starting and added button fixed id parameter 2023-02-10 13:38:47 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Daniel Maya 08f0f3403a #9663 menu redesing 5 2023-02-10 11:48:32 +01:00
Jose Gonzalez ff0eb5de56 Added function 2023-02-10 11:47:20 +01:00
Rafael Ameijeiras 2c619540e0 Merge branch 'ent-10188-13786-arreglar-filtros-de-alertas-sonoras' into 'develop'
fix filter events sounds pandora_enterprise#10188

See merge request artica/pandorafms!5469
2023-02-10 08:03:34 +00:00
Rafael Ameijeiras 4e9edfd86a Merge branch 'ent-10115-problemas-de-login-ldap-con-caracteres-especiales' into 'develop'
Ent 10115 problemas de login ldap con caracteres especiales

See merge request artica/pandorafms!5456
2023-02-10 08:02:59 +00:00
Rafael Ameijeiras 616644c3cf Merge branch 'ent-10189-mejora-visual-para-el-boton-de-testeo-de-alertas-consola-sonora' into 'develop'
blink button test sound events pandora_enterprise#10189

See merge request artica/pandorafms!5470
2023-02-10 08:01:34 +00:00
Rafael Ameijeiras 413511ba8d Merge branch 'ent-10190-agregar-funcionalidad-de-visualizar-los-eventos-desde-consola-audible-de-eventos' into 'develop'
Ent 10190 agregar funcionalidad de visualizar los eventos desde consola audible de eventos

See merge request artica/pandorafms!5518
2023-02-10 07:59:42 +00:00
artica 9f8d302719 Auto-updated build strings. 2023-02-10 01:01:50 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
artica 34c61bb513 Auto-updated build strings. 2023-02-09 01:02:05 +01:00
Jose Gonzalez 4b592b6610 Minor fixes 2023-02-08 17:20:52 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
artica f845cc9478 Auto-updated build strings. 2023-02-08 01:01:58 +01:00
Daniel Cebrian ea789804f4 #10190 fixed response option 2023-02-07 17:41:27 +01:00
Daniel Cebrian 6117e1741f #10190 added popup for edit events in sound console 2023-02-07 16:48:23 +01:00
Jose Gonzalez ab1d2f38f6 Changed function name 2023-02-07 15:39:53 +01:00
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Jose Gonzalez 0eaa52a042 Added funcion for set placeholders 2023-02-07 13:20:23 +01:00
Jose Gonzalez 8f78f89aa3 Improve views and forms 2023-02-07 13:19:40 +01:00
Pablo Aragon 5b538920f0 Merge branch 'ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms 2023-02-07 11:22:20 +01:00
Junichi Satoh 380f80be29 Updated Japanese console translations. 2023-02-07 17:13:08 +09:00
artica 64c27cdd0f Auto-updated build strings. 2023-02-07 01:01:47 +01:00
Jose Gonzalez dfdcb688d4 Improve code 2023-02-06 23:10:28 +01:00
alejandro.campos@artica.es 1998829b85 Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-06 14:02:39 +01:00
Jose Gonzalez ac144de6d6 WIP: Minor fixes 2023-02-06 10:17:51 +01:00
artica e1d550142c Auto-updated build strings. 2023-02-06 01:02:18 +01:00
artica 1308ebf641 Auto-updated build strings. 2023-02-05 01:01:09 +01:00
artica d674ef3634 Auto-updated build strings. 2023-02-04 01:02:35 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Jose Gonzalez b9992c5a67 Minor fixes for solve visual issues 2023-02-03 12:37:09 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
artica 36b0fc9028 Auto-updated build strings. 2023-02-03 01:01:54 +01:00
Daniel Rodriguez f28a4d0f28 Merge branch 'ent-10162-stored-cross-site-scripting-special-days-module' into 'develop'
Ent 10162 stored cross site scripting special days module

See merge request artica/pandorafms!5444
2023-02-02 14:29:14 +00:00
Daniel Maya 1437c5a0e7 #9663 menu redesing 3 2023-02-02 13:28:48 +01:00
Rafael Ameijeiras ccb93c0918 Merge branch 'ent-10163-Remote-Code-Execution-via-Unrestricted-File-Upload' into 'develop'
fixed vulnerability

See merge request artica/pandorafms!5476
2023-02-02 10:02:15 +00:00
Matias Didier 9a7c9488eb Merge branch 'ent-10277-vista-about-tarda-mucho' into 'develop'
Ent 10277 vista about tarda mucho

See merge request artica/pandorafms!5493
2023-02-02 08:46:17 +00:00
artica b674569613 Auto-updated build strings. 2023-02-02 01:01:52 +01:00
Daniel Cebrian 427ab4d058 #10277 remove db size in about popup 2023-02-01 17:51:31 +01:00
Jose Gonzalez bd26aa8f8d Minor fixes 2023-02-01 15:31:02 +01:00
Jose Gonzalez 2c8c1d4593 Minor fixes and improvements 2023-02-01 15:14:32 +01:00
Daniel Maya dcc5f76166 #9663 menu redesing 2 2023-02-01 09:45:10 +01:00
alejandro.campos@artica.es e4f5a9a61a Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-01 09:36:42 +01:00