Merge pull request #2181 from Leantime/3.0

3.0
Leantime · Jan 7, 2024 · bf67261 · bf67261
2 parents 4a3cfa7 + 5bb1d8e
commit bf67261
Show file tree

Hide file tree

Showing 721 changed files with 34,689 additions and 24,122 deletions.
diff --git a/.dev/.env b/.dev/.env
@@ -3,80 +3,79 @@
 
 ## Minimum Configuration, these are required for installation
 
-LEAN_APP_URL = ''                                  # Base URL, only needed for subfolder installation
-LEAN_APP_DIR = ''                             # Base of application without trailing slash (used for cookies), e.g, /leantime
+LEAN_APP_URL=''                                  # Base URL, only needed for subfolder installation
+LEAN_APP_DIR=''                                  # Base of application withotu trailing slash (used for cookies), e.g, /leantime
 
-LEAN_DEBUG = 1                                    # Debug flag
+LEAN_DEBUG=1                                     # Debug flag
 
 # Database
-LEAN_DB_HOST = 'db'                         # Database host
-LEAN_DB_USER = 'leantime'                                  # Database username
-LEAN_DB_PASSWORD = 'leantime'                              # Database password
-LEAN_DB_DATABASE = 'leantime'                              # Database name
-LEAN_DB_PORT = '3306'                              # Database port
-
+LEAN_DB_HOST='db'                                # Database host
+LEAN_DB_USER='leantime'                          # Database username
+LEAN_DB_PASSWORD='leantime'                      # Database password
+LEAN_DB_DATABASE='leantime'                      # Database name
+LEAN_DB_PORT='3306'                              # Database port
 
 ## Optional Configuration, you may commit these from your .env file
 
 ## Default Settings
-LEAN_SITENAME = 'Leantime'                         # Name of your site, which can be changed later
-LEAN_LANGUAGE = 'en-US'                            # Default language
-LEAN_DEFAULT_TIMEZONE = 'America/Los_Angeles'      # Set default timezone
-LEAN_ENABLE_MENU_TYPE = false                      # Enable to specify menu on a project by project basis
-LEAN_SESSION_PASSWORD = '3evBlq9zdUEuzKvVJHWWx3QzsQhturBApxwcws2m'  #Salting sessions. Replace with a strong password
-LEAN_SESSION_EXPIRATION = 28800                    # How many seconds after inactivity should we logout?  28800seconds = 8hours
-LEAN_LOG_PATH = ''                                 # Default Log Path (including filename), if not set /logs/error.log will be used
-LEAN_PLUGINS = 'motivationalquotes'                # Comma separated list of plugins to load
+LEAN_SITENAME='Leantime'                         # Name of your site, can be changed later
+LEAN_LANGUAGE='en-US'                            # Default language
+LEAN_DEFAULT_TIMEZONE='America/Los_Angeles'      # Set default timezone
+LEAN_ENABLE_MENU_TYPE=false                      # Enable to specifiy menu on aproject by project basis
+LEAN_SESSION_PASSWORD='3evBlq9zdUEuzKvVJHWWx3QzsQhturBApxwcws2m'  #Salting sessions. Replace with a strong password
+LEAN_SESSION_EXPIRATION=28800                    # How many seconds after inactivity should we logout?  28800seconds=8hours
+LEAN_LOG_PATH=''                                 # Default Log Path (including filename), if not set /logs/error.log will be used
+LEAN_PLUGINS=''                                  # Comma separated list of plugins to load
 
 ## Look & Feel, these settings are available in the UI and can be overwritten there.
