Commit Graph

21004 Commits

Author SHA1 Message Date
Daniel Maya b4433e533f Restored tatctical view 2024-03-06 15:53:04 +01:00
Rafael Ameijeiras d3f931703b Merge branch 'ent-12630-guardia-15143-problemas-con-cifrado-de-contrasenas-smtp' into 'develop'
Ent 12630 guardia 15143 problemas con cifrado de contrasenas smtp

See merge request 
2024-03-06 08:42:13 +00:00
artica f7e31eb92e Auto-updated build strings. 2024-03-06 01:00:04 +01:00
Rafael Ameijeiras 5941aac339 Merge branch 'ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD' into 'develop'
visual changes in demo view

See merge request 
2024-03-05 07:59:04 +00:00
artica 6bd35b445b Auto-updated build strings. 2024-03-05 01:00:05 +01:00
Matias Didier 53c69af205 Merge branch 'ent-12922-fallos-en-vista-de-grupos-tactical-view' into 'develop'
Ent 12922 Fallos en Vista de grupos tactical view

See merge request 
2024-03-04 12:13:58 +00:00
artica 4acb8f1efd Auto-updated build strings. 2024-03-04 01:00:04 +01:00
artica 290cdd75ac Auto-updated build strings. 2024-03-03 01:00:04 +01:00
artica 2dbe83f1be Auto-updated build strings. 2024-03-02 01:00:06 +01:00
Daniel Rodriguez 44ae109889 Merge branch 'ent-12019-api-2-0' into 'develop'
new api 2.0

See merge request 
2024-03-01 10:21:10 +00:00
artica 3d4202b8d6 Auto-updated build strings. 2024-03-01 01:00:05 +01:00
Rafael Ameijeiras ef8d2cf63c Merge branch 'ent-12943-guardia17145-error-sql-al-hacer-click-en-las-columnas-del-inventario' into 'develop'
Ent 12943 [GUARDIA][]Error SQL al hacer click en las columnas del inventario.

See merge request 
2024-02-29 08:11:25 +00:00
artica 6f808edea0 Auto-updated build strings. 2024-02-29 01:00:05 +01:00
Daniel Maya 24161241fb Fixed check nfdump 2024-02-28 15:33:37 +01:00
Daniel Cebrian 70818c40b1 fixed metaconsole inventory 2024-02-28 14:22:57 +01:00
Rafael Ameijeiras 708b81601a Merge branch 'ent-12945-17144-API-externa-event-custom-id-no-funciona-en-Meta' into 'develop'
Ent 12945 17144 api externa event custom id no funciona en meta

See merge request 
2024-02-28 08:40:42 +00:00
artica 481ba2794e Auto-updated build strings. 2024-02-28 01:00:06 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
2024-02-27 17:27:10 +01:00
artica 6344e2544b Auto-updated build strings. 2024-02-27 01:00:05 +01:00
Rafael Ameijeiras cf517cd963 Merge branch 'ent-12938-File-manager-no-funciona-correctamente' into 'develop'
Ent 12938 file manager no funciona correctamente

See merge request 
2024-02-26 16:29:19 +00:00
Daniel Cebrian 293bb5c2fe fixed inventory filter 2024-02-26 15:08:08 +01:00
alejandro.campos@artica.es e84b522dff fix api call 2024-02-26 14:42:42 +01:00
alejandro.campos@artica.es af23275f5d fix api call 2024-02-26 14:41:09 +01:00
alejandro.campos@artica.es 11a3d1f0c4 fix filemanager 2024-02-26 12:56:55 +01:00
alejandro.campos@artica.es e3f9d53775 fix filemanager 2024-02-26 12:55:17 +01:00
Rafael Ameijeiras bfee610b4f Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop'
Ent 12621 meter tips de ayuda en la interfaz

See merge request 
2024-02-26 11:51:37 +00:00
Rafael Ameijeiras 81d937ae30 Merge branch 'ent-12768-16921-operator-read-puede-ver-inventario-de-todos-los-grupos' into 'develop'
Ent 12768 16921 operator read puede ver inventario de todos los grupos

See merge request 
2024-02-26 11:50:52 +00:00
Daniel Cebrian 29a42375f2 fixed status agent in tactical view group 2024-02-26 12:00:50 +01:00
artica bd8711883b Auto-updated build strings. 2024-02-26 01:00:04 +01:00
artica 4bb932732b Auto-updated build strings. 2024-02-25 01:00:03 +01:00
artica c44632a0e0 Auto-updated build strings. 2024-02-24 01:00:05 +01:00
alejandro.campos@artica.es c9bde8d90a Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-23 11:14:17 +01:00
alejandro.campos@artica.es 06107f4773 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-23 10:24:26 +01:00
artica 421598df6b Auto-updated build strings. 2024-02-23 01:00:05 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop'
Ent 12695 16818 eliminar warnings en console log

See merge request 
2024-02-22 16:21:32 +00:00
Rafael Ameijeiras f9b6008296 Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop'
Ent 12497 usabilidad implementar boton mas operaciones

See merge request 
2024-02-22 16:20:13 +00:00
alejandro.campos@artica.es 77dd8b1fb9 minor fixes 2024-02-22 15:07:18 +01:00
alejandro.campos@artica.es 195766e11c minor fixes 2024-02-22 15:05:48 +01:00
Matias Didier 9e312890bd Merge branch 'ent-12783-errores-al-borrar-modulos-que-se-usan-en-safe-operation-mode' into 'develop'
Ent 12783 Errores al borrar módulos que se usan en Safe operation mode

See merge request 
2024-02-22 14:03:32 +00:00
Jonathan f36ea56ad7 css dots 2024-02-22 13:34:53 +01:00
Jonathan 9082fbf798 tips and size window 2024-02-22 10:49:57 +01:00
Jonathan 260fcfe62b remove warnings 2024-02-22 10:07:47 +01:00
artica 887a862783 Auto-updated build strings. 2024-02-22 01:00:05 +01:00
Jonathan 50187a8c15 wip remove warnings 2024-02-21 17:07:25 +01:00
Rafael Ameijeiras 40d612f22a Merge branch 'ent-12883-Widget-general-visual-maps-report-aparecen-entities' into 'develop'
fix entities

See merge request 
2024-02-21 15:24:28 +00:00
Matias Didier 2f6a95dea5 Merge branch 'ent-12909-guardia17097-campos-pluginserver-no-se-guardan-en-politicas-772-3' into 'develop'
Ent 12909 [GUARDIA][] Campos pluginserver no se guardan en políticas 772.3.

See merge request 
2024-02-21 12:36:42 +00:00
alejandro.campos@artica.es 8f02fe3d62 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-21 10:30:20 +01:00
alejandro.campos@artica.es 7773967c71 move mr 2024-02-21 10:11:37 +01:00
alejandro.campos@artica.es 1991b74b9b Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-21 10:05:11 +01:00
Rafael Ameijeiras 6d3c88efc0 Merge branch 'ent-12524-GISS-Problemas-para-abrir-elementos-en-nuevas-pestañas-Vista-Monitores-y-Alertas' into 'develop'
Ent 12524 giss problemas para abrir elementos en nuevas pestañas vista monitores y alertas

See merge request 
2024-02-21 07:59:15 +00:00