6120 Commits

Author SHA1 Message Date
artica
bc7ae01e13 Auto-updated build strings. 2023-12-26 01:00:19 +01:00
artica
2efc95587f Auto-updated build strings. 2023-12-25 01:00:19 +01:00
artica
7e91d94faa Auto-updated build strings. 2023-12-24 01:00:17 +01:00
artica
3a5fe1acb0 Auto-updated build strings. 2023-12-23 01:00:25 +01:00
artica
2d06d5f94d Auto-updated build strings. 2023-12-22 01:00:27 +01:00
artica
82bc2c3f98 Updated version and build strings. 2023-12-21 17:13:20 +01:00
artica
ffec658ee8 Auto-updated build strings. 2023-12-21 01:00:28 +01:00
artica
e947ac4f00 Auto-updated build strings. 2023-12-20 01:00:27 +01:00
artica
43fbc6eca4 Auto-updated build strings. 2023-12-19 01:00:37 +01:00
Daniel Rodriguez
348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
artica
0336f87b24 Auto-updated build strings. 2023-12-18 01:00:22 +01:00
artica
2d379f6700 Auto-updated build strings. 2023-12-17 01:00:20 +01:00
artica
9037819ceb Auto-updated build strings. 2023-12-16 01:00:26 +01:00
artica
d81805d2c2 Auto-updated build strings. 2023-12-15 01:00:29 +01:00
artica
dffdbff8b1 Auto-updated build strings. 2023-12-14 01:00:28 +01:00
Diego Muñoz-Reja
89ec81e151 Merge branch 'ent-11971-16145-proteccion-en-cascada-de-modulos-no-funciona-cuando-hay-ff' into 'develop'
ent-11971-[#16145] Protección en cascada de módulos no funciona cuando hay FF

See merge request artica/pandorafms!6645
2023-12-13 08:40:35 +00:00
artica
14f8deebca Auto-updated build strings. 2023-12-13 01:00:28 +01:00
Daniel Cebrian
12f2bce2f2 Merge branch 'ent-12022-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown' into ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola 2023-12-12 16:33:34 +01:00
Ramon Novoa
e85604775b Add support for ignore_unknown.
If tagente_modulo.ignore_unknown is set to 1, a module will never become
unknown.
2023-12-12 16:28:24 +01:00
artica
ffdf0d81b9 Auto-updated build strings. 2023-12-12 01:00:30 +01:00
artica
5351af2f7a Auto-updated build strings. 2023-12-11 01:00:22 +01:00
artica
16f75809f1 Auto-updated build strings. 2023-12-10 01:00:20 +01:00
artica
ef339a1bbe Auto-updated build strings. 2023-12-09 01:00:21 +01:00
artica
d83a64da9c Auto-updated build strings. 2023-12-08 01:00:28 +01:00
artica
62901b6a70 Auto-updated build strings. 2023-12-07 01:00:21 +01:00
artica
0481af6b50 Auto-updated build strings. 2023-12-06 01:00:26 +01:00
Diego Muñoz-Reja
b2bcae6571 Merge branch 'ent-11966-no-se-envian-imagenes-correctamente-utilizando-la-macro-_moduledata_x_' into 'develop'
Fix _moduledata_x when data is a b64 image

See merge request artica/pandorafms!6585
2023-12-05 11:18:54 +00:00
artica
cdb3308e7a Auto-updated build strings. 2023-12-05 01:00:24 +01:00
Rafael Ameijeiras
3f2d9e0cb1 Merge branch 'ent-12507-hay-macros-de-eventos-que-no-funcionan-en-el-eventserver' into 'develop'
Added function to pretty print json

See merge request artica/pandorafms!6704
2023-12-04 08:20:22 +00:00
artica
3eac0f9661 Auto-updated build strings. 2023-12-04 01:00:21 +01:00
artica
a2ea6f33f3 Auto-updated build strings. 2023-12-03 01:00:20 +01:00
artica
69229987f8 Auto-updated build strings. 2023-12-02 01:00:24 +01:00
artica
3b6eac4284 Auto-updated build strings. 2023-12-01 01:00:28 +01:00
Rafael Ameijeiras
57a9e6b3bf Merge branch 'ent-12188-script-mode-de-plugins-de-inventario-no-esta-funcionando' into 'develop'
add code lost inventory server pandora_enterprise#12188

See merge request artica/pandorafms!6667
2023-11-30 09:23:33 +00:00
Jonathan
75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
artica
9d1e4b47ab Auto-updated build strings. 2023-11-30 01:00:25 +01:00
daniel
d2b6b098a3 fix inventory pandora_enterprise#12188 2023-11-29 11:38:19 +01:00
artica
8378d7ef91 Auto-updated build strings. 2023-11-29 01:00:30 +01:00
Jonathan
9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
artica
8bb4758439 Auto-updated build strings. 2023-11-28 01:00:28 +01:00
Calvo
a497ae4369 Added function to pretty print json 2023-11-27 15:13:34 +01:00
miguel angel rasteu
a4cd6d7fe1 #12138 Resolve conflict 2023-11-27 11:43:24 +01:00
Rafael Ameijeiras
13e7d2845b Merge branch 'ent-9929-ff-keep-counters-reinicia-el-contador-al-pasar-a-normal' into 'develop'
Ent-9929-ff-keep-counters-reinicia-el-contador-al-pasar-a-normal

See merge request artica/pandorafms!6573
2023-11-27 08:08:24 +00:00
miguel angel rasteu
262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
artica
60cfc49e3e Auto-updated build strings. 2023-11-27 01:00:19 +01:00
artica
cdd00fcc68 Auto-updated build strings. 2023-11-26 01:00:18 +01:00
artica
18b337a8df Auto-updated build strings. 2023-11-25 01:00:21 +01:00
artica
558279e61b Auto-updated build strings. 2023-11-24 01:00:22 +01:00
Jonathan
4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
artica
2576303566 Auto-updated build strings. 2023-11-23 01:00:31 +01:00