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

32373 Commits

Author SHA1 Message Date
Jose Gonzalez d33babd48a Fix user modification-creation 2023-02-13 14:23:31 +01:00
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 54f287f754 Added missed icons in DB 2023-02-10 14:54:50 +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
Diego Muñoz-Reja d581f88311 Merge branch 'ent-10242-crear-scripts-para-bd-historica-externa' into 'develop' 
10242 adding scripts for external databases

See merge request artica/pandorafms!5522
 2023-02-09 17:02:13 +00:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Diego Muñoz-Reja d89e29244b Merge branch 'ent-10176-14779-error-calculo-de-servicios-con-modulos-deshabilitados' into 'develop' 
Ent 10176 14779 error calculo de servicios con modulos deshabilitados

See merge request artica/pandorafms!5477
 2023-02-09 11:24:19 +00: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
Daniel Rodriguez 2768fbbf59 Merge branch 'ent-10051-module_timeout-no-mata-el-proceso-que-se-estuviera-ejecutando' into 'develop' 
Update pandora_exec and pandora_agent_exec.

See merge request artica/pandorafms!5505
 2023-02-08 15:08:45 +00:00
Diego Muñoz-Reja 7e157b57de Merge branch 'ent-10329-limitar-el-numero-de-modulos-unknown-que-se-procesan-en-cada-iteracion' into 'develop' 
Limit the number of unknown modules processed per iteration.

See merge request artica/pandorafms!5521
 2023-02-08 14:48:58 +00:00
Ramon Novoa 396c1e57f0 Update pandora_exec and pandora_agent_exec. 
The previous versions of pandora_exec and pandora_agent_exec did not kill
the running process after a timeout.
 2023-02-08 15:00:07 +01:00
rafael fc7673f651 10242 adding scripts for external databases 2023-02-08 14:59:24 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +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 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22:52 +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
Daniel Rodriguez 01acebf1eb Merge branch 'ent-10269-bloqueo-de-xml-dataserver-tiene-cientos-de-xml-pero-no-procesa' into 'develop' 
Make sure producers always release agent locks.

See merge request artica/pandorafms!5478
 2023-02-07 11:31:04 +00:00
Daniel Rodriguez f9e3897beb Merge branch 'ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms' into 'develop' 
Ent 9220 verificar y capar en su caso que las colecciones no funcionan en la nms

See merge request artica/pandorafms!5516
 2023-02-07 11:23:59 +00: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
Matias Didier 1d9c3a5f29 Merge branch 'ent-10249-guardia-problemas-en-grupos-anidados-para-visualizar-modulos-criticos' into 'develop' 
Ent 10249 guardia problemas en grupos anidados para visualizar modulos criticos

See merge request artica/pandorafms!5486
 2023-02-07 09:57:37 +00:00
vgilc 839e8a3515 Merge branch 'ent-update-japanese-console-translation' into 'develop' 
Updated Japanese console translations.

See merge request artica/pandorafms!5512
 2023-02-07 09:02:21 +00: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
Daniel Rodriguez 35aa64b281 Merge branch 'ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores' into 'develop' 
implement filter save and load feature in monitor view

See merge request artica/pandorafms!5431
 2023-02-06 13:54:43 +00:00
alejandro.campos@artica.es 97ade7c461 deleted 2023-02-06 14:13:14 +01:00
alejandro.campos@artica.es bdb29231bc mr changes 2023-02-06 14:12:17 +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
Matias Didier 3ebb22d5f8 Merge branch 'ent-10100-rpm-de-la-consola-no-aplica-el-updatemr-con-rpm-u-ni-con-dnf-install' into 'develop' 
10100 deleting if congition and add the exec to update section where config php exist

See merge request artica/pandorafms!5488
 2023-02-06 13:01:38 +00:00
Ramon Novoa b12b3c2a2c Limit the number of unknown modules processed per iteration. 2023-02-06 10:48:25 +01:00