Commit Graph

38114 Commits

Author SHA1 Message Date
Rafael Ameijeiras eb56127203 Merge branch 'ent-12977-cambio-instalador-online-para-forzar-lts-a-php8-y-por-defecto-para-no-lts-8-2' into 'develop'
12977 adding a force to php8 on lts installations to online installers

See merge request artica/pandorafms!6988
2024-03-05 10:56:40 +00:00
rafael 32beb3154d 12977 fix typos and hide websocket engine error 2024-03-05 11:49:55 +01:00
rafael 23ddf58138 Merge branch 'develop' into ent-12977-cambio-instalador-online-para-forzar-lts-a-php8-y-por-defecto-para-no-lts-8-2 2024-03-05 11:33:49 +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 artica/pandorafms!6916
2024-03-05 07:59:04 +00:00
artica 6bd35b445b Auto-updated build strings. 2024-03-05 01:00:05 +01:00
rafael 54f2e4e89e 12977 adding a force to php8 on lts installations to online installers 2024-03-04 16:13:36 +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 artica/pandorafms!6966
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
alejandro.campos@artica.es e1419d29fa removed debug change 2024-03-01 13:10:07 +01:00
Gorka Sanchez e9e7bca39a Merge branch 'ent-12950-500-al-crear-agente' into 'develop'
minor fix

See merge request artica/pandorafms!6977
2024-03-01 11:42:48 +00:00
Daniel Rodriguez 44ae109889 Merge branch 'ent-12019-api-2-0' into 'develop'
new api 2.0

See merge request artica/pandorafms!6845
2024-03-01 10:21:10 +00:00
Daniel Rodriguez f786e28bca Merge branch 'ent-10849-cambiar-modo-del-servidor-un-solo-proceso-muchos-hilos-varios-procesos-algunos-hilos' into 'develop'
Ent 10849 cambiar modo del servidor un solo proceso muchos hilos varios procesos algunos hilos

See merge request artica/pandorafms!6883
2024-03-01 08:49:37 +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][#17145]Error SQL al hacer click en las columnas del inventario.

See merge request artica/pandorafms!6971
2024-02-29 08:11:25 +00:00
artica 6f808edea0 Auto-updated build strings. 2024-02-29 01:00:05 +01:00
Matias Didier a4511070df Merge branch 'ent-12957-guardia-17126-error-comprobacion-version-nfdump' into 'develop'
Ent 12957 guardia 17126 error comprobacion version nfdump

See merge request artica/pandorafms!6981
2024-02-28 16:22:06 +00:00
Daniel Maya 24161241fb #12952 Fixed check nfdump 2024-02-28 15:33:37 +01:00
Daniel Cebrian 70818c40b1 #12943 fixed metaconsole inventory 2024-02-28 14:22:57 +01:00
alejandro.campos@artica.es 3800adb1e7 minor fix 2024-02-28 10:05:08 +01:00
Rafael Ameijeiras 8f84df6aca Merge branch 'ent-12947-desactivar-los-modulos-de-logs-por-defecto-en-agentes-windows' into 'develop'
disable eventlog modules by default

See merge request artica/pandorafms!6970
2024-02-28 08:41:24 +00:00
Rafael Ameijeiras 3c6ad30d14 Merge branch 'ent-12946-Error-500-entorno-sin-servidores' into 'develop'
fix error when there are no servers

See merge request artica/pandorafms!6972
2024-02-28 08:41:02 +00: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 artica/pandorafms!6969
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
Rafael Ameijeiras 355652eb52 Merge branch 'ent-12923-Bug-busqueda-en-filtrado-de-listado-de-informes-con-la-consola-en-Español' into 'develop'
fix report search

See merge request artica/pandorafms!6968
2024-02-27 08:58:13 +00: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 artica/pandorafms!6967
2024-02-26 16:29:19 +00:00
Rafael Ameijeiras d62407dd4a Merge branch 'ent-12075-registro-de-nodos-ha-en-metaconsola' into 'develop'
Update database targets in HA environments using metaconsole

See merge request artica/pandorafms!6956
2024-02-26 16:28:57 +00:00
Matias Didier 6afd246671 Merge branch 'ent-12221-16386-timestamp-de-modulo-en-xml-de-agente-satellite-no-se-tiene-en-cuenta-en-el-parametro' into 'develop'
Fix data timestamps.

See merge request artica/pandorafms!6961
2024-02-26 15:07:46 +00:00
alejandro.campos@artica.es 4fbcb2318c fix error when there are no servers 2024-02-26 15:48:47 +01:00
Daniel Cebrian 293bb5c2fe #12943 fixed inventory filter 2024-02-26 15:08:08 +01:00
Rafael b21ac07c42 disable eventlog modules by default 2024-02-26 14:45:48 +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 eebd2bb2c6 fix report search 2024-02-26 13:18:06 +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 artica/pandorafms!6904
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 artica/pandorafms!6853
2024-02-26 11:50:52 +00:00
Rafael Ameijeiras ddc95484a2 Merge branch 'ent-12837-plugin-de-hardening-windows-no-funciona' into 'develop'
Ent 12837 plugin de hardening windows no funciona

See merge request artica/pandorafms!6965
2024-02-26 11:49:45 +00:00
Daniel Cebrian 29a42375f2 #12922 fixed status agent in tactical view group 2024-02-26 12:00:50 +01:00
Ramon Novoa cc1d513661 Fix a plug-in definition. 2024-02-26 11:47:03 +01:00
Ramon Novoa 5f48232144 Fix a merge error. 2024-02-26 10:17:03 +01:00
Daniel Rodriguez 637c96b14a Merge branch 'ent-12570-no-guarda-credenciales-en-credential-box-al-ejecutar-pfms-en-ubuntu-server-22' into 'develop'
12570 adding legacy to openssl

See merge request artica/pandorafms!6942
2024-02-26 09:13:46 +00: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
Enrique Martin 78702547c8 Fixed table field 2024-02-23 14:23:22 +01:00