tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,342 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

7742 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
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop' 
implement demo data feature

See merge request artica/pandorafms!6606
 2023-12-19 15:40:09 +00: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
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-18 10:54:27 +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
Daniel Cebrian d84faad8cf #12631 added field ignore_unknown in api modules and cli 2023-12-14 18:11:34 +01:00
Rafael Ameijeiras abe950e7d7 Merge branch 'ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event' into 'develop' 
Ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event

Closes pandora_enterprise#11731

See merge request artica/pandorafms!6293
 2023-12-14 15:11:27 +00:00
Jonathan 53b56b31af Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-14 08:38:52 +01:00
artica dffdbff8b1 Auto-updated build strings. 2023-12-14 01:00:28 +01:00
Jonathan 5fa9cd5877 Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-12-13 11:19:32 +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
Jonathan 49fd9435dd Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-11 10:13:46 +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
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +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
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-05 15:30:06 +00: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
Enrique Martin e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
Daniel Rodriguez 868598b1b2 Merge branch 'ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db' into 'develop' 
delete agents pandora_db pandora_enterprise#12293

See merge request artica/pandorafms!6656
 2023-12-04 13:39:10 +00:00
Daniel Rodriguez 9922c29579 Merge branch 'ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db' into 'develop' 
Ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db

See merge request artica/pandorafms!6726
 2023-12-04 11:53:16 +00: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
Enrique Martin 988841084c Fixed log modules generation 2023-12-04 00:00:41 +01:00
Enrique Martin 7892eb5c0c Added log modules 2023-12-03 23:52:55 +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
daniel b31f24aca4 remove conf agents pandora_enterprise#12293 2023-12-01 11:05:01 +01:00
daniel 95fb500fb5 Merge remote-tracking branch 'origin/develop' into ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db 2023-12-01 10:33:21 +01:00
artica 3b6eac4284 Auto-updated build strings. 2023-12-01 01:00:28 +01:00
felix.suarez 07d6a4cdf6 Avoid add last_compact_offset when is zero 2023-11-30 09:19:50 -06:00