Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Watermark Sichtbare Wasserzeichen #529

Open
wants to merge 108 commits into
base: master
Choose a base branch
from
Open

Watermark Sichtbare Wasserzeichen #529

wants to merge 108 commits into from

Conversation

tobiasjutzi
Copy link

No description provided.

Epd02 and others added 30 commits November 8, 2023 14:20
@Epd02
Added docker files
80e0bd9
@Epd02
Merge pull request #1 from timed-and-secured-assets/gruppe-1
c62c4ed 
Added docker files
@Epd02
removed credentials
204ff4f
@Epd02
Merge pull request #2 from timed-and-secured-assets/gruppe-1
d6650fe 
removed credentials
@Epd02
fixed gitignore not ignoring database files
d8328c0
@Epd02
Added Filetype check for uploading surveys
18f39f6
@Epd02
Merge branch 'upload' of github.com:timed-and-secured-assets/formr.or…
2a3aa45 
…g into upload
@eliasheithecker
Create formr-docker-image.yaml
179b681
@eliasheithecker
Create opencpu-docker-image.yaml
7b7c29b
@eliasheithecker
Update opencpu-docker-image.yaml
39b7d2a
@l4zs
feat: use data uri scheme for img src
2f9493c
@Epd02
Merge pull request #4 from timed-and-secured-assets/upload
4fa8868 
Merge branch "upload"
@Epd02
Added placeholder button and confirm mechanism for deleting accounts
a497aee
@eliasheithecker
ADD: Delete Full RUN:
011eec5 
* Funktion, die den Run und alle dazugehörigen Assets löscht.
@eliasheithecker
ADD: Run Expires On Column
bbbf380
@olekomo
Merge remote-tracking branch 'origin/auto-delete' into feature/timest…
bcfd58e 
…amp/front-end
@eliasheithecker
ADD: Cron Job
a013bb1
@eliasheithecker
ADD: Fix Cron - Job
3b8a354
@olekomo
expiresOn Felder hinzugefügt
4cec04b
@olekomo
timestamp aus Datenbank lesen und schreiben
ff2a949
@olekomo
push
d0823fd
@eliasheithecker
Merge remote-tracking branch 'origin/feature/timestamp/front-end' int…
a76923a 
…o auto-delete
@eliasheithecker
Fix: Don't save invalid Expiration-Date
d7bfd01
@Epd02
Extracted User deletion to User.php
b41f3d4
@Epd02
Added deletion mechanism to placeholder button
a0bdfac
Fixed user deletion UI
b63f11d
@Epd02
Added 2FA library to composer and fixed Dockerfile not handling chang…
ef7190c 
…es in composer.json
@l4zs
fix: deny accessing uploaded images
0b1e5ec
@l4zs
feat: image viewer for run uploaded images
9d123fc
Merge branch 'master' into feature/no-ref/img-data-uri
41027dc
ThatsEli and others added 30 commits February 18, 2024 11:28
@ThatsEli
Added python dep install to docker-compose
a4a6530
@ThatsEli
Changed python script path
1004c63
@majortomts
added .idea/ to gitignore
1c93c55
@majortomts
added Python watermark script
3cabfad
@ThatsEli
Fixed watermarking method
c7fce9e
@ThatsEli
Fixed watermarking error message
f46760c
@majortomts
Merge branch 'master' into watermark
2151f42 
# Conflicts:
#	application/Model/Run.php
@eliasheithecker
Pipeline - Nun auch mit release.yaml
7ced56d
@eliasheithecker
Pipeline - Faster Builds for Staging
14ec9a7
@majortomts
renamed sql patch
a24de49
@majortomts
fixed new_file_path if the image was watermarked
7738ef4
@majortomts
added explanatory texts to upload and settings pages, added watermark…
9d2abb6 
… key to upload list, fixed watermark method selection
@eliasheithecker
Release Pipeline & Anleitung
3b3e4c7
@majortomts
added note to sift character restriction
d1f090a
@eliasheithecker
Typos & Skript: Datei-Quellen
82f54c9
@eliasheithecker
Add Snapshot Suffix
945b595
@majortomts
updated watermark embedding (only sift and blind)
2fdd644
@eliasheithecker
Merge pull request #19 from timed-and-secured-assets/feature/anleitung
eb28c87 
Feature/anleitung
@Epd02
Rename 040_add_watermark_settings.sql to 039_add_watermark_settings.sql
a4fecc4
@eliasheithecker
Merge pull request #17 from timed-and-secured-assets/watermark
0b4465c 
Invisible Watermarking
@eliasheithecker
Links in README und INSTALL.md
2a2f27b
@eliasheithecker
Pipeline Code Scanning - Image Name Fix
f9a03c9
@eliasheithecker
Email <br> entfernt
59c1df5
@eliasheithecker
';' Fehler in schema.sql
fca7ae0
@eliasheithecker
Delete docker dir
ec3ffd6
@eliasheithecker
Update README.md
4862fa5
@Epd02
Merge pull request #20 from timed-and-secured-assets/final
a50ad29 
Final
@eliasheithecker
Update INSTALL.md
4079011
@tobiasjutzi
visible Watermark:
f3dbc68 
- Upload GUI for customized watermark, in settings.php
- drop down menu for choosing watermark level, in file settings.php
- Backend logic for generating and applying the watermark, in Run.php
- Database update in survey_runs, in files:  schema.sql, 039_add_watermark_settings.sql
- Datebase update in Docker
- update composer.json
- add default Watermark
- Action endpoint that handles the request for uploaded watermark, in AdminRunController.php
- Backend logic for uploading customized watermark, in Run.php

-
@tobiasjutzi
Merge remote-tracking branch 'origin/master' into watermark
bcb4293 
# Conflicts:
#	docker/init.sql
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@tobiasjutzi @rubenarslan @Epd02 @eliasheithecker @l4zs @olekomo @ThatsEli @majortomts