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

- #31

Merged
merged 43 commits into from
Apr 3, 2024
Merged

- #31

merged 43 commits into from
Apr 3, 2024

Conversation

NotMash
Copy link
Owner

@NotMash NotMash commented Apr 3, 2024

Luke Liew Mouawad and others added 30 commits April 1, 2024 16:46
redesigning the line manager search
606e77b
Merge branch 'main' into luke_front_end_new
5809843
fetch data from endpoint for timesheet viewing
937a8ae
view timesheet page now displays data for days in the table
cf163ed
@krish2903
Finished create timesheet page
3ae8668
@delterr
started on weekly approvals, added consultant and line manager names …
34f9f1a 
…to payload
@delterr
fix typo
34aeb20
line manager consultant search page changes
6b58afe
Merge branch 'main' into luke_front_end_new
b9f8f44
@delterr
nother bug fix lol
7b4835a
Merge branch 'main' into luke_front_end_new
b020383
view timesheet page now displays all info (excluding hourly rate)
8851854
Finance team page
a50c035
financeteampage
7c2e573
Merge branch 'main' into luke_front_end_new
7d69226
fix
3b5b749
@Nameless7s3
Merge pull request #21 from NotMash/luke_front_end_new
3fdd53b 
Luke front end new
@Nameless7s3
Merge pull request #20 from NotMash/krish_backend
5e1efb4 
Finished Create Timesheet Page Frontend
made a responsive nav bar for user pages
dc27d3d
added nav bar to every single page
49e475c
@Nameless7s3
Merge branch 'main' into luke_front_end_new
dd42711
@Nameless7s3
Merge pull request #22 from NotMash/luke_front_end_new
a19b76c 
Added nav bar
merged krish's changes with mine and fixed some stuff
56532c6
Merge branch 'luke_front_end_new' of https://github.com/NotMash/SWE-T…
e3ce074 
…IMESHEET into luke_front_end_new
@Nameless7s3
Merge pull request #23 from NotMash/luke_front_end_new
1a4affc 
Merged Krish's changes and fixed some css issues
bug fixes with line manager page
e121e1f
@delterr
added endpoint for listing consultants
2eaaf17
@delterr
Merge branch 'main' of https://github.com/NotMash/SWE-TIMESHEET into …
3c06062 
…main
@krish2903
Merge pull request #24 from NotMash/main
f53a357 
latest v
@delterr
update update
9011ce8
Luke Liew Mouawad and others added 13 commits April 3, 2024 18:19
cleaned up line manager search page and added login button to navbar
366f468
@NotMash
Merge pull request #25 from NotMash/ibrahim_finalV1
068447f 
Ibrahim final v1
@NotMash
Merge pull request #26 from NotMash/ibrahim_finalV1
9398115 
fixed creating a consultant
connecting line manager search to backend
eae6c3f
@krish2903
Set Hourly Page and User Creation Update
d2ed3b5
@krish2903
Merge branch 'main' into krish_backend
3b0ceed
@Nameless7s3
Merge pull request #27 from NotMash/krish_backend
6514c84 
updates
Merge branch 'main' into luke_front_end_new
4b05754
fixed bug with consultant not being able to be created
90cdfbd
@Nameless7s3
Merge pull request #29 from NotMash/luke_front_end_new
6f2084e 
fixed consultant not being able to be created bug
logout button positioning fixes
446768f
some design fixes
3b0484e
@Nameless7s3
Merge pull request #30 from NotMash/luke_front_end_new
2be9780 
Luke front end new
@NotMash NotMash merged commit 7a82e05 into ibrahim_finalV1 Apr 3, 2024
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
@NotMash @krish2903 @delterr @Nameless7s3