-LEAN_LOGO_PATH = '/dist/images/logo.svg'                # Default logo path, can be changed later
-LEAN_PRINT_LOGO_URL = '/dist/images/logo.jpg'           # Default logo URL used for printing (must be jpg or png format)
-LEAN_DEFAULT_THEME = 'default'                     # Default theme
-LEAN_PRIMARY_COLOR = '#1b75bb'                     # Primary Theme color
-LEAN_SECONDARY_COLOR = '#81B1A8'                   # Secondary Theme Color
-LEAN_KEEP_THEME = true                             # Keep theme and language from previous user for login screen
+LEAN_LOGO_PATH='/dist/images/logo.svg'           # Default logo path, can be changed later
+LEAN_PRINT_LOGO_URL='/dist/images/logo.jpg'      # Default logo URL use for printing (must be jpg or png format)
+LEAN_DEFAULT_THEME='default'                     # Default theme
+LEAN_PRIMARY_COLOR='#1b75bb'                     # Primary Theme color
+LEAN_SECONDARY_COLOR='#81B1A8'                   # Secondary Theme Color
+
 
 ## Fileuploads
 
 # Local File Uploads
-LEAN_USER_FILE_PATH = '../uploads/'                 # Local relative path to store uploaded files (if not using S3)
-LEAN_DB_BACKUP_PATH = 'backupdb/'                  # Local relative path to store backup files, need permission to write
+LEAN_USER_FILE_PATH='../uploads/'                 # Local relative path to store uploaded files (if not using S3)
+LEAN_DB_BACKUP_PATH='backupdb/'                  # Local relative path to store backup files, need permission to write
 
 # S3 File Uploads
-LEAN_USE_S3 = false                                # Set to true if you want to use S3 instead of local files
-LEAN_S3_KEY = 'AKIAIOSFODNN7EXAMPLE'                                   # S3 Key, hardcoded in s3ninja
-LEAN_S3_SECRET = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'                                # S3 Secret, hardcoded in s3ninja
-LEAN_S3_BUCKET = 'leantime'                                # Your S3 bucket
-LEAN_S3_USE_PATH_STYLE_ENDPOINT = true            # Sets the endpoint style: false => https://[bucket].[endpoint] ; true => https://[endpoint]/[bucket]
-LEAN_S3_REGION = 'eu-west-1'                                # S3 region
-LEAN_S3_FOLDER_NAME = ''                           # Foldername within S3 (can be emtpy)
-LEAN_S3_END_POINT = "http://s3ninja:9000"               # S3 EndPoint S3 Compatible (https://sfo2.digitaloceanspaces.com)
+LEAN_USE_S3=false                                # Set to true if you want to use S3 instead of local files
+LEAN_S3_KEY='AKIAIOSFODNN7EXAMPLE'                                   # S3 Key, hardcoded in s3ninja
+LEAN_S3_SECRET='wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'                                # S3 Secret, hardcoded in s3ninja
+LEAN_S3_BUCKET='leantime'                                # Your S3 bucket
+LEAN_S3_USE_PATH_STYLE_ENDPOINT=true            # Sets the endpoint style: false => https://[bucket].[endpoint] ; true => https://[endpoint]/[bucket]
+LEAN_S3_REGION='eu-west-1'                                # S3 region
+LEAN_S3_FOLDER_NAME=''                           # Foldername within S3 (can be emtpy)
+LEAN_S3_END_POINT="http://s3ninja:9000"               # S3 EndPoint S3 Compatible (https://sfo2.digitaloceanspaces.com)
 
 ## Email
