Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'dev' into HEAD
Browse files Browse the repository at this point in the history
Change-Id: Id5e9cb360681bde1c9e687876446972946cae024
  • Loading branch information
andi34 committed Jan 16, 2022
2 parents 4544bcd + 78d7024 commit 6092c75
Show file tree
Hide file tree
Showing 534 changed files with 5,120 additions and 14,229 deletions.
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE/add_localization.md

This file was deleted.

25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/add_localization.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: "\U0001F5FA Request a new language"
description: Your language isn't supported? Create a localization request here!
title: "[LOCALIZATION]: "
labels: localization
body:
- type: markdown
attributes:
value: |
1. Please speak English, this is the language all maintainers can speak and write.
2. Please ask questions or configuration/deploy problems in our Telegram group (https://t.me/PhotoboothGroup).
3. Please take a moment to check that your language hasn't already been suggested.
4. Request as translator on (https://crowdin.com/project/photobooth).
- type: textarea
id: description
attributes:
label: Request a language
placeholder: |
Please tell which language you are missing in Photobooth.
validations:
required: true
- type: textarea
id: additional
attributes:
label: Additional context
description: Add any other context here.
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

86 changes: 86 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: "\U0001F41E Bug report"
description: Create a report to help us improve
title: "[BUG]: "
labels: bug
body:
- type: markdown
attributes:
value: |
1. Please speak English, this is the language all maintainers can speak and write.
2. Please ask questions or configuration/deploy problems in our Telegram group (https://t.me/PhotoboothGroup).
3. Please take a moment to check that your bug hasn't already been reported.
4. Make sure it's not mentioned in the [FAQ](https://github.com/andi34/photobooth/blob/wiki/FAQ.md).
5. Please give all relevant information below for bug reports, because incomplete details will be handled as an invalid report!
- type: textarea
id: description
attributes:
label: Describe the bug
description: |
A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
id: reproduce
attributes:
label: Steps to reproduce the behavior
description: |
1. Go to ...
2. Click on ....
3. Scroll down to ....
4. See error
validations:
required: true

- type: textarea
id: expection
attributes:
label: Expected behavior
placeholder: |
A clear and concise description of what you expected to happen
validations:
required: true

- type: input
id: photobooth-ver
attributes:
label: Photobooth Version
description: Photobooth Version (or commit reference) your instance is running
validations:
required: true

- type: input
id: browser-ver
attributes:
label: Browser and browser version
description: Browser and version of the browser you are accessing Photobooth from

- type: input
id: os-ver
attributes:
label: Operating System
description: The operating system you are using to run Photobooth, e.g Raspberry Pi OS with desktop


- type: dropdown
id: workbefore
attributes:
label: Did it work before?
options:
- "Yes"
- "No"
validations:
required: true
- type: input
id: workbefore-description
attributes:
label: Latest working version
description: |
If it worked before, please tell the latest working version.
- type: textarea
id: additional
attributes:
label: Additional context
description: Add any other context or screenshots about the bug here.
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

53 changes: 53 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: "\U0001F680 Feature request"
description: Suggest an idea for this project
title: "[FEATURE]: "
labels: enhancement
body:
- type: markdown
attributes:
value: |
1. Please speak English, this is the language all maintainers can speak and write.
2. Please ask questions or configuration/deploy problems in our Telegram group (https://t.me/PhotoboothGroup).
3. Please take a moment to check that your feature hasn't already been suggested.
- type: dropdown
id: problem-related
attributes:
label: Is your feature request related to a problem?
description: |
If so, please please describe in the Description field.
options:
- "Yes"
- "No"
validations:
required: true
- type: textarea
id: problem-description
attributes:
label: Description
description: |
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...].
- type: textarea
id: description
attributes:
label: Describe the solution you'd like
placeholder: |
A clear and concise description of what you want to happen.
validations:
required: true

- type: textarea
id: alternatives
attributes:
label: Describe alternatives you've considered
placeholder: |
A clear and concise description of any alternative solutions or features you've considered.
validations:
required: true

- type: textarea
id: additional
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
52 changes: 52 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Build

on:
push:
branches:
- dev
pull_request:
branches:
- dev
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
with:
submodules: true
- name: Use Node v12
uses: actions/setup-node@v2
with:
node-version: '12'
- name: Install modules
run: yarn install
- name: Build
run: yarn build
- name: Get git status
run: git status
- name: Pack zip
run: yarn pack:build
- name: Publish zip
uses: actions/upload-artifact@v2
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
with:
name: photobooth
path: archives/photobooth-*.zip
buildmacos:
runs-on: macos-11
steps:
- name: Checkout repository and submodules
uses: actions/checkout@v2
with:
submodules: true
- name: Use Node v12
uses: actions/setup-node@v2
with:
node-version: '12'
- name: Install modules
run: yarn install
- name: Build
run: yarn build
5 changes: 3 additions & 2 deletions .github/workflows/gulp_sass.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ on:
push:
branches:
- dev
- stable2
- stable3
paths:
- '**.scss'
pull_request:
branches:
- dev
- stable2
- stable3
paths:
- '**.scss'
Expand All @@ -22,6 +20,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '12'
- name: Install modules
run: yarn install
- name: Running gulp-sass
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@ on:
push:
branches:
- dev
- stable2
- stable3
paths:
- '**.js'
pull_request:
branches:
- dev
- stable2
- stable3
paths:
- '**.js'
Expand All @@ -22,6 +20,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '12'
- name: Install modules
run: yarn install
- name: Lint
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ config/*
!config/config.inc.php
data/
digicamcontrol/
HEAD
manual/faq.*
node_modules/
package-lock.json
private/
private/*
!private/README.md
resources/css/*
!resources/css/README.md
resources/js/*
Expand All @@ -23,4 +25,5 @@ vendor/simple-translator/
/.htaccess
.htpasswd
*.patch
.skip_welcome
.vscode
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
[submodule "vendor/Seriously"]
path = vendor/Seriously
url = https://github.com/brianchirls/Seriously.js
[submodule "vendor/phpqrcode"]
path = vendor/phpqrcode
url = https://github.com/andi34/phpqrcode
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
scripts-prepend-node-path=true
engine-strict=true
6 changes: 6 additions & 0 deletions LICENSE_NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
LICENSE NOTE

Once build, Photobooth incorporates several parts and optimizations that are covered by a different license which could apply to Photobooth as well.

All dependencies include their respective LICENSE files.

Loading

0 comments on commit 6092c75

Please sign in to comment.