21331 Commits

Author SHA1 Message Date
artica
602ca64f2a Auto-updated build strings. 2024-03-08 01:00:05 +01:00
Daniel Cebrian
09880cadf1 #12999 fixed modal resize 2024-03-07 17:58:56 +01:00
Daniel Maya
966177e8f2 #12984 Fixed importPrd 2024-03-07 17:20:38 +01:00
Rafael Ameijeiras
17f045b2bc Merge branch 'ent-12989-opcion-de-csv-en-recon-task-aparece-descolocada' into 'develop'
Ent 12989 opcion de csv en recon task aparece descolocada

See merge request artica/pandorafms!6995
2024-03-07 15:41:12 +00:00
Daniel Maya
e94f7e2c59 #12989 Fixed network csv 2 2024-03-07 16:20:17 +01:00
Rafael Ameijeiras
c5c92411c9 Merge branch 'ent-11089-crear-el-modo-disabled-para-el-satelite' into 'develop'
Add agent_disabled functionality

See merge request artica/pandorafms!6994
2024-03-07 13:56:28 +00:00
Daniel Cebrian
c269d4280a #12994 fixed message error in ajax when historical database is down 2024-03-07 13:55:35 +01:00
Daniel Cebrian
1125f64e89 #12994 fixed message error sql in history db 2024-03-07 13:28:34 +01:00
Daniel Maya
a1bab17ee5 #12989 Fixed network csv 2024-03-07 11:08:35 +01:00
artica
0cde0a5820 Auto-updated build strings. 2024-03-07 01:00:05 +01:00
Félix Suárez
747a63a2ba Add agent_disabled functionality 2024-03-06 09:41:48 -06:00
Daniel Maya
b4433e533f #12991 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 artica/pandorafms!6753
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 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
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
Daniel Cebrian
ecf2765a1c #12968 Disabled delete events when module is deleted. 2024-03-04 12:18:21 +01: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 Maya
30769852be #12721 free licence change 4 2024-03-01 13:04:28 +01: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
artica
3d4202b8d6 Auto-updated build strings. 2024-03-01 01:00:05 +01:00
Daniel Cebrian
ef4d7b90ac #12934 changed filters 2024-02-29 12:22:32 +01:00
alejandro.campos@artica.es
ead051073b added check to group deletion 2024-02-29 09:33: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
alejandro.campos@artica.es
a5592eccc5 added check to group deletion 2024-02-28 17:50:53 +01: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
Jonathan
3240c9e44c Merge branch 'develop' into ent-12594-mejorar-vista-de-scheduled-reports 2024-02-28 14:20:12 +01:00
alejandro.campos@artica.es
935e41fe08 visual fix 2024-02-28 11:15:42 +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 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
Jonathan
b4ad2b7584 #12594 schedule view 2024-02-27 19:15:50 +01:00
alejandro.campos@artica.es
8ff51b3679 implemented agent module custom selectors 2024-02-27 18:46:34 +01:00
alejandro.campos@artica.es
1363072405 implemented agent module custom selectors 2024-02-27 18:38:37 +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 artica/pandorafms!6967
2024-02-26 16:29:19 +00:00
Daniel Cebrian
293bb5c2fe #12943 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 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
Daniel Cebrian
29a42375f2 #12922 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