Changeset af4f801 for iknow-api/Models

Timestamp:

09/14/26 21:15:01 (10 days ago)

Author:

Stefan-Saveski <stefansaveski19@…>

Branches:

master

Children:

10009b9

Parents:

c72ed3b (diff), 4b35197 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/Dev'

# Conflicts:
# iknow-api/Controllers/AuthController.cs
# iknow-api/DTOs/RefreshTokenDTO.cs
# iknow-api/DTOs/UserDTO.cs
# iknow-api/Data/AppDbContext.cs
# iknow-api/Migrations/AppDbContextModelSnapshot.cs
# iknow-api/Models/RefreshToken.cs
# iknow-api/Models/User.cs
# iknow-api/Program.cs
# iknow-api/Repository/Implementations/UserRepository.cs
# iknow-api/Repository/Interface/IUserRepository.cs
# iknow-api/Services/Implementations/AuthService.cs
# iknow-api/Services/Interfaces/IAuthService.cs
# iknow-api/appsettings.Development.json
# iknow-api/appsettings.json

Location:

iknow-api/Models

Files:

• ActiveSemester.cs (added)
• ContactInfo.cs (added)
• DependencySubject.cs (added)
• Documents.cs (added)
• EnrolledSemesters.cs (added)
• EnrollmentInfo.cs (added)
• HighSchool.cs (added)
• Major.cs (added)
• MajorSubjects.cs (added)
• PassedSubject.cs (added)
• Payment.cs (added)
• ProfessorSubjects.cs (added)
• RefreshToken.cs (added)
• SemesterSubjects.cs (added)
• Subjects.cs (added)
• User.cs (added)
• UserDocuments.cs (added)