Merge pull request 'staging' (#162) from staging into master

Reviewed-on: ordo/adw-backend#162

app/Http/Controllers/ActivityController.php

@@ -136,6 +136,9 @@ class ActivityController extends Controller
 				$objRow->type = "task";
 				$objRow->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "Y-m-d") : NULL;
 				$objRow->actual_end = isset($objRow->actual_end) ? date_format(date_create($objRow->actual_end), "Y-m-d") : NULL;
+				if(isset($objRow->actual_start)){
+					$objRow->auto_scheduling = false;
+				}
 			} else {
 				$objRow->type = "project";
 				$actualStart = $this->getActivityFirst($objRow->id);