develop #28

blaerf · 2025-12-17T14:13:32Z

blaerf commented

2025-12-17 14:13:32 +00:00

No description provided.

blaerf added 82 commits 2025-12-17 14:13:33 +00:00

hinweis eingefügt 6c67d6437e

hinweis eingefügt 195f19a6f2

hinweis eingefügt b82d16a064

hinweis eingefügt dc75190642

hinweis eingefügt 5acc6d93c9

hinweis eingefügt 6ad293ee4f

Layout modularisiert 7f7cab75e5

Pfade angepasst 77ac0577e2

Pfade angepasst 8cd07a73a0

Layout modularisiert 905ce67742

Layout modularisiert f68db3ab1e

Merge branch 'feature/UI-Update' into develop ab296ad0dc

# Conflicts:
#	public/views/login.php

Dateien gelöscht 28be78dceb

Dateien gelöscht (#7 ) cfcc8f2d0c

Co-authored-by: blaerf <blaerf@gmx.de>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/7

Text geändert d1bafa28d9

Pfad form action geändert 3eac9a659e

LAyout aufgeräumt bdd79a66cb

feature/UI-Update (#8 ) bef54a7553

Co-authored-by: blaerf <blaerf@gmx.de>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/8

sidebar, topbar ausblenden wenn nicht angemeldet 2637715e48

sidebar, topbar ausblenden wenn nicht angemeldet 191666736b

Merge branch 'feature/UI-Update' into develop bde7b7c7ce

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Merge remote-tracking branch 'origin/develop' into develop d013b6cb8a

# Conflicts:
#	public/views/layout.php

sidebar, topbar ausblenden wenn nicht angemeldet (#10 ) bce1a0c719

Co-authored-by: blaerf <blaerf@gmx.de>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/10

feature/UI-Update (#11 ) daba87e48f

Co-authored-by: blaerf <blaerf@gmx.de>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/11

feature/UI-Update (#12 ) f9f9b1f99b

Co-authored-by: blaerf <blaerf@gmx.de>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/12

snmp_update2 (#14 ) e82c2c041a

Co-authored-by: Tom <165781231+GraegelTh@users.noreply.github.com>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/14

Table-Tags aktualisiert e0cd5591c5

Logging-Service hinzugefügt 91d2821034

Kommentare angepasst 21c63b9d6c

feature/logging_Service (#17 ) 9a8d90a6db

Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/17
Co-authored-by: blaerf <blaerf@gmx.de>
Co-committed-by: blaerf <blaerf@gmx.de>

LDAP Connection URI angepasst 300719244e

Merge branch 'develop' into feature/logging_Service 434b090b08

feature/logging_Service (#18 ) c194f80f45

Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/18

LDAP Connection URI angepasst 50d53b4183

Merge branch 'feature/logging_Service' into develop 3c2c6d6c6f

# Conflicts:
#	app/Services/Ldap/LdapConnectionHelper.php

LDAP Connection URI angepasst (#21 ) 4127323530

Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/21

feature/logging_Service (#22 ) 656093ce01

Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/22

feature/logging_Service (#23 ) 50e5d82fa3

Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/23

Merge main into develop and resolve conflicts for logging integration bbdbb0e187

Dokumentation erstellt ee5ce6b5bd

Update der Api mit Snmpwalk (#26 ) 20b626651f

Umstellung des Snmpwalk damit die Werte auf dem Liveserver funktionieren

Co-authored-by: GraegelTh <165781231+GraegelTh@users.noreply.github.com>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/26

snmp_update3 (#27 ) 1a5875816c

Hostname wurde gefixt

Co-authored-by: GraegelTh <165781231+GraegelTh@users.noreply.github.com>
Reviewed-on: https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt/pulls/27

Test um User im AD anzulegen mit PS Skripts cdbdb2df3b

deleted html file and moved one folder 376f6ad13f

revert 376f6ad13f d6baaad963

revert deleted html file and moved one folder

revert cdbdb2df3b 6060a5134b

revert Test um User im AD anzulegen mit PS Skripts

Changed User-Import, added User Search and manuel user add f2a09c9c7d

revert f2a09c9c7d 78901adae1

revert Changed User-Import, added User Search and manuel user add

createuser with preview for csv import 44b2c02d35

implemented into the sidebar 48afb5d0c8

test to integrate users 75828d8263

possible fix for user creation f793973571

logging for error messages when creating users 2fd2bb3630

ttrying to fix csv import and user creation per csv 9bc6b8d701

config/config.php aktualisiert 69182e5378

Inserted default OU

public/api/create_user.php aktualisiert a3bee1815f

Inserted default OU

public/api/create_users_csv.php aktualisiert 15e1be8db1

Inserted default OU

scripts/powershell/create_users_csv.ps1 aktualisiert 02766e1bf9

Inserted default OU

farben angepasst 5ba162994e

css design geändert d6f42af919

sah beschissen aus, nochmal geändert 89371dc60f

schriftfarbe angepasst 928280176c

änderungen wurden nicht angenommen, nochmal angepasst 08fbfc8814

datenträger + system uptime farben angepasst 8456e21b28

PHP Dokumentation aktualisiert eff871ca37

removed the ou from usercreation because they only should be created in the correct OU for our webservice 532f76a754

test to see if the ou is also removed from the csv import 59e9975b22

added password validation and a hint to also use the correct password and format d350130dba

test if the csv also gets correctly tested now 531fc8e741

csv should now be checked when pressing the "csv verarbeiten" button 0c1399d583

added a hint to the "vorschau laden" button that the csv gets reset to its original state when rpessing 99c581cec2

moved the hint below the button ba47487abf

corrected the hint text 1d53016df7

another hint update 4b749744de

slight layout change to arrange the buttons better 679354006f

revert 679354006f 7765ef1b60

revert slight layout change to arrange the buttons better

updated the layout for the button so that they line up 4dcebe7007

Merge branch 'develop' of https://git.eckertplayground.de/taarly/PHP_AdminTool_Projekt into develop d650b78d25

layout update and cleaned up merge conflicts ff329d8012

updated the size of the "in vorschau laden" button d817f096bc

Log-Viewer hinzugefügt 9d3983060d

Log-Viewer hinzugefügt 6af2aab851

blaerf added 1 commit 2025-12-17 14:27:01 +00:00

Merge remote-tracking branch 'origin/main' into develop cf1298532b

blaerf merged commit 9f0e534e20 into main

2025-12-17 14:28:04 +00:00

blaerf referenced this issue from a commit

2025-12-17 14:28:06 +00:00

develop (#28)

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: taarly/PHP_AdminTool_Projekt#28