Merge pull request #361 from Kovah/dev

Release

.env.docker

@@ -23,7 +23,7 @@ SESSION_LIFETIME=10080
 # Enable backups here
 BACKUP_ENABLED=false
 # Choose the destination of the backup. If you set up AWS S3 credentials below you may choose 's3' which is used
-# as a synonym for AWS. Leave blank or set to 'local' if you want to store backups within /storage/app/backups.
+# as a synonym for AWS. Leave blank or set to 'local_backups' if you want to store backups within /storage/app/backups.
 BACKUP_DISK=s3
 # The notification email may be used to get backup notifications
 [email protected]
@@ -32,7 +32,7 @@ BACKUP_MAX_SIZE=512
 
 
 ## Amazon Web Services (AWS) S3 configuration
-# Define the key ID, the access key, the region and your bucket name here if you want to use AWS S3 for backups
+# Define the key ID, the access key, the region and your bucket name here if you want to use AWS S3 for backups.
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1

.env.docker.production

@@ -23,7 +23,7 @@ SESSION_LIFETIME=10080
 # Enable backups here
 BACKUP_ENABLED=false
 # Choose the destination of the backup. If you set up AWS S3 credentials below you may choose 's3' which is used
-# as a synonym for AWS. Leave blank or set to 'local' if you want to store backups within /storage/app/backups.
+# as a synonym for AWS. Leave blank or set to 'local_backups' if you want to store backups within /storage/app/backups.
 BACKUP_DISK=s3
 # The notification email may be used to get backup notifications
 [email protected]
@@ -32,7 +32,7 @@ BACKUP_MAX_SIZE=512
 
 
 ## Amazon Web Services (AWS) S3 configuration
-# Define the key ID, the access key, the region and your bucket name here if you want to use AWS S3 for backups
+# Define the key ID, the access key, the region and your bucket name here if you want to use AWS S3 for backups.
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1

.env.example

@@ -22,16 +22,16 @@ SESSION_LIFETIME=10080
 # Enable backups here
 BACKUP_ENABLED=false
 # Choose the destination of the backup. If you set up AWS S3 credentials below you may choose 'cloud' which is used
-# as a synonym for AWS. Leave blank or set to 'local' if you want to store backups within /storage/app/backups.
-BACKUP_DISK=cloud
+# as a synonym for AWS. Leave blank or set to 'local_backups' if you want to store backups within /storage/app/backups.
+BACKUP_DISK=s3
 # The notification email may be used to get backup notifications, Mail must be configured for this to work!
 BACKUP_NOTIFICATION_EMAIL=[email protected]
 # Maximum size of the backups in megabytes
 BACKUP_MAX_SIZE=512
 
 
 ## Amazon Web Services (AWS) S3 configuration
-# Define the key ID, the access key, the region and your bucket name here if you want to use AWS S3 for backups
+# Define the key ID, the access key, the region and your bucket name here if you want to use AWS S3 for backups.
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1

.github/workflows/test.yml

@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ ubuntu-latest ]
-        php-versions: [ '7.4', '8.0' ]
+        php-versions: [ '7.4', '8.0', '8.1' ]
 
     steps:
       - uses: actions/checkout@v2

README.md

@@ -80,10 +80,8 @@ Additionally, you may visit the [community forums](https://community.linkace.org
 
 LinkAce provides multiple ways of installing it on your server. The complete documentation for all installation methods can be found [**in the wiki**](https://www.linkace.org/docs/v1/setup/).
 
-* Setup with Docker (_recommended_)
-  * Simple setup with 1 Docker image
-  * Advanced setup with multiple Docker images
-* Setup without Docker
+* [Setup with Docker](https://www.linkace.org/docs/v1/setup/setup-with-docker/) (_recommended_)
+* [Setup without Docker](https://www.linkace.org/docs/v1/setup/setup-without-docker/)
 
 
  

app/Console/Commands/RegisterUserCommand.php

@@ -17,11 +17,11 @@ public function handle(): void
         $email = $this->argument('email');
 
         if (empty($name)) {
-            $name = $this->ask('Please enter the user name:');
+            $name = $this->ask('Please enter the user name');
         }
 
         if (empty($email)) {
-            $email = $this->ask('Please enter the user email address:');
+            $email = $this->ask('Please enter the user email address');
         }
 
         // Check if the user exists

composer.json

@@ -4,7 +4,7 @@
   "license": "GPL-3.0-or-later",
   "type": "project",
   "require": {
-    "php": "^7.4 | ^8.0",
+    "php": "^7.4 | ^8.0 | ^8.1",
     "composer/semver": "^1.5",
     "doctrine/dbal": "^2.10.2",
     "fideloper/proxy": "^4.4",