several enhancements (#1808)

* show all fields in timesheet api docs
* fix action dropdown links #1806
* apply same validation rules for passwords and for api-tokens #1753
* added "duplicate team" action #1136

src/API/ConfigurationController.php

@@ -94,7 +94,7 @@ final class ConfigurationController extends BaseApiController
     }
 
     /**
-     * Returns the instance specific timesheet configuration
+     * Returns the timesheet configuration
      *
      * @SWG\Response(
      *      response=200,
@@ -116,6 +116,7 @@ final class ConfigurationController extends BaseApiController
             ->setActiveEntriesHardLimit($this->timesheetConfiguration->getActiveEntriesHardLimit())
             ->setActiveEntriesSoftLimit($this->timesheetConfiguration->getActiveEntriesSoftLimit())
             ->setIsAllowFutureTimes($this->timesheetConfiguration->isAllowFutureTimes())
+            ->setIsAllowOverlapping($this->timesheetConfiguration->isAllowOverlappingRecords())
         ;
 
         $view = new View($model, 200);

src/API/Model/TimesheetConfig.php

@@ -20,21 +20,35 @@ final class TimesheetConfig
      */
     private $trackingMode = 'default';
     /**
+     * Default begin datetime in PHP format
+     *
      * @var string
      */
     private $defaultBeginTime = 'now';
     /**
+     * How many running timesheets a user is allowed to have at the same time
+     *
      * @var int
      */
     private $activeEntriesHardLimit = 1;
     /**
+     * How many running timesheets a user is allowed before a warning is shown
+     *
      * @var int
      */
     private $activeEntriesSoftLimit = 1;
     /**
+     * Whether entries for future times are allowed
+     *
      * @var bool
      */
     private $isAllowFutureTimes = true;
+    /**
+     * Whether overlapping entries are allowed
+     *
+     * @var bool
+     */
+    private $isAllowOverlapping = true;
 
     /**
      * @return string
@@ -98,4 +112,16 @@ final class TimesheetConfig
 
         return $this;
     }
+
+    public function isAllowOverlapping(): bool
+    {
+        return $this->isAllowOverlapping;
+    }
+
+    public function setIsAllowOverlapping(bool $isAllowOverlapping): TimesheetConfig
+    {
+        $this->isAllowOverlapping = $isAllowOverlapping;
+
+        return $this;
+    }
 }

src/API/Model/Version.php

@@ -16,22 +16,32 @@ use App\Constants;
 class Version
 {
     /**
+     * Kimai Version, eg. "1.9"
+     *
      * @var string
      */
     protected $version = Constants::VERSION;
     /**
+     * Candidate: either "prod" or "dev"
+     *
      * @var string
      */
     protected $candidate = Constants::STATUS;
     /**
+     * Full version including status, eg: "1.9-prod"
+     *
      * @var string
      */
     protected $semver = Constants::VERSION . '-' . Constants::STATUS;
     /**
+     * The version name
+     *
      * @var string
      */
     protected $name = Constants::NAME;
     /**
+     * A full copyright notice
+     *
      * @var string
      */
     protected $copyright = Constants::SOFTWARE . ' - ' . Constants::VERSION . ' ' . Constants::STATUS . ' (' . Constants::NAME . ') by Kevin Papst and contributors.';

src/API/UserController.php

@@ -93,6 +93,7 @@ final class UserController extends BaseApiController
     public function cgetAction(ParamFetcherInterface $paramFetcher): Response
     {
         $query = new UserQuery();
+        $query->setCurrentUser($this->getUser());
 
         if (null !== ($visible = $paramFetcher->get('visible'))) {
             $query->setVisibility($visible);