Taehee Choi
|
7e97501269
|
minor fixes
|
2022-03-30 04:24:01 -07:00 |
|
cth0604
|
667886224c
|
Merge pull request #60 from CPSC319-Winter-term-2/various-fixes
linter fix
|
2022-03-30 04:12:55 -07:00 |
|
cth0604
|
9b0b2a20ba
|
Merge branch 'main' into various-fixes
|
2022-03-30 04:12:45 -07:00 |
|
Taehee Choi
|
29a47707d7
|
linter fix
|
2022-03-30 04:02:48 -07:00 |
|
Mathew Balsdon
|
8c51821f6e
|
Merge pull request #59 from CPSC319-Winter-term-2/mbalsdon-add-favs-notif
popup when someone adds favourite from sidebar
|
2022-03-30 01:57:23 -07:00 |
|
mbalsdon
|
d353da7e2a
|
implement notification that pops up when users add someone to their favourites from sidebar
|
2022-03-30 01:54:10 -07:00 |
|
Mathew Balsdon
|
9253170755
|
Merge pull request #57 from CPSC319-Winter-term-2/mbalsdon-meeting-modal-touchups
add functionality to modal; change styling
|
2022-03-30 01:21:38 -07:00 |
|
mbalsdon
|
f1110f07b7
|
add functionality to modal; change styling
|
2022-03-30 01:19:55 -07:00 |
|
Mathew Balsdon
|
981480d30d
|
Merge pull request #56 from CPSC319-Winter-term-2/mbalsdon-contacts-touchups
change contactspage styling
also fixes some minor spacing issues
|
2022-03-30 00:06:03 -07:00 |
|
mbalsdon
|
9a2da4b441
|
change contactspage styling
|
2022-03-30 00:03:51 -07:00 |
|
Jincheng Lu
|
67a7216c95
|
Merge pull request #55 from CPSC319-Winter-term-2/home
removed unused mockdata
|
2022-03-29 23:16:05 -07:00 |
|
Jincheng Lu
|
719e67b172
|
Merge branch 'main' into home
|
2022-03-29 23:15:57 -07:00 |
|
Jincheng Lu
|
add5d90a83
|
Merge pull request #54 from CPSC319-Winter-term-2/mbalsdon-homepage-touchups
edit the homepage's styling
|
2022-03-29 23:13:23 -07:00 |
|
CodeServer
|
603452b046
|
removed unused mockdata
|
2022-03-30 07:12:27 +01:00 |
|
mbalsdon
|
8fb6343b03
|
center and enlargen homepage buttons
|
2022-03-29 23:01:57 -07:00 |
|
mbalsdon
|
34815793e9
|
homepage styling changes
|
2022-03-29 22:53:09 -07:00 |
|
mbalsdon
|
612a937df9
|
small changes to obey eslint
|
2022-03-29 22:41:56 -07:00 |
|
Jincheng Lu
|
749732a6cf
|
Merge pull request #49 from CPSC319-Winter-term-2/home
Home
|
2022-03-29 16:29:38 -07:00 |
|
CodeServer
|
c0d0a8d96c
|
removed unsupported buttons
|
2022-03-30 00:28:21 +01:00 |
|
CodeServer
|
63ed20dfb4
|
centered meeting time
|
2022-03-30 00:16:16 +01:00 |
|
CodeServer
|
9e2374987a
|
open meetings details modal in home
|
2022-03-29 23:28:12 +01:00 |
|
Mathew Balsdon
|
956dfde2ff
|
Merge pull request #48 from CPSC319-Winter-term-2/mbalsdon-calendar-touchup
style the calendar
|
2022-03-27 15:26:00 -07:00 |
|
mbalsdon
|
0b4db87233
|
change calendar font
|
2022-03-26 17:34:22 -07:00 |
|
mbalsdon
|
35b0b528cd
|
center calendar on page, change event color, change dropdown style
|
2022-03-26 17:33:59 -07:00 |
|
Jincheng Lu
|
d92a27f5c1
|
Merge pull request #47 from CPSC319-Winter-term-2/home
changed meetings style
|
2022-03-25 15:54:29 -07:00 |
|
Jincheng Lu
|
3ed74c31cd
|
Merge branch 'main' into home
|
2022-03-25 15:54:13 -07:00 |
|
Jincheng Lu
|
c35acb91d6
|
Merge pull request #46 from CPSC319-Winter-term-2/meetingspanel-fix
fixed the meetings panel bug
|
2022-03-25 15:44:30 -07:00 |
|
CodeServer
|
664a34302b
|
fixed the meetings panel bug
|
2022-03-25 22:28:53 +00:00 |
|
CodeServer
|
9300a4ca70
|
temp fix with uuid 1
|
2022-03-25 21:24:43 +00:00 |
|
CodeServer
|
d46f70895c
|
temp fix
|
2022-03-25 21:13:08 +00:00 |
|
Taehee Choi
|
468d61b130
|
some fixes
|
2022-03-25 13:32:11 -07:00 |
|
cth0604
|
63f2a293f9
|
Merge pull request #45 from CPSC319-Winter-term-2/api-fetch
Api fetch
|
2022-03-25 13:18:46 -07:00 |
|
cth0604
|
ff9f67222b
|
Merge branch 'main' into api-fetch
|
2022-03-25 13:18:34 -07:00 |
|
Taehee Choi
|
ff8cd26a53
|
empty string for mock data
|
2022-03-25 13:15:25 -07:00 |
|
CodeServer
|
b3ef13dd74
|
changed meetings style
|
2022-03-25 19:50:41 +00:00 |
|
cth0604
|
03803ea711
|
Merge pull request #43 from CPSC319-Winter-term-2/mbalsdon-calendar-upgrade
Add functionality to calendar
|
2022-03-25 11:53:54 -07:00 |
|
Taehee Choi
|
34a1113686
|
Merge branch 'mbalsdon-calendar-upgrade' of github.com:CPSC319-Winter-term-2/Alley-HSBC-Frontend into mbalsdon-calendar-upgrade
|
2022-03-25 11:51:58 -07:00 |
|
Taehee Choi
|
364c920f77
|
currentUser now cannot be null
|
2022-03-25 11:51:33 -07:00 |
|
mbalsdon
|
7f00d00198
|
revert changes
|
2022-03-25 11:32:27 -07:00 |
|
mbalsdon
|
c654985e45
|
fix calendar height (was getting cut off)
|
2022-03-25 11:26:51 -07:00 |
|
mbalsdon
|
f282d0d96c
|
add dropdown that allows viewing meetings for other team members, or all team members at once
|
2022-03-25 11:21:19 -07:00 |
|
mbalsdon
|
62d120afb7
|
add another mock meeting
|
2022-03-25 11:19:40 -07:00 |
|
Taehee Choi
|
04320c0ee5
|
linter fixes
|
2022-03-25 11:08:49 -07:00 |
|
cth0604
|
492c66b8df
|
Merge pull request #42 from CPSC319-Winter-term-2/home
Home
|
2022-03-25 11:01:31 -07:00 |
|
Taehee Choi
|
8dc4fef0c4
|
fetch calls and websocket
|
2022-03-25 10:59:05 -07:00 |
|
mbalsdon
|
7b9ed5e313
|
move everything into one file
|
2022-03-25 09:55:20 -07:00 |
|
CodeServer
|
ee77e90aa2
|
fixed the but
|
2022-03-25 10:43:05 +00:00 |
|
CodeServer
|
5119cd5272
|
trying to fix meetings panel (still have bug)
|
2022-03-25 09:01:20 +00:00 |
|
mbalsdon
|
dcff2d70ef
|
integrate backend meeting structure with calendar, add ability to bring up meeting menu when clicking calendar events
|
2022-03-25 00:14:53 -07:00 |
|
cth0604
|
6260910d47
|
Merge pull request #39 from CPSC319-Winter-term-2/login-pass-uuid
Login pass UUID
|
2022-03-25 00:13:50 -07:00 |
|