-LEAN_EMAIL_RETURN = '[email protected]'                             # Return email address, needs to be valid email address format
-LEAN_EMAIL_USE_SMTP = true                        # Use SMTP? If set to false, the default php mail() function will be used
-LEAN_EMAIL_SMTP_HOSTS = 'maildev'                         # SMTP host
-LEAN_EMAIL_SMTP_AUTH = false                        # SMTP authentication required
-LEAN_EMAIL_SMTP_USERNAME = ''                      # SMTP username
-LEAN_EMAIL_SMTP_PASSWORD = ''                      # SMTP password
-LEAN_EMAIL_SMTP_AUTO_TLS = true                    # SMTP Enable TLS encryption automatically if a server supports it
-LEAN_EMAIL_SMTP_SECURE = ''                        # SMTP Security protocol (usually one of: TLS, SSL, STARTTLS)
-LEAN_EMAIL_SMTP_SSLNOVERIFY = true                # SMTP Allow insecure SSL: Don't verify certificate, accept self-signed, etc.
-LEAN_EMAIL_SMTP_PORT = '465'                          # Port (usually one of 25, 465, 587, 2526)
+LEAN_EMAIL_RETURN='[email protected]'                             # Return email address, needs to be valid email address format
+LEAN_EMAIL_USE_SMTP=true                        # Use SMTP? If set to false, the default php mail() function will be used
+LEAN_EMAIL_SMTP_HOSTS='maildev'                         # SMTP host
+LEAN_EMAIL_SMTP_AUTH=false                        # SMTP authentication required
+LEAN_EMAIL_SMTP_USERNAME=''                      # SMTP username
+LEAN_EMAIL_SMTP_PASSWORD=''                      # SMTP password
+LEAN_EMAIL_SMTP_AUTO_TLS=true                    # SMTP Enable TLS encryption automatically if a server supports it
+LEAN_EMAIL_SMTP_SECURE=''                        # SMTP Security protocol (usually one of: TLS, SSL, STARTTLS)
+LEAN_EMAIL_SMTP_SSLNOVERIFY=true                # SMTP Allow insecure SSL: Don't verify certificate, accept self-signed, etc.
+LEAN_EMAIL_SMTP_PORT='465'                          # Port (usually one of 25, 465, 587, 2526)
 
 ## Ldap
-LEAN_LDAP_USE_LDAP = false                         # Set to true if you want to use LDAP
-LEAN_LDAP_LDAP_DOMAIN = ''                         # domain name after username@  so users can login without domain definition
-LEAN_LDAP_LDAP_TYPE = 'OL'                         # Select the correct directory type. Currently Supported: OL - OpenLdap, AD - Active Directory
-LEAN_LDAP_HOST = ''                                # FQDN
-LEAN_LDAP_PORT = 389                               # Default Port
-LEAN_LDAP_URI = ''                                 # ldap URI as alternative to hostname and port. Uses ldap://hostname:port
-LEAN_LDAP_DN = ''                                  # Location of users, example: CN=users,DC=example,DC=com
+LEAN_LDAP_USE_LDAP=false                         # Set to true if you want to use LDAP
+LEAN_LDAP_LDAP_DOMAIN=''                         # domain name after username@  so users can login without domain definition
+LEAN_LDAP_LDAP_TYPE='OL'                         # Select the correct directory type. Currently Supported: OL - OpenLdap, AD - Active Directory
+LEAN_LDAP_HOST=''                                # FQDN
+LEAN_LDAP_PORT=389                               # Default Port
+LEAN_LDAP_URI=''                                 # ldap URI as alternative to hostname and port. Uses ldap://hostname:port
+LEAN_LDAP_DN=''                                  # Location of users, example: CN=users,DC=example,DC=com
                                                     # Leantime->Ldap attribute mapping
-LEAN_LDAP_KEYS = "{\"username\":\"uid\",\"groups\":\"memberOf\",\"email\":\"mail\",\"firstname\":\"displayname\",\"lastname\":\"\",\"phonenumber\":\"telephoneNumber\"}"
+LEAN_LDAP_KEYS="{\"username\":\"uid\",\"groups\":\"memberOf\",\"email\":\"mail\",\"firstname\":\"displayname\",\"lastname\":\"\",\"phonenumber\":\"telephoneNumber\"}"
 
 # For AD use these default attributes
-# LEAN_LDAP_KEYS = "{
+# LEAN_LDAP_KEYS="{
 #        \"username\":\"cn\",
 #        \"groups\":\"memberOf\",
 #        \"email\":\"mail\",
@@ -85,18 +84,18 @@ LEAN_LDAP_KEYS = "{\"username\":\"uid\",\"groups\":\"memberOf\",\"email\":\"mail
 #        \"phonenumber\":\"telephoneNumber\"
 #      }"
 
