19098 Commits

Author SHA1 Message Date
Rafael Ameijeiras
dbba723c08 Merge branch 'ent-10918-pantallas-de-fondo-de-la-vista-de-login' into 'develop'
Ent 10918 pantallas de fondo de la vista de login

See merge request artica/pandorafms!5708
2023-04-13 12:33:42 +00:00
Matias Didier
bf7397157c Merge branch 'ent-10002-cli-anadir-comentarios-con-usuario-con-espacios-no-mete-el-nombre-en-el-comentario' into 'develop'
Ent 10002 cli anadir comentarios con usuario con espacios no mete el nombre en el comentario

See merge request artica/pandorafms!5679
2023-04-13 11:49:31 +00:00
Jonathan
7730ca6469 #10912 link to agent view in tactical group view 2023-04-13 12:16:32 +02:00
Jonathan
bc8528f511 #10926 fix visual - add button add netscanscripts 2023-04-13 11:49:10 +02:00
miguel angel rasteu
dc41e1c377 fix if in header and declare correctly a value 2023-04-13 11:36:13 +02:00
miguel angel rasteu
c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
Jonathan
7d9fb5c77a #10730 Regular expresion inventory reports 2023-04-13 10:42:37 +02:00
Matias Didier
250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop'
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
2023-04-13 08:24:18 +00:00
Pablo Aragon
d144d77128 9555-Groups, agents counters 2023-04-13 09:38:52 +02:00
alejandro.campos@artica.es
153b978778 fixed group link on General group status widget 2023-04-13 09:18:55 +02:00
artica
19bb879cfc Auto-updated build strings. 2023-04-13 01:01:23 +02:00
alejandro.campos@artica.es
2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Daniel Rodriguez
7ae8f185b0 Merge branch 'ent-10909-se-han-roto-los-iconos-de-grupo-de-agentes-en-v770' into 'develop'
Ent 10909 se han roto los iconos de grupo de agentes en v770

See merge request artica/pandorafms!5701
2023-04-12 15:29:44 +00:00
daniel
3a9b8d31bf fix icons pandora_enterprise#10909 2023-04-12 17:21:27 +02:00
Pablo Aragon
2d8d501fe8 10918-Fix login background & text 2023-04-12 17:21:18 +02:00
daniel
b186d51329 fix icons pandora_enterprise#10909 2023-04-12 17:06:58 +02:00
Daniel Maya
cd030620b2 #10909 Fix icon group 4 2023-04-12 15:51:02 +02:00
Daniel Rodriguez
01e831312d Merge branch 'ent-10917-iconos-de-so-personalizados-se-ven-rotos' into 'develop'
Ent 10917 iconos de so personalizados se ven rotos

See merge request artica/pandorafms!5707
2023-04-12 13:50:30 +00:00
Daniel Maya
7570e0d3fb #10909 Fix icon group 3 2023-04-12 15:10:05 +02:00
Matias Didier
d85c763892 Merge branch 'ent-10913-falta-el-icono-de-metaconsola' into 'develop'
Ent 10913 falta el icono de metaconsola

See merge request artica/pandorafms!5702
2023-04-12 13:06:05 +00:00
Pablo Aragon
4deec005c1 9555-Server status 2023-04-12 14:48:19 +02:00
Daniel Maya
a42c235cab #10917 Fix icon 2023-04-12 14:44:01 +02:00
daniel
07207ea8af fix size icons wizard snmp pandora_enterprise#10901 2023-04-12 14:07:31 +02:00
miguel angel rasteu
425da3b36d #10913 Fix metaconsole favicon path 2023-04-12 13:01:53 +02:00
Matias Didier
ad3f1dd8d6 Merge branch 'ent-10526-derivado-del-trabajo-de-q-a-en-ticket-https-brutus-artica-es-8081-artica-pandora_enterprise' into 'develop'
Ent 10526 derivado del trabajo de q a en ticket https brutus artica es 8081 artica pandora enterprise

See merge request artica/pandorafms!5691
2023-04-12 10:16:24 +00:00
Matias Didier
5906ab595e Merge branch 'ent-10181-Conteo-de-numero-de-eventos-erroneo-en-vista-tactica' into 'develop'
minor change

See merge request artica/pandorafms!5677
2023-04-12 08:45:04 +00:00
Jonathan
aa9fefd30c #10899 entities inventory and correction visual style 2023-04-12 10:25:35 +02:00
Pablo Aragon
c21397476e 10898-Assign secondary groups in agent view 2023-04-12 08:21:26 +02:00
artica
01527dcc67 Auto-updated build strings. 2023-04-12 01:00:14 +02:00
Jonathan
b36ade1821 #10191 fix url event sounds 2023-04-11 16:24:37 +02:00
daniel
eaf71f39ec fix comments events pandora_enterprise#10631 2023-04-11 15:43:21 +02:00
Jonathan
c6c8e60b1d #10191 no show old sound event modal 2023-04-11 15:04:21 +02:00
Jonathan
2164e0d9a2 #10526 tree view modal show on create agent 2023-04-11 14:57:53 +02:00
Daniel Cebrian
f5c31b0daf #10420 fixed fullname user in ldap 2023-04-11 14:49:34 +02:00
Daniel Rodriguez
bb0d637c3f Merge branch 'ent-10893-Error-SQL-en-menu-de-welcome-tips' into 'develop'
fixed collation compatibily with older mysql versions

See merge request artica/pandorafms!5683
2023-04-11 12:06:52 +00:00
Jonathan
3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
alejandro.campos@artica.es
5f0e9aac69 fixed free string search 2023-04-11 13:48:08 +02:00
Daniel Cebrian
da2ede8627 #10420 fixed login ldap with quotes 2023-04-11 13:12:48 +02:00
alejandro.campos@artica.es
472c342f81 fixed collation compatibily with older mysql versions 2023-04-11 11:24:42 +02:00
Pablo Aragon
b3becfc861 10889-500 acustic console 2023-04-11 10:06:47 +02:00
artica
9da3816a88 Auto-updated build strings. 2023-04-11 01:00:13 +02:00
Daniel Maya
837092d17e #10002 Fixed comments 2023-04-10 16:57:22 +02:00
daniel
086f742455 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
	pandora_console/operation/agentes/ver_agente.php
2023-04-10 16:42:41 +02:00
daniel
c0172afc3d update composer 2023-04-10 16:38:37 +02:00
alejandro.campos@artica.es
6648ef34dd minor change 2023-04-10 16:02:28 +02:00
Pablo Aragon
8c1fa4b245 10835-Logs icons 2023-04-10 14:16:15 +02:00
Daniel Rodriguez
871a8f15c5 Merge branch 'ent-10873-mini-revision-de-consola-movil' into 'develop'
Ent 10873 mini revision de consola movil

See merge request artica/pandorafms!5671
2023-04-10 12:14:26 +00:00
daniel
ba1f299440 fixed add commet event 2023-04-10 10:35:47 +02:00
Pablo Aragon
8dfb01c7da 10854-Break word SNMP Console trap 2023-04-10 10:26:15 +02:00
Jonathan
55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00