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

27219 Commits

Author SHA1 Message Date
Rafael Ameijeiras 37d0cff221 Merge branch 'ent-10340-gotty-quickshell-no-funciona' into 'develop' 
Fix gotty host missing on ws.php

See merge request artica/pandorafms!5812
 2023-05-08 06:05:31 +00:00
artica 4653ebd854 Auto-updated build strings. 2023-05-08 01:00:20 +02:00
artica 6a0d746892 Auto-updated build strings. 2023-05-07 01:00:13 +02:00
artica 0db1ef549a Auto-updated build strings. 2023-05-06 01:00:19 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
Daniel Rodriguez ebd5f6c01f Merge branch 'ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados' into 'develop' 
Recovered alerts skipping when threshold applies

See merge request artica/pandorafms!5653
 2023-05-05 07:58:31 +00:00
Calvo 56a587791c Change correct MR 2023-05-05 09:10:49 +02:00
artica d4107cad5d Auto-updated build strings. 2023-05-05 01:00:19 +02:00
Calvo 8c73a0176d Alert recuperation only executes one time if in threshold interval 2023-05-04 20:18:36 +02:00
Daniel Rodriguez 38d2d66469 Merge branch 'ent-10597-pantalla-de-error-de-sistemas-no-mergeados' into 'develop' 
Ent 10597 pantalla de error de sistemas no mergeados

See merge request artica/pandorafms!5705
 2023-05-04 17:15:16 +00:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop' 
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
 2023-05-04 14:37:48 +00:00
Jonathan 477dc1d14d #10597 add logo pandora maintenance 2023-05-04 16:28:51 +02:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
Calvo c74ed4914b Websocket engine test button 2023-05-04 11:37:16 +02:00
artica 151358190c Auto-updated build strings. 2023-05-04 01:00:20 +02:00
Matias Didier 5983333965 Merge branch 'ent-10908-Fallo-en-el-editor-de-tips' into 'develop' 
changes regarding encoding of tables

See merge request artica/pandorafms!5763
 2023-05-03 11:01:06 +00:00
Matias Didier 1d81b67082 Merge branch 'ent-10530-giss-demasiados-modulos-en-cola-en-vista-de-servidores' into 'develop' 
Ent 10530 giss demasiados modulos en cola en vista de servidores

See merge request artica/pandorafms!5688
 2023-05-03 09:25:04 +00:00
Daniel Maya 87a55dd26a #10530 Added img 2023-05-03 09:32:52 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
artica 77ac357745 Auto-updated build strings. 2023-05-03 01:00:14 +02:00
artica b58ece6359 Auto-updated build strings. 2023-05-02 01:00:10 +02:00
artica 2e9c6a339f Auto-updated build strings. 2023-05-01 01:00:13 +02:00
artica 0bef49b5e7 Auto-updated build strings. 2023-04-30 01:00:18 +02:00
artica 459da487b8 Auto-updated build strings. 2023-04-29 01:00:23 +02:00
Calvo 8c65652c64 Fix gotty host missing on ws.php 2023-04-28 14:06:35 +02:00
Matias Didier 56614f8df0 Merge branch 'ent-10474-mejorar-visualmente-mapa-dinamico-sunburst' into 'develop' 
Ent 10474 mejorar visualmente mapa dinamico sunburst

See merge request artica/pandorafms!5800
 2023-04-28 11:01:17 +00:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
Daniel Rodriguez 0bc18b47db Merge branch 'ent-10420-14668-errores-en-usuarios-ldap-ad-con-apostrofes' into 'develop' 
Ent 10420 14668 errores en usuarios ldap ad con apostrofes

See merge request artica/pandorafms!5687
 2023-04-28 07:03:37 +00:00
Daniel Rodriguez d5450853f5 Merge branch 'ent-10833-15134-bug-en-chromium-111-0-5563-64-1' into 'develop' 
update composer

See merge request artica/pandorafms!5674
 2023-04-28 06:11:25 +00:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop' 
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
 2023-04-28 06:07:10 +00:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' 
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
 2023-04-28 06:04:18 +00:00
artica 153294a9b0 Auto-updated build strings. 2023-04-28 01:00:28 +02:00
Daniel Maya e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +02:00
artica 0b5672980d Auto-updated build strings. 2023-04-27 01:00:23 +02:00
Rafael Ameijeiras da0aa3c7e7 Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil-2' into 'develop' 
Ent 9555 revision visual ui de la vista movil 2

See merge request artica/pandorafms!5779
 2023-04-26 11:52:16 +00:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop' 
several minor fixes

See merge request artica/pandorafms!5638
 2023-04-26 08:57:03 +00:00
artica 8effae4991 Auto-updated build strings. 2023-04-26 01:00:20 +02:00
Matias Didier f0194286d6 Merge branch 'ent-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente-2' into 'develop' 
Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente 2

See merge request artica/pandorafms!5778
 2023-04-25 15:39:49 +00:00
Pablo Aragon abf5e027c5 9555-Subservice remove href 2023-04-25 16:40:06 +02:00
Pablo Aragon d998610d66 9555-Services href 2023-04-25 16:04:17 +02:00
Diego Muñoz-Reja ed6364d3c0 Merge branch 'ent-11024-pete-sql-en-remote-components' into 'develop' 
Ent 11024 pete sql en remote components

See merge request artica/pandorafms!5755
 2023-04-25 13:47:34 +00:00
Rafael Ameijeiras 1bf69af3c8 Merge branch 'ent-10960-falta-tabla-tsesion_filter-en-la-instalacion-de-la-version-769' into 'develop' 
Ent 10960 falta tabla tsesion filter en la instalacion de la version 769

See merge request artica/pandorafms!5731
 2023-04-25 13:28:10 +00:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop' 
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
 2023-04-25 13:27:07 +00:00
Rafael Ameijeiras 5d943510be Merge branch 'ent-10363-15056-CPS-Disabled-desaparece-al-deshabilitarlo-en-Opciones-Avanzadas-de-Modulo' into 'develop' 
minor fix in cps selector

See merge request artica/pandorafms!5665
 2023-04-25 13:26:26 +00:00
Rafael Ameijeiras d08d5319dc Merge branch 'ent-10471-When-a-group-is-deleted-SNMP-alerts-that-used-it-disappear' into 'develop' 
added limitation to group deletion

See merge request artica/pandorafms!5643
 2023-04-25 13:25:03 +00:00
Pablo Aragon 38849e6ed2 9555-Change media queries 2023-04-25 14:36:30 +02:00
Pablo Aragon 6540a229e1 10755-Horizontal graph legend & interfaz graph 2023-04-25 13:31:59 +02:00
alejandro.campos@artica.es ee5f79bb7a change text 2023-04-25 09:16:48 +02:00
artica db2b2b796b Auto-updated build strings. 2023-04-25 01:00:22 +02:00