tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
17,222 Commits 34 Branches 30 Tags
Commit Graph

17222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artica
de2b583583 Auto-updated build strings. 2018-04-24 00:01:30 +02:00
fermin831
a21eaafc61 Added in progress button to events list 2018-04-23 18:41:44 +02:00
vgilc
3de5c50ce1 Merge branch 'ent-1859-groups-deletion-confirm-message' into 'develop' 
Added a new confirm message when trying to delete groups with children

See merge request artica/pandorafms!1445
 2018-04-23 16:50:51 +02:00
Alejandro Gallardo Escobar
4239b669f2 Added a new confirm message when trying to delete groups with children 2018-04-23 16:26:35 +02:00
vgilc
5ea4b84e97 Merge branch '1980-error-en-dashboards-con-custom-graphs-dev-3' into 'develop' 
Fixed unloaded includes in interface graphs

See merge request artica/pandorafms!1444
 2018-04-23 15:55:54 +02:00
fermin831
cfbe80669a Fixed unloaded includes in interface graphs 2018-04-23 15:48:17 +02:00
vgilc
522684ad22 Merge branch '2007-Monitorizacion_de_cluster_fase_2_get_cluster_status' into 'develop' 
Change id_os number refence and add get_cluster status function in api and CLI - #2007

See merge request artica/pandorafms!1443
 2018-04-23 14:44:09 +02:00
enriquecd
b4b6852e27 Change id_os number refence and add get_cluster status function in api and CLI - #2007 2018-04-23 13:52:16 +02:00
daniel
e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
artica
d90c78ad9d Auto-updated build strings. 2018-04-23 00:01:25 +02:00
artica
1dc4b4554a Auto-updated build strings. 2018-04-22 00:01:25 +02:00
artica
1cf7efb86b Auto-updated build strings. 2018-04-21 00:01:35 +02:00
vgilc
fa8f087d57 Merge branch '2007-Monitorizacion-de-cluster-fase-2-cli-2' into 'develop' 
Add cli cluster functions - #2007

See merge request artica/pandorafms!1413
 2018-04-20 10:32:26 +02:00
vgilc
5512fd3bb1 Merge branch '2007-Monitorizacion-de-cluster-fase-2-API' into 'develop' 
Add API cluster functions - #2007

See merge request artica/pandorafms!1387
 2018-04-20 10:32:14 +02:00
vgilc
5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop' 
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
 2018-04-20 10:31:57 +02:00
enriquecd
d78c8daf5b Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-cli-2 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-04-20 10:19:16 +02:00
enriquecd
676835ddc8 Merge branch 'develop' into 2007-Monitorizacion-de-cluster-fase-2-API 
Conflicts:
	pandora_console/include/functions_api.php
 2018-04-20 10:10:33 +02:00
vgilc
1cb423fcfe Merge branch 'ent-1793-Etiquetas-de-las-graficas-con-decimales-2' into 'develop' 
Modified round decimals to avoid round string values

See merge request artica/pandorafms!1441
 2018-04-20 08:26:36 +02:00
nramon
0e003f9807 Merge branch '2126-Bloqueo-o-error-de-acceso-a-usuarios-sin-permisos-dev-2' into 'develop' 
Permit login with admin users without profiles

See merge request artica/pandorafms!1440
 2018-04-20 08:19:13 +02:00
artica
235c1cee6c Auto-updated build strings. 2018-04-20 00:01:27 +02:00
fermin831
d6a695f793 Modified round decimals to avoid round string values 2018-04-19 19:17:04 +02:00
fermin831
cd2f97d941 Permit login with admin users without profiles 2018-04-19 18:05:47 +02:00
artica
418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
vgilc
5435cfa7bd Merge branch '1980-error-en-dashboards-con-custom-graphs-dev-2' into 'develop' 
Fixed agent view graphs (stat_win.php entry point)

See merge request artica/pandorafms!1439
 2018-04-19 14:41:15 +02:00
fermin831
bc2c92807a Fixed agent view graphs (stat_win.php entry point) 2018-04-19 13:15:13 +02:00
artica
ee0d890361 Auto-updated build strings. 2018-04-19 00:01:25 +02:00
fermin831
32f96c45ba [Events] Added ID to export CSV 2018-04-18 19:50:13 +02:00
fermin831
0b23f25455 [Events] Fixed csv export after secondary groups 2018-04-18 19:47:20 +02:00
fermin831
8fc8c25548 Fixed login query params deletion (now it does not delete) 2018-04-18 17:58:44 +02:00
vgilc
14467eb3ac Merge branch '2189-Mapa-de-red-Falla-Wajahat-dev' into 'develop' 
Fixed issue when target = -1 in networkmap

