Skip to content

Commit

Permalink
Merge branch 'master' into feature/1744-reset-due-date-dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
sinejespersen authored Oct 14, 2024
2 parents b53abfc + 0e7ddbb commit d790c33
Show file tree
Hide file tree
Showing 98 changed files with 7,315 additions and 6,069 deletions.
133 changes: 0 additions & 133 deletions .dev/.env

This file was deleted.

8 changes: 8 additions & 0 deletions .dev/docker-compose.tests.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# This docker compose file is used to build the environment for our testing framework in codeception
# It is not to be used for development
#

version: "3.9"

services:
Expand All @@ -7,6 +12,9 @@ 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"
- "./test.env:/var/www/html/config/.env"
ports:
- "8002:8080" #Using different ports for testing, so we don't have to worry about collision
- "44302:443" #Using different ports for testing, so we don't have to worry about collision (available range is 44300–44399)
environment:
LEAN_DB_HOST: 'db'
LEAN_DB_USER: 'leantime'
Expand Down
5 changes: 2 additions & 3 deletions .dev/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ services:
leantime-dev:
build: .
ports:
- "8888:8080"
- "8443:443"
- "8001:8080" #Using ports that are hopefully available. format is: 80XX
- "44301:443" #Using ports that are hopefully available. format is: 443XX (available range is 44300–44399)
volumes:
- "../:/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"
environment:
LEAN_DB_HOST: 'db'
LEAN_DB_USER: 'leantime'
Expand Down
10 changes: 6 additions & 4 deletions .dev/test.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This is a sample configuration file with all possible configuration options.
# If you don't want to maintain a file like this you can pass in all variables via Server Variabels
#
# This environment file is used for our testing framework
# It is not to be used for development
#

## Minimum Configuration, these are required for installation

Expand Down Expand Up @@ -42,8 +44,8 @@ LEAN_DB_BACKUP_PATH = 'backupdb/' # Local relative path to stor
# 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_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)
Expand Down
39 changes: 0 additions & 39 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Bug Report
description: File a bug report.
title: "[Bug]: "
labels: ["Bug"]
assignees:
- marcelfolaron
body:
- type: markdown
attributes:
value: "Thank you for taking the time to submit a bug report. If you have problems with the installation or other questions please use the [discussion forum](https://github.com/Leantime/leantime/discussions) or our [discord server](https://discord.gg/4zMzJtAq9z)"
- type: dropdown
attributes:
label: What is your set up?
options:
- Cloud Hosted
- Self Hosted Server
- Self Hosted Docker
validations:
required: true
- type: input
id: version
attributes:
label: Version
description: "Which Leantime version are you using (see footer bottom right)"
placeholder: "3.x.x"
validations:
required: true
- type: textarea
attributes:
label: Describe the issue
placeholder: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: repro
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
validations:
required: true
- type: textarea
id: context
attributes:
label: Additional Notes
description: "Please add any additional context you can share"
validations:
required: false
17 changes: 0 additions & 17 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Feature request
description: Suggest an idea for this project.
title: "[Feature]: "
labels: ["Feature"]
assignees:
- marcelfolaron
body:
- type: markdown
attributes:
value: "Thank you for taking the time to submit a feature request. If you have problems with the installation or other questions please use the [discussion forum](https://github.com/Leantime/leantime/discussions) or our [discord server](https://discord.gg/4zMzJtAq9z)"
- type: dropdown
attributes:
label: What is your set up?
options:
- Cloud Hosted
- Self Hosted Server
- Self Hosted Docker
validations:
required: true
- type: textarea
attributes:
label: Is your feature request related to a problem? Please describe
description: A clear and concise description of what the problem is.
placeholder: Ex. I'm always frustrated when [...]
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
placeholder:
validations:
required: true
- type: textarea
attributes:
label: Additional context
description: "Add any other context or screenshots about the feature request here."
validations:
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/sweep-template.yml

This file was deleted.

18 changes: 9 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#### Description
### Description

Please include a short description of the suggested change and the reasoning behind the approach you have chosen.
*Please include a short description of the suggested change and the reasoning behind the approach you have chosen.*

#### Link to ticket
### Link to ticket

Please add a link to the GitHub issue being addressed by this change.
*Please add a link to the GitHub issue being addressed by this change.*

### Type

[] Fix
[] Feature
[] Cleanup
- [ ] Fix
- [ ] Feature
- [ ] Cleanup

#### Screenshot of the result
### Screenshot of the result

If your change affects the user interface, you should include a screenshot of the result with the pull request.
*If your change affects the user interface, you should include a screenshot of the result with the pull request.*
3 changes: 3 additions & 0 deletions .github/workflows/staticAnalysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install Dependencies
run: make build-dev

- name: Run Tests
run: make phpstan
Loading

0 comments on commit d790c33

Please sign in to comment.