Skip to content

Css updates #231

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

Closed
lucywalt wants to merge 93 commits into from
Closed

Css updates #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
405918e
team id passed from home page to team tasks page, print out team memb…
ivonanicetin Mar 22, 2025
858d020
Implemented getTeamTasks service method and controller method. Added …
taoTimTim Mar 24, 2025
1069493
Implemented frontend API endpoint and new test. Updated API documenta…
taoTimTim Mar 24, 2025
192ded1
Updated API documentation and fixed formatting issues.
taoTimTim Mar 24, 2025
e87aa01
Made the team lead get added as a member of a team when the team is c…
taoTimTim Mar 24, 2025
46c5b46
Impleneted mass assign to task method. Implemented tests, all are pas…
taoTimTim Mar 24, 2025
21e8290
Implemented frontend API endpoint and test for the massAssignToTask. …
taoTimTim Mar 24, 2025
e57ba6f
Merge remote-tracking branch 'origin/main' into get-teamtasks-api
taoTimTim Mar 24, 2025
35a392a
Merge remote-tracking branch 'origin/main' into mass-addToTask-api
taoTimTim Mar 24, 2025
90b0c2a
Refactored common service test imports and methods
LucasSlunt Mar 26, 2025
ee4c46a
Removed unnecessary dependencies and added timmi fix to test
LucasSlunt Mar 26, 2025
5b83687
Refactored Repository tests
LucasSlunt Mar 26, 2025
b156277
Fixing tests and TaskDTO fields to have the task priority.
taoTimTim Mar 26, 2025
93206fe
Merge pull request #195 from LucasSlunt/get-teamtasks-api
ivonanicetin Mar 26, 2025
a4636fe
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
ivonanicetin Mar 26, 2025
266ac4c
connected table to api
ivonanicetin Mar 26, 2025
829d5a8
connected completed task table
ivonanicetin Mar 26, 2025
f2c2dbb
Merge pull request #197 from LucasSlunt/mass-addToTask-api
JamesBirni Mar 26, 2025
ebdc969
Merge remote-tracking branch 'origin/main' into ismemberof-teamlead-t…
taoTimTim Mar 26, 2025
f7684b8
added api call
JamesBirni Mar 26, 2025
7b4f502
added priority
ivonanicetin Mar 26, 2025
f8e9ec4
Merge pull request #196 from LucasSlunt/ismemberof-teamlead-teamcreation
LucasSlunt Mar 26, 2025
7815545
Set JavaCI to run on prs
LucasSlunt Mar 26, 2025
37faa40
added isLocked column functionality
ivonanicetin Mar 26, 2025
0f6e923
Merge remote-tracking branch 'origin/main' into roles-getTeamMembers-api
taoTimTim Mar 26, 2025
205647a
removed assertTrue for saved notification time as hibernate was too fast
LucasSlunt Mar 26, 2025
5dce141
Adding whether the team member is the teamLead or not.
taoTimTim Mar 26, 2025
a81e83b
connected tasks table in home page to api
ivonanicetin Mar 26, 2025
0c468b3
Refactored Entity Tests
LucasSlunt Mar 26, 2025
170d776
Refactored Test Helper classes into their own folder
LucasSlunt Mar 26, 2025
d0e0efc
api delete
JamesBirni Mar 26, 2025
cfa1c2b
Updating tests to use TeamMemberInTeamDTO, which returns a boolean of…
taoTimTim Mar 26, 2025
4b27a06
Updating API documentation to include the isTeamLead field.
taoTimTim Mar 26, 2025
820a79d
fixed filtering issue
ivonanicetin Mar 26, 2025
4b0c41b
Added error correcting as well as fixed the bug caused by the enums
JamesBirni Mar 26, 2025
b4be132
Merge pull request #199 from LucasSlunt/teamTasks-to-api
JamesBirni Mar 26, 2025
28d26bb
fixed filtering issue
ivonanicetin Mar 26, 2025
6ff4645
Merge pull request #201 from LucasSlunt/home-table-to-api
JamesBirni Mar 26, 2025
9ea8d49
Fixed typo
JamesBirni Mar 26, 2025
e1b9c4e
Merge pull request #206 from LucasSlunt/Create-Task-Bug
taoTimTim Mar 26, 2025
f007a77
Fixing relationship between notification and team member to be bidire…
taoTimTim Mar 26, 2025
4fab42a
Merge pull request #208 from LucasSlunt/backend-delete-api-bug
JamesBirni Mar 26, 2025
6122d93
added change roles
JamesBirni Mar 26, 2025
f0f51b5
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
JamesBirni Mar 26, 2025
1368ed5
Merge branch 'main' into Backend-Test-Refactor-2
LucasSlunt Mar 26, 2025
27849b9
Manually creating new IsAssigned and IsMemberOf relationships, so mak…
taoTimTim Mar 26, 2025
88d4ae1
added completed task table in mytasks
ivonanicetin Mar 26, 2025
7fdf992
fixed completed task table in teamtasks
ivonanicetin Mar 26, 2025
7e5fd75
Adding notifications to changing a role.
taoTimTim Mar 26, 2025
732a933
Merge pull request #211 from LucasSlunt/fixing-change-role-bug
JamesBirni Mar 26, 2025
3e281bd
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
JamesBirni Mar 26, 2025
8d07f99
added id to table
JamesBirni Mar 26, 2025
67d2193
Fixing issue where admin would not delet. Added debug API methods, al…
taoTimTim Mar 26, 2025
150a661
Merge remote-tracking branch 'origin/main' into refactoring-api-routes
taoTimTim Mar 26, 2025
fdf2c7b
Merge pull request #213 from LucasSlunt/fixing-delete-admin
JamesBirni Mar 27, 2025
008edee
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
JamesBirni Mar 27, 2025
24cf031
Fixed chanegRole method. Now all members that are promoted/demoted ge…
taoTimTim Mar 27, 2025
657c0e4
Changes to AdminService to get changeRole working.
taoTimTim Mar 27, 2025
3195f4a
Fixing deleteTask to delete all notifications regarding the task AND …
taoTimTim Mar 27, 2025
5d81228
Tests for the new repository methods.
taoTimTim Mar 27, 2025
ca0506b
Fixing getAllTeams method so if the teamLead is null it prints -1, in…
taoTimTim Mar 27, 2025
0bd9787
Merge pull request #212 from LucasSlunt/myTasks-completeTasks
JamesBirni Mar 28, 2025
3fde6c1
Merge pull request #214 from LucasSlunt/fixing-change-role
JamesBirni Mar 28, 2025
57af35b
Merge remote-tracking branch 'origin/main' into fix-failing-api
taoTimTim Mar 28, 2025
9dca4c0
Merge pull request #215 from LucasSlunt/fix-failing-api
JamesBirni Mar 28, 2025
96a39ca
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
JamesBirni Mar 28, 2025
a9c3a19
Making teamLead allowed to be null.
taoTimTim Mar 28, 2025
522c1ba
Merge pull request #202 from LucasSlunt/roles-getTeamMembers-api
JamesBirni Mar 28, 2025
96cc4f9
Merge branch 'main' into Backend-Test-Refactor-2
LucasSlunt Mar 28, 2025
08ff8ac
refactored new changes from main
LucasSlunt Mar 28, 2025
3304cd1
changed service to throw when error added change password
JamesBirni Mar 28, 2025
07a67c9
fixed tests
JamesBirni Mar 28, 2025
65ae022
Made new test run with refactor
LucasSlunt Mar 28, 2025
1e65c27
commented out test that fails in main
LucasSlunt Mar 28, 2025
6845d57
fixed allowed roles
JamesBirni Mar 28, 2025
7f77b63
Merge pull request #216 from LucasSlunt/User-Change-Password
taoTimTim Mar 28, 2025
1431e32
Making changeRole recreate the memberships and assignments the origin…
taoTimTim Mar 28, 2025
7a7e6f2
Merge pull request #221 from LucasSlunt/change-role-api-fix
JamesBirni Mar 28, 2025
a1c4153
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
JamesBirni Mar 28, 2025
3083f10
Ensuring the memberships and tasks are being saved to database.
taoTimTim Mar 28, 2025
f9d6308
Removing extra saves.
taoTimTim Mar 28, 2025
570cb00
Merge pull request #222 from LucasSlunt/change-role
JamesBirni Mar 28, 2025
4d63b1c
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
JamesBirni Mar 28, 2025
b268dcc
Allowing team emmebrs to be returned for a team when teamLead if null.
taoTimTim Mar 28, 2025
0539ee0
Merge pull request #223 from LucasSlunt/team-members-get-api
JamesBirni Mar 28, 2025
2e17bb4
Merge branch 'main' of https://github.com/LucasSlunt/COSC310_GroupPro…
JamesBirni Mar 28, 2025
88d1524
Styling plus made admin panel work
JamesBirni Mar 28, 2025
723b83f
Calibri main font
JamesBirni Mar 28, 2025
6783497
just some basic chores
JamesBirni Mar 28, 2025
aea73ad
Merge pull request #228 from LucasSlunt/All-User-Table-API-Connection
taoTimTim Mar 28, 2025
321804d
added edit user details
JamesBirni Mar 28, 2025
64e153e
Merge pull request #229 from LucasSlunt/Add-Edit-User-To-User-Table
taoTimTim Mar 28, 2025
6a44433
Merge pull request #200 from LucasSlunt/Backend-Test-Refactor-2
JamesBirni Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/JavaCI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches:
- main
- Github-Secrets-Injecting
pull_request:

jobs:
build:
Expand Down
Loading
Loading