28746 Commits

Author SHA1 Message Date
fbsanchez
8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
fbsanchez
81e696a045 fix in not null matching rule 2021-10-08 15:30:32 +02:00
fbsanchez
fa35e6054c Fixes 2021-10-08 15:30:17 +02:00
fbsanchez
1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
Jose Gonzalez
eaaab1e250 Added visual tab Custom data in events 2021-10-08 14:59:18 +02:00
Jose Gonzalez
0414b9991a Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-7972-funcionalidad-historico-de-alertas-lanzadas 2021-10-08 14:03:25 +02:00
Daniel Rodriguez
16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop'
show only events filter in acl groups

See merge request artica/pandorafms!4451
2021-10-08 08:09:19 +00:00
artica
eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
marcos
96638189f2 new integriaims logo 2021-10-07 16:46:49 +02:00
marcos
85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
Daniel Rodriguez
c69f418093 Merge branch 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme' into 'develop'
merge conflict

See merge request artica/pandorafms!4452
2021-10-07 14:11:43 +00:00
marcos
d4108c4e8b show only events fetch with user groups 2021-10-07 16:11:23 +02:00
Marcos Alconada
4378c3d6f5 Merge branch 'develop' into 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme'
# Conflicts:
#   pandora_console/include/styles/pandora_black.css
2021-10-07 13:42:14 +00:00
Daniel Rodriguez
f25035db58 Merge branch 'ent-8086-iconos-de-tree-view-metaconsola-rotos' into 'develop'
Some ui_get_full_url improvements

See merge request artica/pandorafms!4449
2021-10-07 13:36:30 +00:00
Daniel Rodriguez
e1a55e78ac Merge branch 'ent-8094-iconos-de-politicas-en-blanco-black-theme' into 'develop'
set bg transparent on images black theme

See merge request artica/pandorafms!4454
2021-10-07 13:34:57 +00:00
Jose Gonzalez
2c22e53e9d Fixed Diagnostics 2021-10-07 14:20:59 +02:00
Jose Gonzalez
94431236b1 Fixed pot file 2021-10-07 14:19:13 +02:00
marcos
f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +02:00
marcos
34350c92a0 fixed visual black theme error 2021-10-07 13:43:46 +02:00
fbsanchez
d4ceaa4643 Recreate service modules 2021-10-07 13:21:04 +02:00
marcos
030b45af8e add new filter fot litghbulb_off 2021-10-07 12:50:10 +02:00
marcos
afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
fbsanchez
2050c137ec errata fix 2021-10-07 12:25:41 +02:00
Daniel Rodriguez
2118f44a7a Merge branch 'ent-7964-nug-visual-en-tree-view' into 'develop'
Added title attr to module names in treeview

See merge request artica/pandorafms!4412
2021-10-07 08:42:01 +00:00
marcos
52f87757d6 set bg transparent on images black theme 2021-10-07 10:30:05 +02:00
Daniel Maya
e9b6acc1a8 #8039 Fixed network link 2021-10-07 10:27:31 +02:00
marcos
795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
artica
c7face04e1 Auto-updated build strings. 2021-10-07 01:00:20 +02:00
fbsanchez
6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
marcos
f42e57efbe show only events filter in acl groups 2021-10-06 17:11:45 +02:00
Daniel Maya
eab82aa6d1 #8049 Fixed get visual console with selected node 2021-10-06 16:49:21 +02:00
fbsanchez
35eb1d0790 Some ui_get_full_url improvements 2021-10-06 15:13:21 +02:00
fbsanchez
8764413597 Some ui_get_full_url improvements 2021-10-06 15:07:46 +02:00
fbsanchez
dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez
3f86528c80 Merge branch 'ent-7910-pandora-db-con-db-encriptada' into 'develop'
Fix issue with encrypted password

Closes pandora_enterprise#7910

See merge request artica/pandorafms!4433
2021-10-06 12:42:12 +00:00
Daniel Rodriguez
ce656997a5 Merge branch 'ent-8078-Los-tokens-de-selector-general-del-wizard-SNMP-no-funcionan' into 'develop'
fix block selector in snmp wizards

See merge request artica/pandorafms!4443
2021-10-06 12:28:40 +00:00
Jose Gonzalez
a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
Daniel Rodriguez
69216e1bcf Merge branch 'ent-8056-12473-Funcion-get-magic-quotes-gpc-hace-fallar-snmp-browser-para-PHP-7-4-o-superior' into 'develop'
removed deprecated get_magic_quotes_gpc function and dependent code

See merge request artica/pandorafms!4439
2021-10-06 10:30:58 +00:00
Calvo
50dbeb03ce Fix entities on modules with large name treeview 2021-10-06 10:41:55 +02:00
Daniel Rodriguez
35c877ad79 Merge branch 'ent-8024-source-ip-advanced-filter' into 'develop'
Ent 8024 source ip advanced filter

See merge request artica/pandorafms!4430
2021-10-06 08:34:56 +00:00
Daniel Rodriguez
a674aeeb91 Merge branch 'ent-8054-12471-Conteo-erroneo-de-agentes-para-licenciamiento' into 'develop'
fixed count

See merge request artica/pandorafms!4441
2021-10-06 08:34:13 +00:00
Daniel Rodriguez
8b889b6c5b Merge branch 'ent-7990-error-servicios-metaconsola-detras-de-un-reverse-proxy' into 'develop'
Please check carefully this change

See merge request artica/pandorafms!4442
2021-10-06 08:32:46 +00:00
Daniel Rodriguez
b56026ef59 Merge branch 'ent-8051-Giss-informe-de-grafica-de-prediccion-no-funciona-en-metaconsola' into 'develop'
fixed projection report in metaconsole

See merge request artica/pandorafms!4440
2021-10-06 08:31:30 +00:00
Rafael Ameijeiras
b6526946d7 Merge branch 'ent-8079-anadir-compatibilidad-redhat-8-al-instalador-de-agente-cloud' into 'develop'
adding rhel8.4 support to cloud agent deploy good

See merge request artica/pandorafms!4446
2021-10-06 07:54:17 +00:00
Rafael Ameijeiras
e094869de8 adding rhel8.4 support to cloud agent deploy 2021-10-06 09:50:27 +02:00
artica
1ebc2ed082 Auto-updated build strings. 2021-10-06 01:00:22 +02:00
fbsanchez
e335bb6885 some fixes, please hard test 2021-10-05 17:03:06 +02:00
alejandro.campos@artica.es
4016d97c39 fix block selector in snmp wizards 2021-10-05 16:51:13 +02:00
fbsanchez
b8dc85a0dd wip 2021-10-05 16:42:24 +02:00
fbsanchez
ec8d5b4fe4 Please check carefully this change 2021-10-05 15:09:30 +02:00