Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity
1,383 Commits 7 Branches 0 Tags
1fee0b1eefff74cb8594e278a0c6b94ff89423b9
Commit Graph
1383 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Spitzer Daniel 1fee0b1eef Zeiterfassung update 
* Autoausfüllen -> fertiggestellt
* Überprüfungen Buchungsüberschneidungen ausgebaut
* Abwesenheitskalender Mouseover eingebaut
* Abwesenheiten ohne Ende Update -> Gesundmeldung generiert nun ein Update mit Ende auf die Abwesenheit
 2024-02-22 14:53:48 +01:00
Spitzer Daniel cdbf9de6fe Zeiterfassung update 
* Mails für Antragspflichtige Buchungen
* Mails für Genehmigungen und Ablehnungen
* Korrekturen Update
* Kalender locales hinzugefügt
* Button für autoausfüllen eingebaut

Config update
define("TT_TIMERECORDING_EMAIL","zeiterfassung@xinon.at");
define("TT_TIMERECORDING_EMAIL_NAME","Xinon Zeiterfassung");
 2024-02-19 14:52:58 +01:00
Spitzer Daniel 615fa8d7e6 Zeiterfassung update 
* Mails für Antragspflichtige Buchungen
* Mails für Genehmigungen und Ablehnungen
* Korrekturen Update
* Kalender locales hinzugefügt

Config update
define("TT_TIMERECORDING_EMAIL","zeiterfassung@xinon.at");
define("TT_TIMERECORDING_EMAIL_NAME","Xinon Zeiterfassung");
 2024-02-18 13:37:32 +01:00
Spitzer Daniel 9a74d50cb5 Zeiterfassung update 
* Mails für Antragspflichtige Buchungen
* Mails für Genehmigungen und Ablehnungen
* Korrekturen Update
 2024-02-18 13:31:19 +01:00
Spitzer Daniel d03e31134b Zeiterfassung update 
* Kalender Implementation
* Dienstreise Funktionalitäten
 2024-02-18 11:36:16 +01:00
Frank Schubert 36b3f1e0f8 Merge branch 'fronkdev' into 'master' 
Added robots.txt

See merge request fronk/thetool!251
 2024-02-15 20:57:40 +00:00
Frank Schubert 6527c67d31 Added robots.txt 2024-02-15 21:56:17 +01:00
Frank Schubert 81108f7f35 Merge branch 'fronkdev' into 'master' 
New Preorder cancelling

See merge request fronk/thetool!250
 2024-02-15 19:54:29 +00:00
Frank Schubert dfa8d7ca1d New Preorder cancelling 2024-02-15 20:44:04 +01:00
Frank Schubert 48ee058660 Merge branch 'fronkdev' into 'master' 
Fixed sometimes failing redirect to UserProfile in Router

See merge request fronk/thetool!249
 2024-02-15 14:31:46 +00:00
Frank Schubert 0d62e07d3e Fixed sometimes failing redirect to UserProfile in Router 2024-02-15 15:30:19 +01:00
Frank Schubert d13628f76f Merge branch 'fronkdev' into 'master' 
Added Preordercampaign Admin function updateOaidFromUnit()

See merge request fronk/thetool!248
 2024-02-14 15:31:27 +00:00
Frank Schubert 0c1e248bc7 Added Preordercampaign Admin function updateOaidFromUnit() 2024-02-14 16:30:42 +01:00
Frank Schubert c616e2ab77 Merge branch 'fronkdev' into 'master' 
Added mureck to preorder scripts

See merge request fronk/thetool!247
 2024-02-14 14:36:25 +00:00
Frank Schubert cb5df1783a Added mureck to preorder scripts 2024-02-14 15:35:09 +01:00
Frank Schubert 5d65740330 Fixed Type in translation file 2024-02-14 15:32:18 +01:00
Frank Schubert 8a746386a3 Merge branch 'fronkdev' into 'master' 
AddressDB: visibility / resetFilter button in Preorder/Index / php-qrcode to version 4 in composer.json

See merge request fronk/thetool!246
 2024-02-14 13:01:44 +00:00
Frank Schubert 7ecf8e32e6 Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev 2024-02-14 14:00:47 +01:00
Frank Schubert f5c192a65b Merge branch 'master' into fronkdev 2024-02-14 13:59:41 +01:00
Frank Schubert 2b6df7f96b Merge branch 'master' into 'fronkdev' 
# Conflicts:
#   composer.json
 2024-02-14 12:58:02 +00:00
Frank Schubert 2b5b22d5f0 Fixed composer.json merge conflict 2024-02-14 13:57:17 +01:00
Frank Schubert 5288ff5f1e Fixed php-qrcode to major version 4 in composer.json 2024-02-14 13:50:16 +01:00
Frank Schubert b40e32e6d2 Merge branch 'feature/RaspberryDisplay' into 'master' 
created RasberryDisplay Module

