Skip to content

Commit 175c87d

Browse files
andi34andi34
committed
Merge branch 'dev' into HEAD
Change-Id: Idcede246e7641976bb468112b245c363a2b3ade7
2 parents 02dba14 + d8449b3 commit 175c87d

File tree

135 files changed

+7413
-4646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+7413
-4646
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ body:
99
1. Please speak English, this is the language all maintainers can speak and write.
1010
2. Please ask questions or configuration/deploy problems in our Telegram group (https://t.me/PhotoboothGroup).
1111
3. Please take a moment to check that your bug hasn't already been reported.
12-
4. Make sure it's not mentioned in the [FAQ](https://github.com/andi34/photobooth/blob/wiki/FAQ.md).
12+
4. Make sure it's not mentioned in the [FAQ](https://photoboothproject.github.io/FAQ).
1313
5. Please give all relevant information below for bug reports, because incomplete details will be handled as an invalid report!
1414
1515
- type: textarea

‎.github/pull_request_template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#### Prerequisites checklist
66

7-
- [ ] I have read the [contributing guidelines](https://github.com/andi34/photobooth/blob/dev/CONTRIBUTING.md).
7+
- [ ] I have read the [contributing guidelines](https://github.com/PhotoboothProject/photobooth/blob/dev/CONTRIBUTING.md).
88

99
#### What is the purpose of this pull request? (put an "x" next to an item)
1010
<!-- Example:

‎.github/workflows/crowdin_download.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Crowdin Translation Download
2+
3+
on:
4+
schedule:
5+
# Run on 1. day of a month at 00:00
6+
- cron: '0 0 1 * *'
7+
workflow_dispatch:
8+
9+
jobs:
10+
synchronize-with-crowdin:
11+
runs-on: ubuntu-latest
12+
if: github.repository == 'PhotoboothProject/photobooth'
13+
14+
steps:
15+
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
19+
- name: crowdin action
20+
uses: crowdin/github-action@1.4.6
21+
with:
22+
upload_sources: true
23+
upload_translations: false
24+
download_translations: true
25+
skip_untranslated_strings: true
26+
export_only_approved: false
27+
push_translations: true
28+
commit_message: 'crowdin: automatic translation import'
29+
github_user_email: 'andi@unlegacy-android.org'
30+
github_user_name: 'Andreas Blaesius'
31+
localization_branch_name: crowdin_auto_import
32+
pull_request_title: '[Crowdin] Automatic translation import'
33+
pull_request_body: 'Automatic translation import from https://crowdin.com/project/photobooth'
34+
pull_request_base_branch_name: dev
35+
config: 'crowdin/config.yml'
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GH_REPO_TOKEN }}
38+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
39+
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

‎.github/workflows/crowdin_upload.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Crowdin Translation Upload
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
paths:
8+
- 'resources/lang/en.json'
9+
workflow_dispatch:
10+
11+
jobs:
12+
synchronize-with-crowdin:
13+
runs-on: ubuntu-latest
14+
if: github.repository == 'PhotoboothProject/photobooth'
15+
16+
steps:
17+
18+
- name: Checkout
19+
uses: actions/checkout@v2
20+
21+
- name: crowdin action
22+
uses: crowdin/github-action@1.4.6
23+
with:
24+
upload_sources: true
25+
upload_translations: false
26+
push_translations: false
27+
download_translations: false
28+
config: 'crowdin/config.yml'
29+
env:
30+
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
31+
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,11 @@ vendor/simple-translator/
2727
*.patch
2828
.skip_welcome
2929
.vscode
30+
venv/
31+
32+
# ignore some IDE and OS files
33+
*.iml
34+
*.ipr
35+
*.iws
36+
.idea/
37+
**/.DS_Store

‎.gitmodules‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
[submodule "vendor/PHPMailer"]
22
path = vendor/PHPMailer
33
url = https://github.com/PHPMailer/PHPMailer
4-
[submodule "vendor/rpihotspot"]
5-
path = vendor/rpihotspot
6-
url = https://github.com/andi34/rpihotspot
7-
[submodule "vendor/PhotoSwipe"]
8-
path = vendor/PhotoSwipe
9-
url = https://github.com/andi34/PhotoSwipe
104
[submodule "vendor/Seriously"]
115
path = vendor/Seriously
126
url = https://github.com/brianchirls/Seriously.js
7+
[submodule "vendor/PhotoSwipe"]
8+
path = vendor/PhotoSwipe
9+
url = https://github.com/PhotoboothProject/PhotoSwipe
1310
[submodule "vendor/phpqrcode"]
1411
path = vendor/phpqrcode
15-
url = https://github.com/andi34/phpqrcode
12+
url = https://github.com/PhotoboothProject/phpqrcode

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If you want to build the project, run `yarn build`.
2222
> pull requests from branches on your fork. To do this, run:
2323
>
2424
> ```
25-
> git remote add upstream https://github.com/andi34/photobooth.git
25+
> git remote add upstream https://github.com/PhotoboothProject/photobooth.git
2626
> git fetch upstream
2727
> git branch --set-upstream-to=upstream/dev dev
2828
> ```
@@ -45,7 +45,7 @@ Please make sure to run `yarn build` and `yarn eslint` before you commit your ch
4545
4646
## Help needed
4747
48-
Please checkout the [open issues](https://github.com/andi34/photobooth/issues).
48+
Please checkout the [open issues](https://github.com/PhotoboothProject/photobooth/issues).
4949
5050
Also, please watch the repo and respond to questions / bug reports / feature requests.
5151
Thanks!

‎Dockerfile‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM webdevops/php-apache
2+
3+
# Update and install dependencies
4+
RUN apt update
5+
6+
RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash -
7+
RUN apt install -y build-essential git php-gd php-zip gphoto2 libimage-exiftool-perl nodejs rsync udisks2
8+
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
9+
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
10+
RUN apt update && apt install -y yarn
11+
12+
# Copy files
13+
WORKDIR /app
14+
COPY . .
15+
16+
# Install and build
17+
RUN git config --global --add safe.directory /app
18+
RUN git submodule update --init
19+
RUN yarn install
20+
RUN yarn build

‎README.md‎

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
1-
# Photobooth v3
1+
2+
# Photobooth v4
23

34
A Photobooth web interface for Linux and Windows.
45

5-
Photobooth was initially developped by Andre Rinas to use on a Raspberry Pi, you can find his source [here](https://github.com/andreknieriem/photobooth).
6+
Photobooth was initially developped by Andre Rinas to use on a Raspberry Pi, you can find his source [here](https://github.com/andreknieriem/photobooth).
7+
In 2019 Andreas Blaesius picked up the work and continued to work on the source.
8+
With the help of the community Photobooth grew to a powerfull Photobooth software with a lot of features and possibilities.
69

7-
**This is my personal Photobooth fork with a lot of extras and improvements.**
8-
_(The full changelog can be found inside [the Photobooth Wiki](https://github.com/andi34/photobooth/wiki/changelog).)_
10+
_(The full changelog can be found on [https://photoboothproject.github.io](https://photoboothproject.github.io).)_
911

1012
[![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-blue.svg)](https://t.me/PhotoboothGroup)
1113

1214
[![Translate on Crowdin](https://img.shields.io/badge/Traslate%20on-Crowdin-green.svg)](https://crowdin.com/project/photobooth)
1315

14-
[![Lint](https://github.com/andi34/photobooth/workflows/Lint/badge.svg?branch=stable3)](https://github.com/andi34/photobooth/actions?query=branch%3Astable3+workflow%3ALint)
15-
[![gulp-sass](https://github.com/andi34/photobooth/workflows/gulp-sass/badge.svg?branch=stable3)](https://github.com/andi34/photobooth/actions?query=branch%3Astable3+workflow%3Agulp-sass)
16+
_Latest stable release:_
17+
[![Lint](https://github.com/PhotoboothProject/photobooth/workflows/Lint/badge.svg?branch=stable3)](https://github.com/PhotoboothProject/photobooth/actions?query=branch%3Astable3+workflow%3ALint)
18+
[![gulp-sass](https://github.com/PhotoboothProject/photobooth/workflows/gulp-sass/badge.svg?branch=stable3)](https://github.com/PhotoboothProject/photobooth/actions?query=branch%3Astable3+workflow%3Agulp-sass)
19+
[![Build](https://github.com/PhotoboothProject/photobooth/workflows/Build/badge.svg?branch=stable3)](https://github.com/PhotoboothProject/photobooth/actions?query=branch%3Astable3+workflow%3ABuild)
20+
21+
_Latest development version:_
22+
[![Lint](https://github.com/PhotoboothProject/photobooth/workflows/Lint/badge.svg?branch=dev)](https://github.com/PhotoboothProject/photobooth/actions?query=branch%3Adev+workflow%3ALint)
23+
[![gulp-sass](https://github.com/PhotoboothProject/photobooth/workflows/gulp-sass/badge.svg?branch=dev)](https://github.com/PhotoboothProject/photobooth/actions?query=branch%3Adev+workflow%3Agulp-sass)
24+
[![Build](https://github.com/PhotoboothProject/photobooth/workflows/Build/badge.svg?branch=dev)](https://github.com/PhotoboothProject/photobooth/actions?query=branch%3Adev+workflow%3ABuild)
25+
1626

1727
## :heart_eyes: Features
1828

@@ -23,7 +33,7 @@ _(The full changelog can be found inside [the Photobooth Wiki](https://github.co
2333
to take pictures.
2434
- Images are processed with GD.
2535
- Photobooth caches all generated QR-Codes, Thumbnails and Prints.
26-
- Updated [PhotoSwipe Gallery](https://github.com/andi34/PhotoSwipe)
36+
- Updated [PhotoSwipe Gallery](https://github.com/PhotoboothProject/PhotoSwipe)
2737
- Standalone Gallery ([localhost/gallery.php](http://localhost/gallery.php)).
2838
- Slideshow via Gallery or standalone Gallery at [localhost/slideshow](http://localhost/slideshow).
2939
- Access login via [localhost/login](http://localhost/login) instead [localhost/login.php](http://localhost/login.php).
@@ -89,27 +99,36 @@ _(The full changelog can be found inside [the Photobooth Wiki](https://github.co
8999

90100
## :camera: Screenshots
91101

92-
![](https://raw.githubusercontent.com/wiki/andi34/photobooth/resources/img/start.png)
102+
![](https://raw.githubusercontent.com/PhotoboothProject/PhotoboothProject.github.io/master/resources/img/start.png)
93103

94104
## :gear: Prerequisites
95105

96-
- gphoto2 installed, if used on a Raspberry for DSLR control
97-
- digiCamControl, if used unter Windows for DSLR control
106+
- gphoto2, if used on a Raspberry for DSLR control
107+
- digiCamControl, if used on Windows for DSLR control
98108
- Apache, NGINX or Lighttpd
99109

100110
## :wrench: Installation & Troubleshooting
101111

102-
Please follow the installation instructions in our
103-
[Photobooth-Wiki](https://github.com/andi34/photobooth/wiki) to setup
112+
Please follow the installation instructions
113+
[here](https://photoboothproject.github.io/INSTALL) to setup
104114
Photobooth.
105115

106116
If you're having trouble or questions please take a look at our
107-
[FAQ](https://github.com/andi34/photobooth/wiki#faq---frequently-asked-questions)
117+
[FAQ](https://photoboothproject.github.io/FAQ_MENU)
108118
before opening a new issue.
109119

120+
For local testing and development, the docker setup can be used with `docker-compose up --build`.
121+
110122
### :mag: Changelog
111123

112-
Please take a look at the changelog in our [Photobooth Wiki](https://github.com/andi34/photobooth/wiki/changelog).
124+
Please take a look at the changelog available on [https://photoboothproject.github.io](https://photoboothproject.github.io).
125+
126+
### :warning: Security advice
127+
128+
Photobooth is not hardened against any kind of *targeted* attacks.
129+
It uses user defined commands for tasks like taking photos and is allowed to replace its own files for easy updating.
130+
Because of this it's not advised to operate Photobooth in an untrusted network and
131+
**you should absolutely not make Photobooth accessible through the internet without heavy modifications!**
113132

114133
### :copyright: License
115134

@@ -172,3 +191,8 @@ If you like my work and like to keep me motivated you can buy me a coconut water
172191
- [DIY89](https://github.com/DIY89)
173192
- [mhellmeier](https://github.com/mhellmeier)
174193
- [Uwe Pieper](https://github.com/up-87)
194+
- [s-dinda](https://github.com/s-dinda)
195+
- [Moarqi](https://github.com/Moarqi)
196+
- [kreativmonkey](https://github.com/kreativmonkey)
197+
- [Khaos66](https://github.com/Khaos66)
198+

‎admin/debugpanel.php‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
header('location: ../login');
1515
exit();
1616
}
17+
18+
$uiShape = 'shape--' . $config['ui']['style'];
19+
$btnShape = 'shape--' . $config['ui']['button'];
20+
$btnClass = 'adminnavlistelement ' . $btnShape . ' noborder';
1721
?>
1822
<!DOCTYPE html>
1923
<html>
@@ -38,10 +42,10 @@
3842
<link rel="stylesheet" type="text/css" href="../node_modules/normalize.css/normalize.css">
3943
<link rel="stylesheet" type="text/css" href="../node_modules/font-awesome/css/font-awesome.css">
4044
<link rel="stylesheet" type="text/css" href="../node_modules/selectize/dist/css/selectize.css">
41-
<link rel="stylesheet" type="text/css" href="../resources/css/admin.css">
42-
<?php if (is_file("../private/overrides.css")): ?>
43-
<link rel="stylesheet" href="../private/overrides.css" />
44-
<?php endif; ?>
45+
<link rel="stylesheet" type="text/css" href="../resources/css/<?php echo $config['ui']['style']; ?>_admin.css">
46+
<?php if (is_file("../private/overrides.css")): ?>
47+
<link rel="stylesheet" href="../private/overrides.css" />
48+
<?php endif; ?>
4549
</head>
4650
<body>
4751
<!-- NavBar content -->
@@ -89,13 +93,13 @@ function html_src_indent($num)
8993
echo '<ul class="adminnavlist" id="navlist">';
9094
html_src_indent(++$indent);
9195

92-
echo '<li><a class="adminnavlistelement" href="#myconfig" id="nav-myconfig"><div><span data-i18n="myconfig">myconfig</span></div></a></li>';
93-
echo '<li><a class="adminnavlistelement" href="#remotebuzzerlog" id="nav-remotebuzzerlog"><div><span data-i18n="remotebuzzer">remotebuzzer</span></div></a></li>';
94-
echo '<li><a class="adminnavlistelement" href="#synctodrivelog" id="nav-synctodrivelog"><div><span data-i18n="synctodrive">synctodrive</span></div></a></li>';
95-
echo '<li><a class="adminnavlistelement" href="#devlog" id="nav-devlog"><div><span data-i18n="devlog">devlog</span></div></a></li>';
96-
echo '<li><a class="adminnavlistelement" href="#serverprocesses" id="nav-serverprocesses"><div><span data-i18n="serverprocesses">serverprocesses</span></div></a></li>';
97-
echo '<li><a class="adminnavlistelement" href="#bootconfig" id="nav-bootconfig"><div><span data-i18n="bootconfig">bootconfig</span></div></a></li>';
98-
echo '<li><a class="adminnavlistelement" href="#githead" id="nav-githead"><div><span data-i18n="githead">githead</span></div></a></li>';
96+
echo '<li><a class="'. $btnClass .'" href="#myconfig" id="nav-myconfig"><div><span data-i18n="myconfig">myconfig</span></div></a></li>';
97+
echo '<li><a class="'. $btnClass .'" href="#remotebuzzerlog" id="nav-remotebuzzerlog"><div><span data-i18n="remotebuzzer">remotebuzzer</span></div></a></li>';
98+
echo '<li><a class="'. $btnClass .'" href="#synctodrivelog" id="nav-synctodrivelog"><div><span data-i18n="synctodrive">synctodrive</span></div></a></li>';
99+
echo '<li><a class="'. $btnClass .'" href="#devlog" id="nav-devlog"><div><span data-i18n="devlog">devlog</span></div></a></li>';
100+
echo '<li><a class="'. $btnClass .'" href="#serverprocesses" id="nav-serverprocesses"><div><span data-i18n="serverprocesses">serverprocesses</span></div></a></li>';
101+
echo '<li><a class="'. $btnClass .'" href="#bootconfig" id="nav-bootconfig"><div><span data-i18n="bootconfig">bootconfig</span></div></a></li>';
102+
echo '<li><a class="'. $btnClass .'" href="#githead" id="nav-githead"><div><span data-i18n="githead">githead</span></div></a></li>';
99103

100104
html_src_indent(--$indent);
101105
echo '</ul>';
@@ -104,7 +108,7 @@ function html_src_indent($num)
104108
<!-- Settings page content -->
105109
<form autocomplete="off">
106110
<div class="admincontent" id="admincontentpage">
107-
<div class="debugcontent">
111+
<div class="debugcontent <?php echo $uiShape; ?>">
108112
</div>
109113
</div>
110114
<script src="../node_modules/whatwg-fetch/dist/fetch.umd.js"></script>

0 commit comments

Comments
 (0)