Taehee Choi
|
97ed807785
|
merge conflict fixes
|
2022-03-13 18:37:40 -07:00 |
|
cth0604
|
20e8c79bb9
|
Merge pull request #19 from CPSC319-Winter-term-2/redux-setup
Redux setup
|
2022-03-13 18:26:21 -07:00 |
|
cth0604
|
40e33dd0c9
|
Merge branch 'main' into redux-setup
|
2022-03-13 18:26:13 -07:00 |
|
cth0604
|
332028ac61
|
Merge pull request #18 from CPSC319-Winter-term-2/fix-eslint-warnings-login
fixed eslint warnings
|
2022-03-13 18:17:02 -07:00 |
|
Taehee Choi
|
20a4d5dabf
|
initial redux set up
|
2022-03-13 18:16:19 -07:00 |
|
|
|
353472b7a1
|
fixed eslint warnings
|
2022-03-13 18:08:33 -07:00 |
|
cth0604
|
b86d51d4c1
|
Merge pull request #15 from CPSC319-Winter-term-2/mbalsdon-callfavs
Call favourites dialogbox
|
2022-03-13 12:03:44 -07:00 |
|
cth0604
|
2bc8bbbba2
|
Merge pull request #17 from CPSC319-Winter-term-2/mbalsdon-calendarpage2
add calendar
|
2022-03-13 12:03:06 -07:00 |
|
Taehee Choi
|
52f76f8209
|
fix lint warnings
|
2022-03-13 11:58:14 -07:00 |
|
Taehee Choi
|
3320d0d932
|
initial redux setup
|
2022-03-13 11:56:47 -07:00 |
|
mbalsdon
|
5f79c81b2e
|
add react-big-calendar
|
2022-03-12 11:36:04 -08:00 |
|
Jincheng Lu
|
adc1dc248f
|
Merge pull request #16 from CPSC319-Winter-term-2/mbalsdon-touchups
Small fix to spacing and font on login page
|
2022-03-11 23:52:52 -08:00 |
|
mbalsdon
|
18635704bb
|
fix spacing and font
|
2022-03-11 23:45:42 -08:00 |
|
mbalsdon
|
55f91fbfb5
|
finish nonfunctional call favourites button dialog component
|
2022-03-11 21:43:40 -08:00 |
|
Jincheng Lu
|
dbbc6225cf
|
Merge pull request #14 from CPSC319-Winter-term-2/cochrane
hide navbar sidebar bug fixes
|
2022-03-11 13:19:11 -08:00 |
|
CodeServer
|
6b9d210e21
|
hide navbar sidebar bug fixes
|
2022-03-11 21:17:00 +00:00 |
|
Jincheng Lu
|
1d27b92536
|
Merge pull request #13 from CPSC319-Winter-term-2/hide-navbar-sidebar-from-login
hided navbar and sidebar from login page
|
2022-03-11 12:46:00 -08:00 |
|
CodeServer
|
c14ee4c3ad
|
hided navbar and sidebar from login page
|
2022-03-11 20:44:38 +00:00 |
|
Jincheng Lu
|
10e010c642
|
Merge pull request #12 from CPSC319-Winter-term-2/cochrane
Cochrane
|
2022-03-11 12:37:55 -08:00 |
|
Jincheng Lu
|
e0013d15f5
|
Merge branch 'main' into cochrane
|
2022-03-11 01:29:56 -08:00 |
|
CodeServer
|
686c8fe008
|
finished Protected Routes
|
2022-03-11 08:45:17 +00:00 |
|
cth0604
|
28083015f0
|
Merge pull request #11 from CPSC319-Winter-term-2/sidebar-fix
sidebar position fixed
|
2022-03-11 00:34:05 -08:00 |
|
Taehee Choi
|
6f8b36bf87
|
sidebar position fixed
|
2022-03-10 18:27:01 -08:00 |
|
cth0604
|
1b9d651c19
|
Merge pull request #7 from CPSC319-Winter-term-2/contacts-page
small design change
|
2022-03-09 00:14:18 -08:00 |
|
Taehee Choi
|
792d254ff7
|
small design change
|
2022-03-08 12:42:07 -08:00 |
|
Mathew Balsdon
|
28abd08255
|
Merge pull request #6 from CPSC319-Winter-term-2/meeting-info-page
meeting details page implemented and api bodies included
|
2022-03-08 08:59:37 -08:00 |
|
CodeServer
|
a20c839324
|
changed index.tsx file back
|
2022-03-08 01:33:02 +00:00 |
|
CodeServer
|
abfc8581f9
|
finished login
|
2022-03-08 01:14:18 +00:00 |
|
cth0604
|
ff53f91a62
|
Merge pull request #5 from CPSC319-Winter-term-2/cochrane
Cochrane
|
2022-03-07 14:32:04 -08:00 |
|
Taehee Choi
|
82f0906124
|
meeting details page implemented and api bodies included
|
2022-03-06 16:43:45 -08:00 |
|
CodeServer
|
8cfc55312c
|
avoid overlap with the sidebar
|
2022-03-06 01:35:29 +00:00 |
|
CodeServer
|
b543030a9c
|
avoid overlap with sidebar
|
2022-03-06 01:34:13 +00:00 |
|
CodeServer
|
d83e6fafd6
|
added login page
|
2022-03-05 23:15:41 +00:00 |
|
cth0604
|
6865a55672
|
Merge pull request #4 from CPSC319-Winter-term-2/contacts-page
Contacts page
|
2022-03-05 01:48:23 -08:00 |
|
cth0604
|
d4c3ca4a5a
|
Merge pull request #3 from CPSC319-Winter-term-2/mbalsdon-sidebar
Non-functional sidebar components
|
2022-03-05 01:32:35 -08:00 |
|
Taehee Choi
|
d21dda7719
|
contacts page first draft done
|
2022-03-05 01:30:48 -08:00 |
|
mbalsdon
|
c296241841
|
add settings button context menu (nonfunctional parts)
|
2022-03-03 18:23:17 -08:00 |
|
CodeServer
|
e3b3256bd8
|
moved to material ui
|
2022-03-03 08:42:29 +00:00 |
|
CodeServer
|
775c468548
|
breaking home up into components
|
2022-03-03 02:04:16 +00:00 |
|
Taehee Choi
|
abeede8d82
|
minor changes to fix linter errors
|
2022-03-01 23:09:00 -08:00 |
|
mbalsdon
|
1d0a0bf210
|
complete most of the non-functional sidebar components
|
2022-03-01 11:56:49 -08:00 |
|
mbalsdon
|
c4841eb127
|
add sidebar boilerplate
|
2022-03-01 10:36:07 -08:00 |
|
mbalsdon
|
073fce5f89
|
turn off eslint linebreak-style errors
|
2022-03-01 01:53:35 -08:00 |
|
cth0604
|
be20a12a56
|
Merge pull request #2 from CPSC319-Winter-term-2/material-ui-setup
Material UI setup
|
2022-02-28 21:41:51 -08:00 |
|
Taehee Choi
|
87b612aaef
|
various changes
|
2022-02-28 21:40:09 -08:00 |
|
Taehee Choi
|
0ef11f7f74
|
various changes
|
2022-02-28 21:37:40 -08:00 |
|
cth0604
|
22ac34dee4
|
Merge branch 'main' into material-ui-setup
|
2022-02-28 21:26:28 -08:00 |
|
Taehee Choi
|
2dccfc758b
|
theme updated
|
2022-02-28 21:17:44 -08:00 |
|
lu2019`
|
2e7313c22d
|
added home
|
2022-02-28 21:09:26 -08:00 |
|
Taehee Choi
|
bd92806f0a
|
navbar completed
|
2022-02-28 20:21:06 -08:00 |
|