-LEAN_LDAP_DEFAULT_ROLE_KEY = 20;                   # Default Leantime Role on creation. (set to editor)
+LEAN_LDAP_DEFAULT_ROLE_KEY=20;                   # Default Leantime Role on creation. (set to editor)
 
 # Default role assignments upon first login.
 # (Optional) Can be updated later in user settings for each user
-LEAN_LDAP_GROUP_ASSIGNMENT = "{\"5\": {\"ltRole\":\"readonly\",\"ldapRole\":\"readonly\"},\"10\": {\"ltRole\":\"commenter\",\"ldapRole\":\"commenter\"},\"20\": {\"ltRole\":\"editor\",\"ldapRole\":\"editor\"},\"30\": {\"ltRole\":\"manager\",\"ldapRole\":\"manager\"},\"40\": {\"ltRole\":\"admin\",\"ldapRole\":\"administrators\"},\"50\": {\"ltRole\":\"owner\",\"ldapRole\":\"administrators\"}}"
+LEAN_LDAP_GROUP_ASSIGNMENT="{\"5\": {\"ltRole\":\"readonly\",\"ldapRole\":\"readonly\"},\"10\": {\"ltRole\":\"commenter\",\"ldapRole\":\"commenter\"},\"20\": {\"ltRole\":\"editor\",\"ldapRole\":\"editor\"},\"30\": {\"ltRole\":\"manager\",\"ldapRole\":\"manager\"},\"40\": {\"ltRole\":\"admin\",\"ldapRole\":\"administrators\"},\"50\": {\"ltRole\":\"owner\",\"ldapRole\":\"administrators\"}}"
 
 
 ## OpenID Connect
 # required
-LEAN_OIDC_ENABLE = true
-LEAN_OIDC_CLIEND_ID =
-LEAN_OIDC_CLIEND_SECRET =
+LEAN_OIDC_ENABLE=true
+LEAN_OIDC_CLIEND_ID=
+LEAN_OIDC_CLIEND_SECRET=
 
 # required - the url for your provider (examples down below)
 #LEAN_OIDC_PROVIDER_URL =
@@ -120,9 +119,11 @@ LEAN_OIDC_CLIEND_SECRET =
 #LEAN_OIDC_FIELD_LASTNAME =
 
 ## OpenID Connect setting for github
-#LEAN_OIDC_PROVIDER_URL = https://token.actions.githubusercontent.com/
-#LEAN_OIDC_AUTH_URL_OVERRIDE = https://github.com/login/oauth/authorize
-#LEAN_OIDC_TOKEN_URL_OVERRIDE = https://github.com/login/oauth/access_token
-#LEAN_OIDC_USERINFO_URL_OVERRIDE = https://api.github.com/user,https://api.github.com/user/emails
-#LEAN_OIDC_SCOPES = user:email
-#LEAN_OIDC_FIELD_EMAIL = 0.email
+#LEAN_OIDC_PROVIDER_URL=https://token.actions.githubusercontent.com/
+#LEAN_OIDC_AUTH_URL_OVERRIDE=https://github.com/login/oauth/authorize
+#LEAN_OIDC_TOKEN_URL_OVERRIDE=https://github.com/login/oauth/access_token
+#LEAN_OIDC_USERINFO_URL_OVERRIDE=https://api.github.com/user,https://api.github.com/user/emails
+#LEAN_OIDC_SCOPES=user:email
+#LEAN_OIDC_FIELD_EMAIL=0.email
+#
+#LEAN_MARKETPLACE_URL='https://marketplace.staging.leantime.io'
diff --git a/.dev/docker-compose.tests.yaml b/.dev/docker-compose.tests.yaml
@@ -7,6 +7,12 @@ services:
       - "./xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
       - "./error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini"
       - ${PWD}/test.env:/var/www/html/config/.env
