Skip to content

Jay frontend backend backup - #23

Open
shivangi2299 wants to merge 57 commits into
Shivangi-Course-Details-Backendfrom
jay-frontend-backend-backup
Open

Jay frontend backend backup#23
shivangi2299 wants to merge 57 commits into
Shivangi-Course-Details-Backendfrom
jay-frontend-backend-backup

Conversation

@shivangi2299

Copy link
Copy Markdown
Collaborator

No description provided.

harshaCorp and others added 30 commits May 6, 2024 12:28
Atif Rental Equipment implementation
…Course-Management-System-Project into jay-frontend-backend

* 'Milestone-2-Backup' of https://github.com/jaypatel0112/Course-Management-System-Project:
  Resolved Conflicts
  Fixed package.info file
  Rename ReadMe.md to README.md
  Update ReadMe.md

# Conflicts:
#	ReadMe.md
#	myappvs/src/main/java/com/CourseManagementSystem/myappvs/rentals/package-info.java
#	myappvs/src/main/resources/import.sql
Merging all recent changes into Main.
jaypatel0112 and others added 27 commits May 30, 2024 15:56
…2/Course-Management-System-Project into jay-frontend-backend

* 'jay-frontend-backend' of https://github.com/jaypatel0112/Course-Management-System-Project:
  Add service layer.
  Added one line to package-info.java
  Adding Rental and UI
  Adding Course Description ,student Accounts and Instrutor component

# Conflicts:
#	myappvs/src/main/resources/import.sql
…se-Management-System-Project into jay-frontend-backend

* 'atif-rentals-2' of https://github.com/jaypatel0112/Course-Management-System-Project:
  updating package-info
  cleanup
  Deleting nonfunctioning unit tests
  Adding unit tests
  Adding logging
  Getting some stability
  Got something working
  New branch so I don't mess everything up
…atel0112/Course-Management-System-Project

* 'jay-frontend-backend-backup' of https://github.com/jaypatel0112/Course-Management-System-Project:
  updating package-info
  cleanup
  Deleting nonfunctioning unit tests
  Adding unit tests
  Adding logging
  Adding Test file for Login and Profile section
  Getting some stability
  Made some changes in frontend.
  Commenting the changes made in event.
  Got something working
  New branch so I don't mess everything up
  Commiting the required properties
  Course Catalog, Course Enrollment, Student Notes Sections completed
…gement-System-Project

* 'Puneeth' of https://github.com/jaypatel0112/Course-Management-System-Project:
  added the unit tests to catalog and enrollments section

# Conflicts:
#	myappvs/src/main/resources/application.properties
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants