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

17464 Commits

Author SHA1 Message Date
daniel 25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
vgilc fd04125011 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer-3' into 'develop' 
Thermometer graph only for intracom - #2214

See merge request artica/pandorafms!1527
 2018-06-12 12:56:05 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
vgilc 2ff7e496bd Merge branch '2294-Requisitos-API-cluster-3' into 'develop' 
Add mode 1 and empty ip on create agent by API  new_cluster, and get cluster items by API - #2294

See merge request artica/pandorafms!1526
 2018-06-12 12:32:31 +02:00
vgilc 24ec62b807 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed errors agent access and other fix

See merge request artica/pandorafms!1525
 2018-06-12 12:13:46 +02:00
enriquecd fd368aec86 Add mode 1 and empty ip on create agent by API new_cluster, and get cluster items by API - #2294 2018-06-12 12:08:57 +02:00
daniel 6eba3250da fixed errors agent access and other fix 2018-06-12 12:08:04 +02:00
vgilc fdbe03ef83 Merge branch 'ent-639-add-user-defined-timezones' into 'develop' 
Add user defined timezones

See merge request artica/pandorafms!1462
 2018-06-12 10:20:31 +02:00
Alejandro Gallardo Escobar a258dc7e43 Fixed a message 2018-06-12 10:04:33 +02:00
vgilc c389661057 Merge branch '2290-seguridad-en-la-api' into 'develop' 
2290 seguridad en la api

See merge request artica/pandorafms!1513
 2018-06-12 09:09:26 +02:00
artica 5574ddd205 Auto-updated build strings. 2018-06-12 00:01:39 +02:00
fermin831 2150f58ec0 [API ACL] Metaconsole functions 2018-06-11 18:39:19 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
fermin831 c949ab3dc7 Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-11 15:55:48 +02:00
vgilc 5e1c88cd45 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed minor errorstime graphs

See merge request artica/pandorafms!1522
 2018-06-11 15:39:58 +02:00
fermin831 e3fbef309b [API ACL] Added ACL to set functions 2018-06-11 15:39:58 +02:00
vgilc e40bbbd24d Merge branch 'update-console-translation-for-japanese' into 'develop' 
Updated Japanese translation.

See merge request artica/pandorafms!1521
 2018-06-11 15:37:34 +02:00
daniel abad4f4f4b fixed minor errorstime graphs 2018-06-11 15:35:04 +02:00
vgilc 00f3d091f0 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1268
 2018-06-11 14:01:48 +02:00
daniel adf9e4d1fe fixed minor errors 2018-06-11 13:53:10 +02:00
daniel b25332d014 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-11 08:24:07 +02:00
Junichi Satoh 5d727a1e8f Updated Japanese translation. 2018-06-11 15:02:42 +09:00
artica 10e95bf447 Auto-updated build strings. 2018-06-10 00:01:23 +02:00
artica 14dd0e222b Auto-updated build strings. 2018-06-09 00:01:27 +02:00
fermin831 eda5898031 [API ACL] More setters 2018-06-08 15:20:15 +02:00
daniel f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
Fermin 9bf6102ac6 [ACL API] Added ACL in some set functions 2018-06-07 19:45:54 +02:00
vgilc 7cc0520a1d Merge branch 'ent-2316-5594-fallo-redireccion.linked-visual-consoles-desde-Metaconsola-2' into 'develop' 
Fixed visualconsole status modules and agents in metaconsole

See merge request artica/pandorafms!1519
 2018-06-07 16:09:59 +02:00
Fermin 054b915846 [ACL API] Fixed get planned_downtimes_items and added ACL to more the rest of get functions 2018-06-07 13:11:40 +02:00
Fermin 2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
Fermin 2a9a7b931a Fixed visualconsole status modules and agents in metaconsole 2018-06-07 10:03:27 +02:00
daniel 7834869977 fixed water mark in graphs 2018-06-07 09:15:45 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
fermin831 b3bdd5d492 [API ACL] More get functions (2) 2018-06-06 19:39:57 +02:00
fermin831 7f2d583f63 [API ACL] More get functions 2018-06-06 19:04:06 +02:00
daniel 867e00c50d fixed minor error 2018-06-06 18:00:44 +02:00
daniel ea6f96e96b fixed minor error api 2018-06-06 17:53:52 +02:00
daniel d7da009804 fixed errors in graphs 2018-06-06 17:23:32 +02:00
fermin831 0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +02:00
daniel badfd83b0d 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
 2018-06-06 11:57:02 +02:00
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
vgilc eac44e861e Merge branch '2196-Menús-fijados-+-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed jquery in pandora_console/general/main_menu.php

See merge request artica/pandorafms!1518
 2018-06-05 16:45:48 +02:00
manuel.montes 4281824555 Fixed jquery in pandora_console/general/main_menu.php 2018-06-05 16:23:30 +02:00
vgilc 23142509a0 Merge branch '2035-Mala-colocación-items-en-exportación-dev' into 'develop' 
Fixed line graph and box item when exporting visual consoles

See merge request artica/pandorafms!1517
 2018-06-05 16:01:10 +02:00
danielmaya f8aa351987 Fixed line graph and box item when exporting visual consoles 2018-06-05 15:14:27 +02:00