+    environment:
+      LEAN_DB_HOST: 'db'
+      LEAN_DB_USER: 'leantime'
+      LEAN_DB_PASSWORD: 'leantime'
+      LEAN_DB_DATABASE: 'leantime_test'
+      LEAN_DB_PORT: '3306'
   db:
     environment:
       MYSQL_DATABASE: leantime_test

diff --git a/.dev/docker-compose.yaml b/.dev/docker-compose.yaml
@@ -17,7 +17,13 @@ services:
      - "../:/var/www/html"
      - "./xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini"
      - "./error_reporting.ini:/usr/local/etc/php/conf.d/error_reporting.ini"
-     - ".env:/var/www/html/config/.env"
+     # - ".env:/var/www/html/config/.env"
+    environment:
+      LEAN_DB_HOST: 'db'
+      LEAN_DB_USER: 'leantime'
+      LEAN_DB_PASSWORD: 'leantime'
+      LEAN_DB_DATABASE: 'leantime'
+      LEAN_DB_PORT: '3306'
     extra_hosts:
       - "host.docker.internal:host-gateway"
     depends_on:

diff --git a/.dev/dockerfile b/.dev/dockerfile
@@ -7,8 +7,9 @@ RUN apt update && apt install -f -y  libonig-dev libcurl4-openssl-dev libxml2-de
     libfreetype6-dev libjpeg62-turbo-dev libpng-dev apt-utils vim curl sqlite3\
     openssl
 RUN pecl install xdebug
-RUN docker-php-ext-install mysqli pdo_mysql mbstring exif pcntl pdo bcmath opcache ldap
+RUN docker-php-ext-install mysqli pdo_mysql mbstring exif pcntl pdo bcmath opcache ldap zip
 
+RUN docker-php-ext-enable zip
 RUN docker-php-ext-configure gd --enable-gd --with-jpeg=/usr/include/ --with-freetype --with-jpeg
 RUN docker-php-ext-install gd
 RUN docker-php-ext-enable xdebug

diff --git a/.dev/error_reporting.ini b/.dev/error_reporting.ini
@@ -1,2 +1,4 @@
 error_reporting=E_ALL
-display_errors = On; display_startup_errors = On
+display_errors=On
+display_startup_errors=On
+error_log=/var/www/html/logs/error.log
diff --git a/.dev/test.env b/.dev/test.env
@@ -3,14 +3,14 @@
 
 ## Minimum Configuration, these are required for installation
 
-LEAN_APP_URL = ''                                  # Base URL, only needed for subfolder installation
-LEAN_APP_DIR = ''                             # Base of application without trailing slash (used for cookies), e.g, /leantime
+LEAN_APP_URL = 'https://localhost:8090'         # Base URL, only needed for subfolder installation
+LEAN_APP_DIR = ''                               # Base of application without trailing slash (used for cookies), e.g, /leantime
 
 LEAN_DEBUG = 1                                   # Debug flag
 
 # Database
-LEAN_DB_HOST = 'db'                         # Database host
-LEAN_DB_USER = 'leantime'                                  # Database username
+LEAN_DB_HOST = 'db'                                # Database host
+LEAN_DB_USER = 'leantime'                          # Database username
 LEAN_DB_PASSWORD = 'leantime'                              # Database password
 LEAN_DB_DATABASE = 'leantime_test'                         # Database name
 LEAN_DB_PORT = '3306'                              # Database port

diff --git a/.dev/xdebug.ini b/.dev/xdebug.ini
@@ -2,8 +2,9 @@ zend_extension=xdebug
 
 [xdebug]
 xdebug.mode=debug
-xdebug.discover_client_host=1
+;xdebug.discover_client_host=1
 xdebug.client_host=host.docker.internal; do not touch
 xdebug.start_with_request=yes
 xdebug.client_port=9003
 xdebug.idekey="PHPSTORM"
+xdebug.log=/var/log/xdebug/xdebug.log