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

32388 Commits

Author SHA1 Message Date
Jose Gonzalez 8f65ee4fb8 Minor fix: search submit in module list 2023-02-14 07:52:13 +01:00
Jose Gonzalez c81caebe72 Fix for #10380. Issue with message boxes 2023-02-13 18:03:31 +01:00
Jose Gonzalez 3c37856fbc Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-13 17:46:18 +01:00
Daniel Maya a73c79dac3 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of https://brutus.artica.es:8081/artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-13 17:42:45 +01:00
Daniel Maya b8de74837e #9662 Added menu images 2023-02-13 17:42:37 +01:00
Jose Gonzalez 31f6c9a9d9 Minor patches 2023-02-13 17:35:54 +01:00
Jose Gonzalez 2f673487f5 Menu and header minor patches 2023-02-13 16:08:50 +01:00
Daniel Maya e7f25c3944 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of https://brutus.artica.es:8081/artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-13 14:44:41 +01:00
Daniel Maya b010965caa #9662 Fixed tactical view 2023-02-13 14:44:32 +01:00
Jose Gonzalez 3fdd0a08d1 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-13 14:32:40 +01:00
Jose Gonzalez d29661c87b Merge 2023-02-13 14:32:20 +01:00
Daniel Maya 98f82b4ce8 #9662 Fixed discovery menu 2023-02-13 14:32:02 +01:00
Jose Gonzalez 2f547c620d Fix logout button 2023-02-13 14:25:34 +01:00
Jose Gonzalez d33babd48a Fix user modification-creation 2023-02-13 14:23:31 +01:00
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Daniel Maya 7d6ace0f98 #9662 Added icon about 2023-02-13 12:43:30 +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