Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Group CYBORG Pull Request #22

Open
wants to merge 141 commits into
base: main
Choose a base branch
from
Open

Group CYBORG Pull Request #22

wants to merge 141 commits into from

Conversation

kushraj1204
Copy link

Group CYBORG Pull Request

kushraj1204 and others added 30 commits June 28, 2024 19:28
@kushraj1204
added wireframe
e340449
@kushraj1204
refactored names
02bb3c5
@kushraj1204
configured jwt timing
cfb0ce8
@natboltu
#remove target and .idea from remote
02a1e8c
@anojdev
finished initial part of Model creation
f757f82
@kushraj1204
added dialect in .properties
5950bf3
@kushraj1204
Merge branch 'feature/model-creation' of github.com:kushraj1204/waa-j…
8c7d51b 
…une-2024-project into feature/model-creation
@kushraj1204
refactored names of classes and fixed mapping error
470ccab
@kushraj1204
added missing fetchtype in manytoone
d5965ab
@kushraj1204
added necessary constraints in the entity
9ddb11d
@kushraj1204
added fields in moderationreport
dd82995
@natboltu
#refactoring packages, fix auditdata and password encoding
e15788b
@natboltu
Merge pull request #3 from kushraj1204/feature/model-creation
e0736ba 
Feature/model creation
@kushraj1204
changed endpoint names
df8880b
@kushraj1204
seed data added
2bec0a1
@anojdev
Completed Category CRUD operation
be49525
@kushraj1204
added user signup, user profile update and student crud features
6e07f8a
@natboltu
#event management basic crud operation
2d9ee95
@anojdev
Merge pull request #5 from kushraj1204/feature/user-signup-profile
0bd0bdb 
User signup, user profile update and student crud features added.
@anojdev
Merge pull request #6 from kushraj1204/#event-crud
c41839c 
#event management basic crud operation
@natboltu
#sync with main
a906e48
@natboltu
Merge pull request #4 from kushraj1204/feature/thread-category
73bd17f 
Completed Category CRUD operation
@kushraj1204
added resource crud
908f897
@kushraj1204
...
b48e235
@natboltu
#event rsvp for user
057a20b
@anojdev
Completed Survey and added @EqualsAndHashCode(callSuper = true) in ev…
e59e967 
…ery Entity
@kushraj1204
added resource crud and resource files upload feature
409f63f
@kushraj1204
Merge pull request #8 from kushraj1204/feature/survey
bb0e6e3 
Completed Survey and added @EqualsAndHashCode(callSuper = true) in all entity
@anojdev
Merge pull request #7 from kushraj1204/#event-rsvp
dcf4dd3 
#event rsvp for user
@kushraj1204
added file download,upload and http resource rendering for file resou…
1545122 
…rces
kushraj1204 and others added 30 commits July 17, 2024 16:48
@kushraj1204
create resource added
2067a93
@anojdev
Merge branch 'feature/shared-resource-ui' of https://github.com/kushr…
84b68d8 
…aj1204/waa-june-2024-project into feature/survey-ui
@anojdev
Survey Popup
b194cc9
@anojdev
Create/Update/Deleted added on ApiActions
78c8e20
@anojdev
Added Confirm Delete Modal form Survey, added edit/delete actions
783f7b8
@natboltu
events page
dfdcebc
@natboltu
Merge pull request #26 from kushraj1204/event-page
2a4b193 
events page
@natboltu
attendes page
0c48ccd
@natboltu
Merge pull request #27 from kushraj1204/event-page
0939449 
attendes page
@kushraj1204
merged with main
12c8cbf
@anojdev
Fixed delete part of survey
074e5d9
@anojdev
Merge branch 'main' of https://github.com/kushraj1204/waa-june-2024-p…
e6631e6 
…roject into feature/survey-ui
@anojdev
Merge pull request #28 from kushraj1204/feature/survey-ui
349c433 
Feature/survey UI
@anojdev
Completed survey update part
3cdca4d
@anojdev
Merge branch 'main' of https://github.com/kushraj1204/waa-june-2024-p…
cd62e66 
…roject into feature/survey-ui
@anojdev
completed Category
237bbf9
@anojdev
Merge pull request #29 from kushraj1204/feature/survey-ui
8464bf1 
Feature/survey UI
@natboltu
event attendee dialog page
6b65a36
@natboltu
Merge pull request #30 from kushraj1204/event-page
f2d5abb 
event attendee dialog page
@anojdev
Created a Popup for Survey Question
a19ddb4
@kushraj1204
fixed profile update issue for new user
21ceda0
@anojdev
surveyQuestion
fd4eba0
@anojdev
Merge branch 'main' of https://github.com/kushraj1204/waa-june-2024-p…
6f62aa0 
…roject into feature/survey-ui
@anojdev
Completed SurveyQuestion
f356148
@anojdev
Merge pull request #31 from kushraj1204/feature/survey-ui
7abaa8d 
Feature/survey UI
@anojdev
Removed hardcoded value
3b89ab8
@anojdev
Merge pull request #32 from kushraj1204/feature/survey-ui
d979908 
Removed hardcoded value
@kushraj1204
resource individual load issue fixed
0ad39d8
@anojdev
Fixed minor issue
cba7fa4
@anojdev
Merge pull request #33 from kushraj1204/feature/survey-ui
69cf137 
Fixed minor issue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kushraj1204 @natboltu @anojdev @pejoccy