Merge pull request #569 from Kovah/dev

v1 Release

.env.docker

@@ -1,10 +1,13 @@
 ## LINKACE CONFIGURATION
 
+## Please note that the LinkAce Docker image will be renamed with the release of LinkAce 2!
+## Read more: https://github.com/Kovah/LinkAce/issues/502
+
 ## Basic app configuration
 COMPOSE_PROJECT_NAME=linkace
 # The environment is usually 'production' but may be changed to 'local' for development
 APP_ENV=local
-# The app key is generated later, please leave it blank
+# The app key is generated later, please leave it like that
 APP_KEY=someRandomStringWith32Characters
 # Enable the debug more if you are running into issues or while developing
 APP_DEBUG=true

.env.docker.production

@@ -1,8 +1,11 @@
 ## LINKACE CONFIGURATION
 
+## Please note that the LinkAce Docker image will be renamed with the release of LinkAce 2!
+## Read more: https://github.com/Kovah/LinkAce/issues/502
+
 ## Basic app configuration
 COMPOSE_PROJECT_NAME=linkace
-# The app key is generated later, please leave it blank
+# The app key is generated later, please leave it like that
 APP_KEY=someRandomStringWith32Characters
 
 ## Configuration of the database connection

.env.example

@@ -1,7 +1,7 @@
 ## LINKACE CONFIGURATION
 
 ## Basic app configuration
-# The app key is generated later, please leave it blank
+# The app key is generated later, please leave it like that
 APP_KEY=someRandomStringWith32Characters
 
 ## Configuration of the database connection

docker-compose.yml

@@ -5,7 +5,6 @@ services:
 
   # --- MariaDB
   db:
-    container_name: "linkacev1-db"
     image: mariadb:10.6
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
     environment:
@@ -16,10 +15,9 @@ services:
     ports:
       - "127.0.0.1:3306:3306"
     volumes:
-      - linkacev1-db:/var/lib/mysql
+      - linkace-db:/var/lib/mysql
 
   pg-db:
-    container_name: "linkacev1-pg-db"
     image: postgres:13
     environment:
       - POSTGRES_PASSWORD=${DB_PASSWORD}
@@ -28,11 +26,10 @@ services:
     ports:
       - "127.0.0.1:5432:5432"
     volumes:
-      - linkacev1-pg-db:/var/lib/postgresql/data
+      - linkace-pg-db:/var/lib/postgresql/data
 
   # --- PHP
   php:
-    container_name: "linkacev1-php"
     build:
       context: .
       dockerfile: ./resources/docker/dockerfiles/development.Dockerfile
@@ -44,7 +41,6 @@ services:
 
   # --- nginx
   nginx:
-    container_name: "linkacev1-nginx"
     image: bitnami/nginx:1.19
     ports:
       - "80:8080"
@@ -56,7 +52,6 @@ services:
 
   # --- Redis
   redis:
-    container_name: "linkacev1-redis"
     image: bitnami/redis:6.0
     environment:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
@@ -64,7 +59,7 @@ services:
       - "127.0.0.1:6379:6379"
 
 volumes:
-  linkacev1-db:
+  linkace-db:
     driver: local
-  linkacev1-pg-db:
+  linkace-pg-db:
     driver: local

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkace",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
   "homepage": "https://github.com/Kovah/LinkAce",
   "repository": {

phpunit.xml

@@ -48,6 +48,7 @@
     <server name="MAIL_DRIVER" value="array"/>
     <server name="QUEUE_CONNECTION" value="sync"/>
     <server name="SESSION_DRIVER" value="array"/>
+    <server name="LOG_CHANNEL" value="stderr"/>
     <server name="APP_CONFIG_CACHE" value="bootstrap/cache/config.phpunit.php"/>
     <server name="APP_SERVICES_CACHE" value="bootstrap/cache/services.phpunit.php"/>
     <server name="APP_PACKAGES_CACHE" value="bootstrap/cache/packages.phpunit.php"/>

resources/assets/js/components/SimpleSelect.js

@@ -10,7 +10,8 @@ export default class SimpleSelect {
   constructor ($el) {
     new TomSelect($el, {
       plugins: ['caret_position', 'input_autogrow'],
-      create: false
+      create: false,
+      maxOptions: null,
     });
   }
 }

resources/assets/js/components/TagsSelect.js

@@ -26,6 +26,7 @@ export default class TagsSelect {
       delimiter: ',',
       persist: false,
       create: this.selectAllowsCreation(),
+      maxOptions: null,
       onItemAdd:function(){
         this.setTextboxValue('');
         this.refreshOptions();

resources/views/app/settings/partials/system/updates.blade.php

@@ -6,4 +6,7 @@
         <p>@lang('linkace.version', ['version' => $linkaceVersion])</p>
         <x-update-check/>
     </div>
+    <div class="card-body text-danger">
+        <x-icon.info class="me-1"/> Please note that the LinkAce Docker image will be renamed with the release of LinkAce 2! <a href="https://github.com/Kovah/LinkAce/issues/502">Read more</a>
+    </div>
 </div>

resources/views/dashboard.blade.php

@@ -9,7 +9,7 @@
             <form action="{{ route('links.store') }}" method="POST">
                 @csrf
 
-                <input type="hidden" name="is_private" value="{{ usersettings('private_default') ?: 0 }}">
+                <input type="hidden" name="is_private" value="{{ usersettings('links_private_default') ?: 0 }}">
                 <input type="hidden" name="title" value="">
                 <input type="hidden" name="description" value="">
                 <input type="hidden" name="lists" value="">