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

23091 Commits

Author SHA1 Message Date
fbsanchez 1053062f72 Update pandora_console/extras/mr/51.sql 2021-12-16 11:48:03 +00:00
Daniel Barbero Martin 935c7f6937 fixed MR 2021-12-16 11:45:42 +01:00
artica 231221830b Auto-updated build strings. 2021-12-16 01:00:18 +01:00
Daniel Barbero Martin b4131431af fixed mr 2021-12-15 09:55:03 +01:00
artica 34204d4224 Auto-updated build strings. 2021-12-15 01:00:23 +01:00
artica 6d054051ea Updated version and build strings. 2021-12-14 15:32:04 +01:00
Daniel Rodriguez a8b205f0a7 Merge branch 'ent-8373-actualizar-traducciones' into 'develop' 
Upadted po mo

See merge request artica/pandorafms!4584
 2021-12-14 14:10:48 +00:00
Daniel Rodriguez f5f35f0f40 Merge branch 'ent-8355-12617-GUARDIA-Problemas-de-visualización-de-eventos' into 'develop' 
Ent 8355 12617 guardia problemas de visualización de eventos

See merge request artica/pandorafms!4577
 2021-12-14 14:07:46 +00:00
Calvo b50b06ae34 Upadted po mo 2021-12-14 14:01:41 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Rodriguez fa6690b55a Merge branch 'ent-8368-Faltan-mayusculas-en-nuevo-item-de-informes-Actions-alert-report' into 'develop' 
report alert action ucfirst th table #8368

See merge request artica/pandorafms!4580
 2021-12-14 09:48:23 +00:00
Daniel Rodriguez fab73dc290 Merge branch 'ent-5188-IPAM-Implementacion-de-Sites' into 'develop' 
Ent 5188 ipam implementacion de sites

See merge request artica/pandorafms!4575
 2021-12-14 09:47:39 +00:00
Daniel Barbero Martin 6cb26d2547 report alert action ucfirst th table #8368 2021-12-14 08:33:24 +01:00
artica 859c632132 Auto-updated build strings. 2021-12-14 01:00:20 +01:00
Daniel Rodriguez c773f5abd2 Merge branch 'ent-8321-formularios-modulos-de-tendencias-ticket-7456' into 'develop' 
Ent 8321 formularios modulos de tendencias ticket 7456

See merge request artica/pandorafms!4565
 2021-12-13 16:14:15 +00:00
Calvo 6c94cc5e15 Fix visual bug 2021-12-13 12:00:24 +01:00
artica 88fe0b69cc Auto-updated build strings. 2021-12-13 01:00:16 +01:00
artica 19b8730c07 Auto-updated build strings. 2021-12-12 01:00:17 +01:00
artica 8ba6a05d1f Auto-updated build strings. 2021-12-11 01:00:19 +01:00
Calvo f6c0f50a90 Added missin param and Fixed error message and default interval 2021-12-10 18:00:33 +01:00
fbsanchez f8883151f3 allow datatable to export all columns but latest one 2021-12-10 13:43:05 +01:00
Daniel Maya 002ae85d64 #8355 replace in_array 2021-12-10 10:58:14 +01:00
Daniel Barbero Martin b55679cbfd Merge remote-tracking branch 'origin/develop' into ent-5188-IPAM-Implementacion-de-Sites 2021-12-10 08:18:46 +01:00
artica 3dd92397f9 Auto-updated build strings. 2021-12-10 01:00:20 +01:00
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
Daniel Barbero Martin b97ecda12b db changes 2021-12-09 16:19:05 +01:00
fbsanchez 5c25fa8406 mr updates and a pretty icon 2021-12-09 15:07:35 +01:00
fbsanchez e37cdc4459 Improvements in Entity class 2021-12-09 14:57:37 +01:00
fbsanchez cb6184a943 mr fix 2021-12-09 14:02:06 +01:00
fbsanchez 2cbfca2cdd mr rev + timap_sites 2021-12-09 13:51:20 +01: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
fbsanchez 0d08e27865 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 2021-12-07 13:03:10 +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
Calvo f382a5bf15 Fix trending module bugs 2021-12-03 11:02:11 +01:00
Calvo 7139b9e1b1 Switch prediction module to prediction planning 2021-12-03 10:38:25 +01:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-03 10:24:01 +01:00
artica c2348fdc3e Auto-updated build strings. 2021-12-03 01:00:22 +01:00