See merge request artica/pandorafms!1434
 2018-04-18 16:26:43 +02:00
fermin831
70bf2dd49f Added percentile to custom graphs containers 2018-04-18 16:01:38 +02:00
fermin831
fdc70572ff Fixed module prediction agent creation 2018-04-18 15:00:56 +02:00
danielmaya
ecb483af1a Fixed issue when target = -1 in networkmap 2018-04-18 14:51:38 +02:00
vgilc
292612f765 Merge branch 'ent-2121-Consolas-visuales-no-aplica-las-coordenadas-5539' into 'develop' 
[Visual console] Update position when change advanced options

See merge request artica/pandorafms!1430
 2018-04-18 11:12:29 +02:00
vgilc
f7ae6f78b1 Merge branch '1980-error-en-dashboards-con-custom-graphs-dev' into 'develop' 
Fixed issue in dashboard with firefox

See merge request artica/pandorafms!1431
 2018-04-18 11:11:35 +02:00
vgilc
b2dadfbda8 Merge branch 'ent-2118-EXT-5537-Fallo-al-procesar-XML-de-Inventario-en-el-Dataserver' into 'develop' 
Replace ellipsis character in Linux inventory plugin

See merge request artica/pandorafms!1432
 2018-04-18 11:10:13 +02:00
vgilc
1bc89ecd10 Merge branch '2126-Bloqueo-o-error-de-acceso-a-usuarios-sin-permisos-dev' into 'develop' 
Added profile check in login

See merge request artica/pandorafms!1433
 2018-04-18 11:08:32 +02:00
danielmaya
0cf5cc4b1a Added profile check in login 2018-04-18 10:54:51 +02:00
fermin831
38fc81da52 Replace ellipsis character in Linux inventory plugin 2018-04-18 10:34:19 +02:00
danielmaya
e6dc7799c8 Fixed issue in dashboard with firefox 2018-04-18 10:30:24 +02:00
artica
3c8914a331 Auto-updated build strings. 2018-04-18 00:01:29 +02:00
fermin831
3a47c3a8fb [Visual console] Update position when change advanced options 2018-04-17 19:08:30 +02:00
vgilc
bb2b086364 Merge branch '1905-Conteos-y-paginacion-incorrecta-en-vista-de-eventos-dev' into 'develop' 
Added checking user tags in event list

See merge request artica/pandorafms!1428
 2018-04-17 16:26:31 +02:00
vgilc
2f2db81263 Merge branch '2054-Operaciones-masivas-de-edición-de-módulos-de-una-politica-dev' into 'develop' 
Added massive edit policy modules

See merge request artica/pandorafms!1423
 2018-04-17 16:26:02 +02:00
vgilc
77a8e5f856 Merge branch '2178-Herencia-de-estado-de-consolas-visuales-dev' into 'develop' 
Fixed static graph with unknown status in visual map

See merge request artica/pandorafms!1424
 2018-04-17 16:24:51 +02:00
vgilc
725bbb7d2d Merge branch '2179-Permisos-avanzados-de-LDAP-dev' into 'develop' 
Fixed atributtes ldap

See merge request artica/pandorafms!1425
 2018-04-17 16:24:20 +02:00
vgilc
12451fa63b Merge branch 'ent-2104-gis-tooltip-improvements' into 'develop' 
Ent 2104 gis tooltip improvements

See merge request artica/pandorafms!1414
 2018-04-17 16:23:38 +02:00
vgilc
981fa839b5 Merge branch 'ent-1793-Etiquetas-de-las-graficas-con-decimales' into 'develop' 
Fixed Y-axis label decimals

See merge request artica/pandorafms!1429
 2018-04-17 16:23:12 +02:00
vgilc
778be05874 Merge branch 'ent-1902-sql-error' into 'develop' 
Elimina un error SQL al obtener noticias

See merge request artica/pandorafms!1415
 2018-04-17 16:22:44 +02:00
vgilc
d0458e0194 Merge branch 'ent-2102-graph-error' into 'develop' 
Ent 2102 - Error SQL Graphs meta

See merge request artica/pandorafms!1416
 2018-04-17 16:22:19 +02:00