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

33937 Commits

Author SHA1 Message Date
Ramon Novoa c8b6be3e92 Test GitLab hooks. 2023-04-13 10:17:50 +02: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
slerena a0426757b5 Minor changes of default conf for better clarificacion. Updated header (c) info and removed old log4x unused code. 2023-04-13 05:38:14 +00:00
artica 19bb879cfc Auto-updated build strings. 2023-04-13 01:01:23 +02:00
Rafael Ameijeiras 5df8a8141c Merge branch 'ent-10929-anadir-dependencias-y-chromium-version-a-las-imagenes-de-docker-open-y-enterprise' into 'develop' 
ent-10929 adding dependencies and fixed chromium version to docker community image

See merge request artica/pandorafms!5710
 2023-04-12 18:25:08 +00:00
rafael c88b223424 ent-10929 adding dependencies and fixed chromium version to docker community image 2023-04-12 19:48:17 +02:00
alejandro.campos@artica.es 23f0ffdf9e Keep In process status for new events with same extra id 2023-04-12 17:46:10 +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
Pablo Aragon 7b57607149 9555-Server status fix 2023-04-12 16:55: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
Matias Didier d613605cf2 Merge branch 'ent-10901-iconos-enormes-en-snmp-wizard' into 'develop' 
fix size icons wizard snmp pandora_enterprise#10901

See merge request artica/pandorafms!5706
 2023-04-12 12:49:00 +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
Jonathan c7b62c587b #10597 logo pandora deactivated 2023-04-12 13:39:48 +02:00
Daniel Maya 2bb016474a #10909 Fix icon group 2 2023-04-12 13:37:51 +02:00
Matias Didier 5a38024e25 Merge branch 'ent-10320-no-pide-confirmacion-al-eliminar-usuario' into 'develop' 
Ent 10320 no pide confirmacion al eliminar usuario

See merge request artica/pandorafms!5678
 2023-04-12 11:03:01 +00:00
miguel angel rasteu 425da3b36d #10913 Fix metaconsole favicon path 2023-04-12 13:01:53 +02:00
Daniel Maya d006bc3c3a #10909 Fix icon group 2023-04-12 12:23:54 +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
Daniel Rodriguez 045fbeda60 Merge branch 'ent-10915-fallo-en-version-open' into 'develop' 
#10915 fix open noaccess mesagge

See merge request artica/pandorafms!5700
 2023-04-12 09:59:18 +00:00
Jonathan 9dd9c3eaaa #10915 fix open noaccess mesagge 2023-04-12 11:46:26 +02:00
Jorge Rincon 06203dc503 #9464 fix tag filters 2023-04-12 11:02:35 +02: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 1a05c71e78 #10526 fix create module dialog 2023-04-12 10:44:20 +02:00
Jonathan aa9fefd30c #10899 entities inventory and correction visual style 2023-04-12 10:25:35 +02:00
Matias Didier 310496f135 Merge branch 'ent-10258-bug-en-edicion-de-accion-mail-to-admin' into 'develop' 
Ent 10258 bug en edicion de accion mail to admin

See merge request artica/pandorafms!5680
 2023-04-12 07:47:35 +00: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
Pablo Aragon 5f1e20e399 10886-Timestamp events with ui_print_timestamp() 2023-04-11 15:31:27 +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 57c6788a19 Merge branch 'ent-10891-no-tenemos-local-components-en-open' into 'develop' 
Ent 10891 no tenemos local components en open

See merge request artica/pandorafms!5685
 2023-04-11 12:26:31 +00: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 Rodriguez fbfd53cd7c Merge branch 'ent-10889-500-en-consola-sonora-open' into 'develop' 
Ent 10889 500 en consola sonora open

See merge request artica/pandorafms!5681
 2023-04-11 11:23:02 +00:00
Daniel Rodriguez 63b7e774a8 Merge branch 'ent-10890-No-se-pueden-crear-items-de-informes-en-open' into 'develop' 
minor fix

See merge request artica/pandorafms!5682
 2023-04-11 11:13:40 +00:00
Daniel Cebrian da2ede8627 #10420 fixed login ldap with quotes 2023-04-11 13:12:48 +02:00