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

19555 Commits

Author SHA1 Message Date
Daniel Rodriguez 9d6fff0850 Merge branch 'ent-5369-parseo-de-event-name-en-exportar-elementos' into 'develop' 
Deleted columns s, options and m on csv datatables events

See merge request artica/pandorafms!3313
 2020-07-10 10:16:34 +02:00
Daniel Rodriguez a83b10ff97 Merge branch 'ent-1957-Informe-agrupado-general' into 'develop' 
Implemented all-in-row data for grouped general report

See merge request artica/pandorafms!3351
 2020-07-10 10:11:57 +02:00
Daniel Rodriguez 8b24faa129 Merge branch 'ent-2002-Remote-component-centralizado' into 'develop' 
Blocked create and update of remote component group when meta has centralized management

Closes pandora_enterprise#2002

See merge request artica/pandorafms!3272
 2020-07-10 10:11:25 +02:00
Daniel Rodriguez 0d68dde3db Merge branch 'ent-1940-Peso-en-graficas-personalizadas' into 'develop' 
fixed weight legend

See merge request artica/pandorafms!3339
 2020-07-10 10:10:42 +02:00
artica 941dfc2b62 Auto-updated build strings. 2020-07-10 01:00:16 +02:00
fbsanchez 5df418d226 MR changes 2020-07-09 16:56:51 +02:00
fbsanchez 231ba795dd MR update 2020-07-09 16:53:03 +02:00
fbsanchez 009d5c7bc0 Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-09 16:51:50 +02:00
fbsanchez 865c2eb208 allowed service create propagate exceptions 2020-07-09 11:35:04 +02:00
artica a410ebffb4 Auto-updated build strings. 2020-07-09 01:00:14 +02:00
Alejandro Fraguas df9ab22fc1 Merge branch 'ent-6012-servicios-dinamicos' into 'develop' 
MR change smart services

See merge request artica/pandorafms!3316
 2020-07-08 18:01:16 +02:00
Daniel Rodriguez 8925821a2b Merge branch 'ent-6045-snmp-alert-field-10-se-borra' into 'develop' 
Fixed minor bug field10 param

See merge request artica/pandorafms!3346
 2020-07-08 11:04:47 +02:00
artica 3b091525f5 Auto-updated build strings. 2020-07-08 01:00:15 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
daniel 51104136a9 fixed errors in automatic combined graph 2020-07-07 16:07:13 +02:00
Daniel Rodriguez b18ace9ef6 Merge branch 'ent-5716-ventana-de-registrar-nodo-en-database-ha-queda-visible' into 'develop' 
Minor style fix

See merge request artica/pandorafms!3262
 2020-07-07 13:12:53 +02:00
fbsanchez 02299bffdb Merge branch 'ent-6012-servicios-dinamicos' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 11:57:12 +02:00
fbsanchez 98dc5f1796 minor fix range input 2020-07-07 11:54:55 +02:00
fbsanchez cb38f5569a Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 10:26:27 +02:00
fbsanchez 80015a8691 smart services API adjustments 2020-07-07 10:21:28 +02:00
fbsanchez 0b42d1b61f smart services API adjustments 2020-07-07 10:19:49 +02:00
artica 93ad38888b Auto-updated build strings. 2020-07-07 01:00:14 +02:00
fbsanchez cf26293a33 WIP massive services 2020-07-06 19:35:31 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
fbsanchez 53a2215a41 minor fix 2020-07-06 14:01:51 +02:00
fbsanchez 2442336f45 Minor fix 2020-07-06 13:58:35 +02:00
fbsanchez a0d489b90e Smart services 2020-07-06 11:10:43 +02:00
artica 50ef2f6e54 Auto-updated build strings. 2020-07-06 01:00:12 +02:00
artica ba9f22f7f9 Auto-updated build strings. 2020-07-05 01:00:12 +02:00
artica d2410e07e0 Auto-updated build strings. 2020-07-04 01:00:16 +02:00
fbsanchez 352da65640 WIP Smart services 2020-07-03 17:52:44 +02:00
artica f7922b7607 Auto-updated build strings. 2020-07-03 01:00:15 +02:00
fbsanchez d1d47c721d missed logger for new log location 2020-07-02 18:32:32 +02:00
alejandro-campos 5b884e714b Implemented all-in-row data for grouped general report 2020-07-02 17:00:19 +02:00
fbsanchez af7981ed05 Service tree view 2020-07-02 14:53:33 +02:00
artica 40659c01da Updated version and build strings. 2020-07-02 10:52:47 +02:00
artica 7eee14de55 Auto-updated build strings. 2020-07-02 01:00:14 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
Luis Calvo 88d72b3d66 Fixed minor bug field10 param 2020-07-01 14:41:31 +02:00
manuel.montes 5502ee6b01 Fixed bug in module manage meta 2020-07-01 10:16:55 +02:00
artica 0a69318d88 Auto-updated build strings. 2020-07-01 01:01:14 +02:00
fbsanchez ffba7b8285 wip services improvements 2020-06-30 18:59:47 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 1d621bd3d5 WIP services 2020-06-30 16:57:08 +02:00
Daniel Rodriguez f0cbd61ad3 Merge branch 'ent-5649-visor-de-log-en-metaconsola' into 'develop' 
Added log_viewer in metaconsole

See merge request artica/pandorafms!3312
 2020-06-30 15:51:51 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
artica 8882124487 Auto-updated build strings. 2020-06-30 01:00:17 +02:00
fbsanchez c07daa3199 WIP Services 2020-06-29 19:17:40 +02:00
Daniel Barbero Martin 595339613b fixed weight legend 2020-06-29 15:37:37 +02:00