Commit Graph

34802 Commits

Author SHA1 Message Date
Rafael Ameijeiras 7cbae9d6d5 Merge branch 'ent-11660-errores-en-operaciones-masivas' into 'develop'
Ent 11660 Errores en operaciones masivas

See merge request artica/pandorafms!6183
2023-06-29 09:43:39 +00:00
Gorka Sanchez c660d8c936 Merge branch 'ent-11025-15460-filtro-incorrecto-en-seccion-plantillas-de-alerta-en-metaconsola' into 'develop'
Ent 11025 15460 filtro incorrecto en seccion plantillas de alerta en metaconsola

See merge request artica/pandorafms!6192
2023-06-29 08:54:59 +00:00
Gorka Sanchez 47b46456b3 Merge branch 'ent-10729-15255-15647-Numero-de-Agentes-en-Tactical-View-de-Metaconsola-incorrecto-cuando-los-Agentes-tienen-Grupos-Secundarios' into 'develop'
fix count

See merge request artica/pandorafms!6191
2023-06-29 08:38:06 +00:00
Rafael Ameijeiras f5f86c9fa2 Merge branch 'ma2sim-develop-patch-81134' into 'develop'
Change return value of function agents_get_agent_id_by_alias when alias is ''

See merge request artica/pandorafms!5498
2023-06-29 08:35:28 +00:00
Matias Didier cbd60b0c9e Merge branch 'ent-9567-derivado-del-trabajo-q-a-765-formulario-para-modificar-alertas-debe-ser-ampliado-en-tamano' into 'develop'
Ent 9567 derivado del trabajo q a 765 formulario para modificar alertas debe ser ampliado en tamano

See merge request artica/pandorafms!5787
2023-06-29 06:55:30 +00:00
miguel angel rasteu 487b6673d1 #11671 Fix color in tactical view 2023-06-29 08:09:06 +02:00
artica a50038f359 Auto-updated build strings. 2023-06-29 01:00:54 +02:00
alejandro.campos@artica.es 029425256d minor change 2023-06-28 20:53:29 +02:00
Jorge Rincon 9a20ea1231 #11025 Fixed the bug that cuts the text of the Search field 2023-06-28 17:21:06 +02:00
Daniel Cebrian 6074103e78 #11660 fixed error 500 2023-06-28 17:03:22 +02:00
alejandro.campos@artica.es 25fb4ebcac fix count 2023-06-28 16:43:14 +02:00
miguel angel rasteu 9b917e3207 #11670 Fix hhome page index 2023-06-28 15:09:21 +02:00
miguel angel rasteu 2e110fb162 #11670 Fix home page 2023-06-28 15:08:09 +02:00
Matias Didier 8e42ee6c82 Merge branch 'ent-11262-15597-modulos-deshabiitados-aparecen-en-el-widget-del-dashboard-de-reportes' into 'develop'
Ent 11262 15597 modulos deshabiitados aparecen en el widget del dashboard de reportes

See merge request artica/pandorafms!5966
2023-06-28 12:05:03 +00:00
Daniel Cebrian 4d58240ce3 #11660 fixed error 500 in bulk operation module 2023-06-28 13:27:25 +02:00
alejandro.campos@artica.es 238481fa4c minor fix 2023-06-28 13:01:41 +02:00
alejandro.campos@artica.es 2366a89850 fixed error 2023-06-28 12:19:05 +02:00
Matias Didier 3c748d2520 Merge branch 'ent-10144-modo-centralizado-impide-ver-en-que-agentes-se-usan-los-plugins' into 'develop'
Ent 10144 modo centralizado impide ver en que agentes se usan los plugins

See merge request artica/pandorafms!6004
2023-06-28 10:10:48 +00:00
alejandro.campos@artica.es 1225c055a1 removed hash in url from agent id link 2023-06-28 09:35:49 +02:00
artica 2e69aa9086 Auto-updated build strings. 2023-06-28 01:01:55 +02:00
rafael 0bd3c1525e 11663 fix typo 2023-06-27 16:40:41 +02:00
rafael 67b3df4890 11663 use variable instead of path for multiple instance check conf exepction 2023-06-27 16:34:21 +02:00
alejandro.campos@artica.es 2a6a53ccd5 some fixes 2023-06-27 16:20:30 +02:00
Daniel Cebrian 7c99e788c7 #10691 added image no data in pue graph 2023-06-27 15:53:42 +02:00
Alejandro Sánchez 960ede0e15 Merge branch 'ent-11249-plugin-udp-port-check-no-realiza-bien-la-comprobacion' into 'develop'
added grep -v filtered in call

See merge request artica/pandorafms!6178
2023-06-27 13:31:34 +00:00
alejandro 964b26ca2d added grep -v filtered in call 2023-06-27 15:29:49 +02:00
Matias Didier 63ee67bdff Merge branch 'ent-11143-se-descoloca-menu-de-paginas-al-pasar-de-14' into 'develop'
Ent 11143 se descoloca menu de paginas al pasar de 14

See merge request artica/pandorafms!5902
2023-06-27 13:24:37 +00:00
Daniel Cebrian 70ae1f20e4 #11648 fixed email send with encrypt password 2023-06-27 15:11:18 +02:00
Matias Didier ac25997f45 Merge branch 'ent-10963-icono-de-reset-erroneo' into 'develop'
Ent 10963 icono de reset erroneo

