19163 Commits

Author SHA1 Message Date
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
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
Jonathan
fdc13256cd #9478 create edit delete alerts from meta 2023-04-27 16:05:37 +02:00
miguel angel rasteu
2fe3662724 #11064 Fixed a conditional in the jquery code that generates the toggle which was not executed when the value of the is_metaconsole variable was 1 2023-04-27 12:34:56 +02:00
Daniel Maya
e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +02:00
alejandro.campos@artica.es
9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
miguel angel rasteu
a40c04aa49 #10660 Update the function to create the warp journal table for check the variable config prominent time and prints the timestamp according this 2023-04-27 09:08:24 +02:00
artica
0b5672980d Auto-updated build strings. 2023-04-27 01:00:23 +02: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
miguel angel rasteu
8108a84ba7 Fix incompatibility with Firefox 2023-04-25 16:47:52 +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
Daniel Cebrian
d28cd1577b #10326 regenerate api token when update password 2023-04-25 15:43:02 +02: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
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
Jonathan
d1361e38cb #11047 fix macro in plugin section node+meta 2023-04-25 14:20:44 +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
Pablo Aragon
2303b880b6 11044-Select2 black in graphs options 2023-04-24 16:49:44 +02:00
Pablo Aragon
20ff1692ae 10947-Change color heatmap notinit modules 2023-04-24 15:58:08 +02:00
Jorge Rincon
30697d5b33 #10963 icon change in the reset button, agent detail view 2023-04-24 14:31:20 +02:00
Rafael Ameijeiras
ca7e1777e5 Merge branch 'ent-11035-graficas-envio-mail-cambio-escalas' into 'develop'
flot axis Y minimum ticks size 0.5 pandora_enterprise#11035

See merge request artica/pandorafms!5766
2023-04-24 12:18:56 +00:00
Rafael Ameijeiras
2dc910005f Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil' into 'develop'
Ent 9555 revision visual ui de la vista movil

See merge request artica/pandorafms!5684
2023-04-24 11:16:30 +00:00
Matias Didier
d7ee0ca2da Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop'
Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro

See merge request artica/pandorafms!5736
2023-04-24 10:44:21 +00:00
daniel
45d5731029 flot axis Y minimum ticks size 0.5 pandora_enterprise#11035 2023-04-24 11:22:55 +02:00
Matias Didier
b8b255f7a5 Merge branch 'ent-10985-14933-error-de-privacy-method-en-functions_snmp_browser-php' into 'develop'
Ent 10985 14933 error de privacy method en functions snmp browser php

See merge request artica/pandorafms!5733
2023-04-24 08:41:24 +00:00
Pablo Aragon
b3f2c6cad1 11036-Incorrectly closed quotes 2023-04-24 09:51:33 +02:00
Rafael Ameijeiras
8bf8542676 Merge branch 'ent-11010-15353-elementos-de-la-consola-visual-no-se-refrescan' into 'develop'
fix refresh elements VC pandora_enterprise#11010

See merge request artica/pandorafms!5752
2023-04-24 07:33:40 +00:00
Jonathan
55485c43b2 #10972 remove console.log fullcalendar.js 2023-04-24 07:51:00 +02:00
artica
831e1ea05f Auto-updated build strings. 2023-04-24 01:00:17 +02:00
artica
5f79f7db89 Auto-updated build strings. 2023-04-23 01:00:18 +02:00
Jimmy Olano
1f2044386b Merge branch 'ent-10858-errata-en-mensaje-de-error-monitoring-views-tree-view' into 'develop', JJOS.
Ent 10858 errata en mensaje de error monitoring views tree view

See merge request artica/pandorafms!5724
2023-04-22 15:47:40 +00:00
artica
6a3c4fb9af Auto-updated build strings. 2023-04-22 01:00:20 +02:00
alejandro.campos@artica.es
a453ed7cea changes regarding encoding of tables 2023-04-21 15:16:51 +02:00
Jonathan
ec1eb38336 #10972 fix null calendar alerts correlation 2023-04-21 13:27:18 +02:00
miguel angel rasteu
bfe8d58d81 Change background color of progress bar with skin pandora_dark is active 2023-04-21 13:24:14 +02:00
miguel angel rasteu
c70082e12d Fix limit in SQL query 2023-04-21 09:40:14 +02:00
Jonathan
f5c517ae7d #10191 event sound fix select2 2023-04-21 09:30:22 +02:00
Jonathan
a28aef4050 #10191 fix url sound event on metaconsole 2023-04-21 08:48:19 +02:00
daniel
2ba088ff3e Merge remote-tracking branch 'origin/develop' into ent-11010-15353-elementos-de-la-consola-visual-no-se-refrescan 2023-04-21 07:33:23 +02:00
artica
180a3a52a8 Auto-updated build strings. 2023-04-21 01:00:19 +02:00
Daniel Rodriguez
af80e204de Merge branch 'ent-10255-14940-Funcionalidad-cuadro-naranja-en-las-consolas-visuales-cuando-hay-una-alerta' into 'develop'
setup check to enable/disable vc item alert frame

See merge request artica/pandorafms!5668
2023-04-20 17:22:57 +00:00
alejandro.campos@artica.es
6dfbe394a4 fixed custom oids 2023-04-20 19:15:32 +02:00
miguel angel rasteu
4b33fa241d fix column name in sql sentence 2023-04-20 16:40:28 +02:00
Rafael Ameijeiras
cd3d4cb98c Merge branch 'ent-10692-nuevo-widget-simple-graph' into 'develop'
new widget basic chart pandora_enterprise#10692

See merge request artica/pandorafms!5748
2023-04-20 12:07:11 +00:00
Daniel Rodriguez
f5a7dd40e9 Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop'
Ent 10490 theme base de tinymce

See merge request artica/pandorafms!5649
2023-04-20 11:51:13 +00:00