See merge request fronk/thetool!245
 2024-02-14 12:41:35 +00:00
Luca cac0deeccc - fixed getResourcePath in RaspberryDisplay/Index.php 
- fixed php7 compatibility in RaspberryDisplayController.php
 2024-02-14 13:37:17 +01:00
Luca 742a2c1495 - fixed RaspberryDisplay definition 
- added axios library to plugins
- added vue library to plugins
- added tt-frontend-framework for vue with basic documentation
- added git_merge_ts to additionalCSS
- added git_merge_ts to additionalJS
- added property JSGlobals
- refactored RaspberryDisplay Module
 2024-02-14 11:05:52 +01:00
Luca 90b7ce1dd9 added module for managing raspberry displays 2024-02-13 18:54:40 +01:00
Frank Schubert 75453d44af Fixed resetFilter button in Preorder/Index 2024-02-13 16:56:43 +01:00
Frank Schubert 9d5c6a9b4a AddressDB: Added visibility in Form 2024-02-13 16:19:17 +01:00
Frank Schubert 0bc5359277 WIP Contractqueue 2024-02-13 16:18:54 +01:00
Frank Schubert 8bf9e3efa3 Merge branch 'fronkdev' into 'master' 
Fixed order_date

See merge request fronk/thetool!244
 2024-02-12 11:34:07 +00:00
Frank Schubert 3a12056db7 Fixed order_date 2024-02-12 12:33:40 +01:00
Frank Schubert 7021da184c Merge branch 'spidev' into 'master' 
Zeiterfassung update

See merge request fronk/thetool!243
 2024-02-12 11:02:20 +00:00
Spitzer Daniel a0829080fc Zeiterfassung update 2024-02-12 11:59:49 +01:00
Frank Schubert ade4a3e2e5 Merge branch 'spidev' into 'master' 
Spidev

See merge request fronk/thetool!242
 2024-02-12 10:52:54 +00:00
Spitzer Daniel b2d9e855e4 Zeiterfassung update 2024-02-12 11:43:40 +01:00
Spitzer Daniel 2f4e297509 Zeiterfassung update 2024-02-12 11:39:57 +01:00
Spitzer Daniel 808551c04f Zeiterfassung update 2024-02-12 10:55:03 +01:00
Frank Schubert c20b5e325a Merge branch 'fronkdev' into 'master' 
Preorder map: Removed netzgebiet outlines for non-admins

See merge request fronk/thetool!241
 2024-02-09 17:23:48 +00:00
Frank Schubert 4681e5435b Preorder map: Removed netzgebiet outlines for non-admins 2024-02-09 18:23:03 +01:00
Frank Schubert 7df9ce526f Merge branch 'fronkdev' into 'master' 
Added user property to enforce 2fa or not

See merge request fronk/thetool!240
 2024-02-09 17:09:39 +00:00
Frank Schubert fc260c996d Added user property to enforce 2fa or not 2024-02-09 18:09:02 +01:00
Frank Schubert 3d9868f2da Merge branch 'fronkdev' into 'master' 
Importing adb netzgebiet borderpoly

See merge request fronk/thetool!239
 2024-02-09 16:52:49 +00:00
Frank Schubert c8bd553505 Importing adb netzgebiet borderpoly 2024-02-09 17:52:29 +01:00
Frank Schubert dcc6d26b9f Merge branch 'fronkdev' into 'master' 
Added netzgebiet border polygon

See merge request fronk/thetool!238
 2024-02-09 16:52:00 +00:00
Frank Schubert 65c23a30c2 Added netzgebiet border polygon 2024-02-09 17:51:34 +01:00
Frank Schubert ece7ead34d Merge branch 'fronkdev' into 'master' 
Optimizing PreoderController::getFilteredPreorderApi return values

See merge request fronk/thetool!237
 2024-02-09 14:33:15 +00:00
Frank Schubert 4babf202a6 Optimizing PreoderController::getFilteredPreorderApi return values 2024-02-09 15:32:52 +01:00
Frank Schubert 7084b006a0 Merge branch 'fronkdev' into 'master' 
Optimizing PreoderController::getFilteredPreorderApi return values

See merge request fronk/thetool!236
 2024-02-09 14:26:47 +00:00
Frank Schubert 7408d27b3c Optimizing PreoderController::getFilteredPreorderApi return values 2024-02-09 15:26:13 +01:00
Frank Schubert fbae92efee Merge branch 'fronkdev' into 'master' 
Not showing trenches in Preorder Map

See merge request fronk/thetool!235
 2024-02-09 14:19:58 +00:00