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

29018 Commits

Author SHA1 Message Date
Daniel Rodriguez 76bcbd3c33 Merge branch 'ent-8324-desincronizacion-entornos-metaconsola-transacciones' into 'develop' 
force db_process_sql

See merge request artica/pandorafms!4570
 2021-12-09 17:45:43 +00:00
Daniel Rodriguez 92f789945a Merge branch 'ent-8075-Informe-de-acciones-de-alerta' into 'develop' 
WIP new report alert fired actions

See merge request artica/pandorafms!4531
 2021-12-09 17:31:42 +00:00
artica e7b1bfd368 Auto-updated build strings. 2021-12-09 01:00:16 +01:00
artica 67c8a846b9 Auto-updated build strings. 2021-12-08 01:00:17 +01:00
Daniel Rodriguez c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop' 
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
 2021-12-07 16:51:07 +00:00
Daniel Barbero Martin ffc3728f2a fix minor error 2021-12-07 15:50:34 +01:00
Daniel Barbero Martin c20b3bacc8 wip reports alert actions 2021-12-07 11:00:48 +01:00
Daniel Barbero Martin b19bc9c8ab wip reports alert actions 2021-12-07 09:05:50 +01:00
Daniel Barbero Martin 118b1e1b80 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-07 08:34:03 +01:00
artica 4925aaae18 Auto-updated build strings. 2021-12-07 01:00:17 +01:00
artica 3e0e41038f Auto-updated build strings. 2021-12-06 01:00:16 +01:00
artica f1482dc812 Auto-updated build strings. 2021-12-05 01:00:17 +01:00
artica fcff0eeafd Auto-updated build strings. 2021-12-04 01:00:20 +01:00
fbsanchez 6d469912fa some fixes 2021-12-03 14:24:00 +01:00
fbsanchez 5b06415235 errata fix 2021-12-03 13:58:14 +01:00
fbsanchez a94f6be37e force db_process_sql 2021-12-03 12:59:50 +01:00
artica c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00
Daniel Rodriguez 0e16c93c73 Merge branch 'ent-8114-12553-Falla-la-macro-moduledata-X-cuando-no-tienes-activo-el-historico-en-el-modulo' into 'develop' 
Ent 8114 12553 falla la macro moduledata x cuando no tienes activo el historico en el modulo

See merge request artica/pandorafms!4486
 2021-12-02 16:27:41 +00:00
Daniel Barbero Martin eb8b89f22e wip reports alert actions 2021-12-02 17:17:21 +01:00
Daniel Barbero Martin 5a3e5aaac4 wip reports alert actions 2021-12-02 16:57:31 +01:00
Daniel Barbero Martin 94bd55fd39 wip reports alert actions 2021-12-02 16:55:53 +01:00
Daniel Barbero Martin ec21d9d08a wip reports alert actions 2021-12-02 14:27:24 +01:00
Daniel Barbero Martin d030b3b924 wip reports alert actions 2021-12-02 14:16:01 +01:00
Daniel Barbero Martin abedd87910 wip reports alert actions 2021-12-02 14:04:33 +01:00
Daniel Barbero Martin 751cb7380b wip reports alert actions 2021-12-02 13:52:56 +01:00
Daniel Barbero Martin 9b79fb826d wip reports alert actions 2021-12-02 13:34:28 +01:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop' 
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
 2021-12-02 10:51:57 +00:00
Rafael Ameijeiras eed5753d9a merge 2021-12-02 11:26:33 +01:00
Daniel Barbero Martin b781215b4e Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-02 08:33:02 +01:00
artica e693f7c3a2 Auto-updated build strings. 2021-12-02 01:00:18 +01:00
Daniel Barbero Martin a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
Jose Gonzalez 3238811f96 Fixed comments issues 2021-12-01 13:15:34 +01:00
Daniel Barbero Martin e3d6d52c14 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-12-01 08:15:43 +01:00
artica b63a33026b Auto-updated build strings. 2021-12-01 01:00:20 +01:00
Daniel Rodriguez 345cbcf5ba Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop' 
fix setup centraliced active directory

See merge request artica/pandorafms!4540
 2021-11-30 14:44:48 +00:00
Daniel Barbero Martin 6d9b3d209c Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:45:07 +01:00
Daniel Rodriguez ef310cce4c Merge branch 'ent-fix-special-multibyte-characters-treatment' into 'develop' 
Fixed special multibyte characters treatment.

See merge request artica/pandorafms!4524
 2021-11-30 13:34:35 +00:00
Daniel Rodriguez e7e8920783 Merge branch 'ent-8307-Supernet-map-Desplegar-elementos' into 'develop' 
Ent 8307 supernet map desplegar elementos

See merge request artica/pandorafms!4559
 2021-11-30 13:34:04 +00:00
Daniel Rodriguez 84f6d78ee4 Merge branch 'ent-8310-IPAM-Campo-Ubicacion' into 'develop' 
Ent 8310 ipam campo ubicacion

See merge request artica/pandorafms!4560
 2021-11-30 13:32:36 +00:00
Daniel Barbero Martin 347769299b outocreate remote user centralized node 2021-11-30 14:23:19 +01:00
Daniel Barbero Martin 3262d8ea35 Merge remote-tracking branch 'origin/develop' into ent-8123-Autenticacion-remota-en-entornos-centralizados 2021-11-30 14:17:59 +01:00
Daniel Barbero Martin 40d801a947 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:16:19 +01:00
Daniel Barbero Martin ef84b696b3 wip reports alert actions 2021-11-30 13:34:43 +01:00
Daniel Barbero Martin 40fc8c7308 wip reports alert actions 2021-11-30 13:07:37 +01:00
Calvo 136ad128f9 Added help tip to percentage token 2021-11-30 12:12:24 +01:00
Jose Gonzalez 64e08d7124 Fixed grouped comments with id_agent 2021-11-30 10:50:40 +01:00
Daniel Rodriguez 23becba397 Merge branch 'ent-8314-no-sale-actualizacion-parche-en-update-manager-de-los-nodos' into 'develop' 
allow online patches in decimal format

See merge request artica/pandorafms!4556
 2021-11-30 09:21:07 +00:00
artica 622d125b36 Auto-updated build strings. 2021-11-30 01:00:24 +01:00
Daniel Barbero Martin 33d9db657e wip reports alert actions 2021-11-29 20:45:35 +01:00
Daniel Barbero Martin e8bf86a789 wip reports alert actions 2021-11-29 17:55:09 +01:00