Skip to content

Commit

Permalink
test into main 2.25.00-muc16 (#671)
Browse files Browse the repository at this point in the history 
* feat(ZMS-3141): optimize user list page

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): refactoring

* feat(ZMS-3141): fix test

* fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#622)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#631)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* ZMS-2970: fully load for the appointment form

* ZMS-2970: fully load for the appointment form

* feat(ZMS-2528): multilanguage ticketprinter

* feat(ZMS-2528): revert unwanted changes

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* fix(ZMS-3112): fix custom field validation

* fix(ZMS-3112): fix tests

* fix(ZMS-3112): fix validation

* fix(deps): update dependency league/csv to v9.17.0 (#634)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency firebase/php-jwt to v6.10.1 (#620)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648)

* ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt

* feat(ZMS-2778): Monitor logged in sessions by scope and department (#651)

* feat(ZMS-2778): Add three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Add token session duration to expiry.

* feat(ZMS-2778): Add to expiry to user table.

* feat(ZMS-2778): Change status query and fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey

* feat(ZMS-2215): Merge user-search-in-user-list into next (#645)

* feat(ZMS-2215): Global user search working

* Feat(ZMS-2215): Cleanup twig stuff

* feat(ZMS-2215): User search for department admin working

* feat(ZMS-2215): Add view users by role

* feat(ZMS-2215): set user rights view by role

* feat(ZMS-2215): fix up api rights and major cleanup

* feat(ZMS-2215): grammar in twig

* feat(ZMS-2215): fix unit test

* feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig

* feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig

* feat(ZMS-2215): Update UseraccountSearch.php

* feat(ZMS-2215): Update Useraccount.php

* feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list

* feat(ZMS-2215): cleanup some

* feat(ZMS-2215): re-enable twig cache

* feat(ZMS-2215): sneak in one more improvement

* feat(ZMS-2215): sneak in one more improvement

* fix(ZMS-2215): Fix unit test after next update

* feat(ZMS-2215): Add department id visibility for superusers

---------

Co-authored-by: Thomas Fink <[email protected]>

* feat(ZMS-2563): optimization (#654)

* Next into test (#657)

* feat(ZMS-3141): optimize user list page

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): refactoring

* feat(ZMS-3141): fix test

* fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#622)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#631)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* ZMS-2970: fully load for the appointment form

* ZMS-2970: fully load for the appointment form

* feat(ZMS-2528): multilanguage ticketprinter

* feat(ZMS-2528): revert unwanted changes

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* fix(ZMS-3112): fix custom field validation

* fix(ZMS-3112): fix tests

* fix(ZMS-3112): fix validation

* fix(deps): update dependency league/csv to v9.17.0 (#634)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency firebase/php-jwt to v6.10.1 (#620)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648)

* ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt

* feat(ZMS-2778): Monitor logged in sessions by scope and department (#651)

* feat(ZMS-2778): Add three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Add token session duration to expiry.

* feat(ZMS-2778): Add to expiry to user table.

* feat(ZMS-2778): Change status query and fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey

* feat(ZMS-2215): Merge user-search-in-user-list into next (#645)

* feat(ZMS-2215): Global user search working

* Feat(ZMS-2215): Cleanup twig stuff

* feat(ZMS-2215): User search for department admin working

* feat(ZMS-2215): Add view users by role

* feat(ZMS-2215): set user rights view by role

* feat(ZMS-2215): fix up api rights and major cleanup

* feat(ZMS-2215): grammar in twig

* feat(ZMS-2215): fix unit test

* feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig

* feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig

* feat(ZMS-2215): Update UseraccountSearch.php

* feat(ZMS-2215): Update Useraccount.php

* feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list

* feat(ZMS-2215): cleanup some

* feat(ZMS-2215): re-enable twig cache

* feat(ZMS-2215): sneak in one more improvement

* feat(ZMS-2215): sneak in one more improvement

* fix(ZMS-2215): Fix unit test after next update

* feat(ZMS-2215): Add department id visibility for superusers

---------

Co-authored-by: Thomas Fink <[email protected]>

* feat(ZMS-2563): optimization (#654)

---------

Co-authored-by: Igor Manjencic <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: mohamad.daaeboul <[email protected]>
Co-authored-by: Fabian Weiß <[email protected]>
Co-authored-by: MoDaae <[email protected]>
Co-authored-by: Thomas Fink <[email protected]>

* fix(ZMS-2215) Fix spelling

* Next into test correct spelling (#658)

* feat(ZMS-3141): optimize user list page

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): refactoring

* feat(ZMS-3141): fix test

* fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#622)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#631)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* ZMS-2970: fully load for the appointment form

* ZMS-2970: fully load for the appointment form

* feat(ZMS-2528): multilanguage ticketprinter

* feat(ZMS-2528): revert unwanted changes

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* fix(ZMS-3112): fix custom field validation

* fix(ZMS-3112): fix tests

* fix(ZMS-3112): fix validation

* fix(deps): update dependency league/csv to v9.17.0 (#634)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency firebase/php-jwt to v6.10.1 (#620)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648)

* ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt

* feat(ZMS-2778): Monitor logged in sessions by scope and department (#651)

* feat(ZMS-2778): Add three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Add token session duration to expiry.

* feat(ZMS-2778): Add to expiry to user table.

* feat(ZMS-2778): Change status query and fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey

* feat(ZMS-2215): Merge user-search-in-user-list into next (#645)

* feat(ZMS-2215): Global user search working

* Feat(ZMS-2215): Cleanup twig stuff

* feat(ZMS-2215): User search for department admin working

* feat(ZMS-2215): Add view users by role

* feat(ZMS-2215): set user rights view by role

* feat(ZMS-2215): fix up api rights and major cleanup

* feat(ZMS-2215): grammar in twig

* feat(ZMS-2215): fix unit test

* feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig

* feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig

* feat(ZMS-2215): Update UseraccountSearch.php

* feat(ZMS-2215): Update Useraccount.php

* feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list

* feat(ZMS-2215): cleanup some

* feat(ZMS-2215): re-enable twig cache

* feat(ZMS-2215): sneak in one more improvement

* feat(ZMS-2215): sneak in one more improvement

* fix(ZMS-2215): Fix unit test after next update

* feat(ZMS-2215): Add department id visibility for superusers

---------

Co-authored-by: Thomas Fink <[email protected]>

* feat(ZMS-2563): optimization (#654)

* fix(ZMS-2215) Fix spelling

---------

Co-authored-by: Igor Manjencic <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: mohamad.daaeboul <[email protected]>
Co-authored-by: Fabian Weiß <[email protected]>
Co-authored-by: MoDaae <[email protected]>
Co-authored-by: Thomas Fink <[email protected]>

* fix(ZMS): improve user department selection

* Next into test (#663)

* feat(ZMS-3141): optimize user list page

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix test

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): fix tests

* feat(ZMS-3141): refactoring

* feat(ZMS-3141): fix test

* fix(deps): update dependency phpmailer/phpmailer to v6.9.2 (#623)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#622)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#630)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency league/csv to v9.17.0 (#631)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* ZMS-2970: fully load for the appointment form

* ZMS-2970: fully load for the appointment form

* feat(ZMS-2528): multilanguage ticketprinter

* feat(ZMS-2528): revert unwanted changes

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* feat(ZMS-2528): fix tests

* fix(ZMS-3112): fix custom field validation

* fix(ZMS-3112): fix tests

* fix(ZMS-3112): fix validation

* fix(deps): update dependency league/csv to v9.17.0 (#634)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency firebase/php-jwt to v6.10.1 (#620)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat(ZMS-3213): add sortByCallTime function for queueList sorting (#648)

* ZMS-1802 Template-anpassungen, Für den status 'deleted' werden die Links in der Warteschlange entfernt und die Buttons fürs Bearbeiten und Löschen werden auch entfernt

* feat(ZMS-2778): Monitor logged in sessions by scope and department (#651)

* feat(ZMS-2778): Add three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Update three queries to status to monitor active sessions

* feat(ZMS-2778): Add token session duration to expiry.

* feat(ZMS-2778): Add to expiry to user table.

* feat(ZMS-2778): Change status query and fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Fix tests

* feat(ZMS-2778): Add update sessionExpiry to updateEntityAuthkey

* feat(ZMS-2215): Merge user-search-in-user-list into next (#645)

* feat(ZMS-2215): Global user search working

* Feat(ZMS-2215): Cleanup twig stuff

* feat(ZMS-2215): User search for department admin working

* feat(ZMS-2215): Add view users by role

* feat(ZMS-2215): set user rights view by role

* feat(ZMS-2215): fix up api rights and major cleanup

* feat(ZMS-2215): grammar in twig

* feat(ZMS-2215): fix unit test

* feat(ZMS-2215): Rename userAccountSearch.twig to useraccountSearch.twig

* feat(ZMS-2215): Rename userAccountSearchResults.twig to useraccountSearchResults.twig

* feat(ZMS-2215): Update UseraccountSearch.php

* feat(ZMS-2215): Update Useraccount.php

* feat(ZMS-2215): merge next into feature-zms-2215-user-search-in-user-list

* feat(ZMS-2215): cleanup some

* feat(ZMS-2215): re-enable twig cache

* feat(ZMS-2215): sneak in one more improvement

* feat(ZMS-2215): sneak in one more improvement

* fix(ZMS-2215): Fix unit test after next update

* feat(ZMS-2215): Add department id visibility for superusers

---------

Co-authored-by: Thomas Fink <[email protected]>

* feat(ZMS-2563): optimization (#654)

* fix(ZMS-2215) Fix spelling

* fix(ZMS): improve user department selection

---------

Co-authored-by: Igor Manjencic <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: mohamad.daaeboul <[email protected]>
Co-authored-by: Fabian Weiß <[email protected]>
Co-authored-by: MoDaae <[email protected]>
Co-authored-by: Thomas Fink <[email protected]>

* feat(ZMS-2528): fix buttons translations

* fix(ZMS-2215): Spelling

* fix(ZMS-2215): Spelling

* feat(ZMS-2528): fix buttons translations

---------

Co-authored-by: Igor Manjencic <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: mohamad.daaeboul <[email protected]>
Co-authored-by: Fabian Weiß <[email protected]>
Co-authored-by: MoDaae <[email protected]>
Co-authored-by: Thomas Fink <[email protected]>
  • Loading branch information
@ThomasAFink @manjencic
@renovate @MoDaae @Fabinatix97
7 people authored Nov 4, 2024
1 parent c1dc22b commit 2ec93cd
Show file tree
Hide file tree
Showing 84 changed files with 1,837 additions and 842 deletions.
2 changes: 1 addition & 1 deletion .ddev/.env.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ MYSQL_USER=db
MYSQL_PASSWORD=db

# xdebug
PHP_IDE_CONFIG="serverName=zms.ddev.site"
PHP_IDE_CONFIG="serverName=zms.ddev.site"
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.idea/
.ddev/.env
.ddev/.env.template
/local/
.DS_Store
.vscode/launch.json
Expand Down
Loading

0 comments on commit 2ec93cd

Please sign in to comment.