See merge request artica/pandorafms!5770
2023-06-27 12:16:36 +00:00
Rafael Ameijeiras d0f33605e0 Merge branch 'ent-10815-operaciones-masivas-permiten-cambiar-parametros-que-deberian-estar-bloqueados-de-modulos-de' into 'develop'
Ent 10815 operaciones masivas permiten cambiar parametros que deberian estar bloqueados de modulos de

See merge request artica/pandorafms!5823
2023-06-27 12:07:15 +00:00
Matias Didier 5795196380 Merge branch 'ent-11575-bug-en-edicion-de-layer-gis' into 'develop'
Ent 11575 bug en edicion de layer gis

See merge request artica/pandorafms!6148
2023-06-27 11:51:38 +00:00
Rafael Ameijeiras 2eea623912 Merge branch 'ent-10353-#15036-Componentes-con-el-mismo-nombre' into 'develop'
Ent 10353 #15036 componentes con el mismo nombre

See merge request artica/pandorafms!5714
2023-06-27 11:27:40 +00:00
Rafael Ameijeiras 48e29def9b Merge branch 'ent-10252-errata-en-la-interfaz-de-bases-de-datos-de-nodos-y-metaconsola' into 'develop'
Ent 10252 errata en la interfaz de bases de datos de nodos y metaconsola

See merge request artica/pandorafms!5696
2023-06-27 11:26:37 +00:00
Rafael Ameijeiras 520f0c77d1 Merge branch 'ent-10266-tip-sobre-opcion-de-setup-en-version-opensource-setup-visual-precision-de-datos' into 'develop'
Ent 10266 tip sobre opcion de setup en version opensource setup visual precision de datos

See merge request artica/pandorafms!5703
2023-06-27 11:26:02 +00:00
Rafael Ameijeiras 7fd836d8de Merge branch 'ent-11503-campo-comments-ocupa-mucho-para-lo-que-muestra-eventos' into 'develop'
Ent 11503 campo comments ocupa mucho para lo que muestra eventos

See merge request artica/pandorafms!6158
2023-06-27 11:22:44 +00:00
Rafael Ameijeiras 9b1e413fcc Merge branch 'ent-11560-item-de-inventory-en-informes-funciona-mal-en-meta-y-nodo' into 'develop'
Ent 11560 item de inventory en informes funciona mal en meta y nodo

See merge request artica/pandorafms!6127
2023-06-27 11:21:52 +00:00
miguel angel rasteu f934d72af9 #11143 Fix auto width modal 2023-06-27 13:09:57 +02:00
miguel angel rasteu 2842a5d3cd #11372 fix consolelog 2023-06-27 11:51:45 +02:00
miguel angel rasteu 1df94901f6 #11372 trim long file names 2023-06-27 11:48:45 +02:00
Enrique Martin 0c7c9addea Set restart to 0 in new installations 2023-06-27 11:29:45 +02:00
miguel angel rasteu 69c6c328c2 #11657 Fix inventory item sql error 2023-06-27 11:08:29 +02:00
Matias Didier fc3a0766f8 Merge branch 'ent-11152-parametro-de-filtro-de-monitor-detail-se-desmarca-solo' into 'develop'
Ent 11152 parametro de filtro de monitor detail se desmarca solo

See merge request artica/pandorafms!5886
2023-06-27 08:55:29 +00:00
Matias Didier 43e158011a Merge branch 'ent-11139-icono-de-lupa-descolocado-en-alert-details' into 'develop'
Ent 11139 icono de lupa descolocado en alert details

See merge request artica/pandorafms!5877
2023-06-27 08:37:39 +00:00
Matias Didier 6b9145eeca Merge branch 'ent-11342-15659-bug-visual-en-configuartion-events' into 'develop'
Ent 11342 15659 bug visual en configuartion events

See merge request artica/pandorafms!6088
2023-06-27 08:01:10 +00:00
artica c246788f34 Auto-updated build strings. 2023-06-27 01:01:02 +02:00
miguel angel rasteu f33e569e7b #11503 Fix event class 2023-06-26 17:09:38 +02:00
Matias Didier af33f168b6 Merge branch 'ent-11415-15702-no-existe-editor-html-al-configurar-el-widget-panel-con-un-mensaje' into 'develop'
Ent 11415 15702 no existe editor html al configurar el widget panel con un mensaje

See merge request artica/pandorafms!6003
2023-06-26 14:06:05 +00:00
miguel angel rasteu 7934551ff0 #11415 Fix tinymce editor html 2023-06-26 15:17:45 +02:00
Matias Didier e1fe10f3e3 Merge branch 'ent-11380-15677-selector-filtro-por-estado-monitor-view-metaconsola' into 'develop'
Ent 11380 15677 selector filtro por estado monitor view metaconsola

See merge request artica/pandorafms!5981
2023-06-26 12:48:46 +00:00
Matias Didier 3bbb0cb233 Merge branch 'ent-11404-15690-ordenar-interfaces-correctamente' into 'develop'
Ent 11404 15690 ordenar interfaces correctamente

See merge request artica/pandorafms!6008
2023-06-26 12:05:29 +00:00