UBC/Alley-HSBC-Frontend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • e18562c0c9 implement basic contactspage search mbalsdon 2022-03-24 14:34:46 -0700
  • f09a2177dd implement contactspage search (buggy) mbalsdon 2022-03-24 14:22:08 -0700
  • b0c38934f8
         Merge pull request #35 from CPSC319-Winter-term-2/home cth0604 2022-03-23 01:21:54 -0700
  • 24875f914b home real time update CodeServer 2022-03-23 06:52:55 +0000
  • 9c7102dccd home fix CodeServer 2022-03-23 06:37:53 +0000
  • a5467dadab home update CodeServer 2022-03-23 06:03:50 +0000
  • 1c85863245 get logged in user id CodeServer 2022-03-22 23:16:27 +0000
  • 226d403733
         Merge pull request #32 from CPSC319-Winter-term-2/sidebar-calendar-updates cth0604 2022-03-20 23:57:00 -0700
  • 19906db3da sidebar changes Taehee Choi 2022-03-20 23:56:18 -0700
  • 16587686d4
         Merge pull request #31 from CPSC319-Winter-term-2/front-end-fixes cth0604 2022-03-16 17:14:13 -0700
  • 9b5d8002a0 redux updates Taehee Choi 2022-03-15 15:41:41 -0700
  • 49aee79557
         Merge pull request #30 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-14 16:39:36 -0700
  • 4a2f14a388
         Merge branch 'main' into home Jincheng Lu 2022-03-14 16:39:10 -0700
  • c45fb59154 changed from label to Typography, changed time format CodeServer 2022-03-14 23:35:14 +0000
  • 6f8bffff8b
         Merge pull request #20 from CPSC319-Winter-term-2/remove-test Jincheng Lu 2022-03-13 18:50:59 -0700
  • f7223aef44 removed test Jincheng Lu 2022-03-13 18:50:29 -0700
  • 97ed807785 merge conflict fixes Taehee Choi 2022-03-13 18:37:40 -0700
  • 20e8c79bb9
         Merge pull request #19 from CPSC319-Winter-term-2/redux-setup cth0604 2022-03-13 18:26:21 -0700
  • 40e33dd0c9
         Merge branch 'main' into redux-setup cth0604 2022-03-13 18:26:13 -0700
  • 332028ac61
         Merge pull request #18 from CPSC319-Winter-term-2/fix-eslint-warnings-login cth0604 2022-03-13 18:17:02 -0700
  • 20a4d5dabf initial redux set up Taehee Choi 2022-03-13 18:16:19 -0700
  • 353472b7a1 fixed eslint warnings Jincheng Lu 2022-03-13 18:08:33 -0700
  • b86d51d4c1
         Merge pull request #15 from CPSC319-Winter-term-2/mbalsdon-callfavs cth0604 2022-03-13 12:03:44 -0700
  • 2bc8bbbba2
         Merge pull request #17 from CPSC319-Winter-term-2/mbalsdon-calendarpage2 cth0604 2022-03-13 12:03:06 -0700
  • 52f76f8209 fix lint warnings Taehee Choi 2022-03-13 11:58:14 -0700
  • 3320d0d932 initial redux setup Taehee Choi 2022-03-13 11:56:47 -0700
  • 5f79c81b2e add react-big-calendar mbalsdon 2022-03-12 11:36:04 -0800
  • adc1dc248f
         Merge pull request #16 from CPSC319-Winter-term-2/mbalsdon-touchups Jincheng Lu 2022-03-11 23:52:52 -0800
  • 18635704bb fix spacing and font mbalsdon 2022-03-11 23:45:42 -0800
  • 55f91fbfb5 finish nonfunctional call favourites button dialog component mbalsdon 2022-03-11 21:43:40 -0800
  • dbbc6225cf
         Merge pull request #14 from CPSC319-Winter-term-2/cochrane Jincheng Lu 2022-03-11 13:19:11 -0800
  • 6b9d210e21 hide navbar sidebar bug fixes CodeServer 2022-03-11 21:17:00 +0000
  • 1d27b92536
         Merge pull request #13 from CPSC319-Winter-term-2/hide-navbar-sidebar-from-login Jincheng Lu 2022-03-11 12:46:00 -0800
  • c14ee4c3ad hided navbar and sidebar from login page CodeServer 2022-03-11 20:44:38 +0000
  • 10e010c642
         Merge pull request #12 from CPSC319-Winter-term-2/cochrane Jincheng Lu 2022-03-11 12:37:55 -0800
  • e0013d15f5
         Merge branch 'main' into cochrane Jincheng Lu 2022-03-11 01:29:56 -0800
  • 686c8fe008 finished Protected Routes CodeServer 2022-03-11 08:45:17 +0000
  • 28083015f0
         Merge pull request #11 from CPSC319-Winter-term-2/sidebar-fix cth0604 2022-03-11 00:34:05 -0800
  • 6f8b36bf87 sidebar position fixed Taehee Choi 2022-03-10 18:27:01 -0800
  • 1b9d651c19
         Merge pull request #7 from CPSC319-Winter-term-2/contacts-page cth0604 2022-03-09 00:14:18 -0800
  • 792d254ff7 small design change Taehee Choi 2022-03-08 12:42:07 -0800
  • 28abd08255
         Merge pull request #6 from CPSC319-Winter-term-2/meeting-info-page Mathew Balsdon 2022-03-08 08:59:37 -0800
  • a20c839324 changed index.tsx file back CodeServer 2022-03-08 01:33:02 +0000
  • abfc8581f9 finished login CodeServer 2022-03-08 01:14:18 +0000
  • ff53f91a62
         Merge pull request #5 from CPSC319-Winter-term-2/cochrane cth0604 2022-03-07 14:32:04 -0800
  • 82f0906124 meeting details page implemented and api bodies included Taehee Choi 2022-03-06 16:43:45 -0800
  • 8cfc55312c avoid overlap with the sidebar CodeServer 2022-03-06 01:35:29 +0000
  • b543030a9c avoid overlap with sidebar CodeServer 2022-03-06 01:34:13 +0000
  • d83e6fafd6 added login page CodeServer 2022-03-05 23:15:41 +0000
  • 6865a55672
         Merge pull request #4 from CPSC319-Winter-term-2/contacts-page cth0604 2022-03-05 01:48:23 -0800
  • d4c3ca4a5a
         Merge pull request #3 from CPSC319-Winter-term-2/mbalsdon-sidebar cth0604 2022-03-05 01:32:35 -0800
  • d21dda7719 contacts page first draft done Taehee Choi 2022-03-05 01:30:48 -0800
  • c296241841 add settings button context menu (nonfunctional parts) mbalsdon 2022-03-03 18:23:17 -0800
  • e3b3256bd8 moved to material ui CodeServer 2022-03-03 08:42:29 +0000
  • 775c468548 breaking home up into components CodeServer 2022-03-03 02:04:16 +0000
  • abeede8d82 minor changes to fix linter errors Taehee Choi 2022-03-01 23:09:00 -0800
  • 1d0a0bf210 complete most of the non-functional sidebar components mbalsdon 2022-03-01 11:56:49 -0800
  • c4841eb127 add sidebar boilerplate mbalsdon 2022-03-01 10:36:07 -0800
  • 073fce5f89 turn off eslint linebreak-style errors mbalsdon 2022-03-01 01:53:35 -0800
  • be20a12a56
         Merge pull request #2 from CPSC319-Winter-term-2/material-ui-setup cth0604 2022-02-28 21:41:51 -0800
  • 87b612aaef various changes Taehee Choi 2022-02-28 21:40:09 -0800
  • 0ef11f7f74 various changes Taehee Choi 2022-02-28 21:37:40 -0800
  • 22ac34dee4
         Merge branch 'main' into material-ui-setup cth0604 2022-02-28 21:26:28 -0800
  • 2dccfc758b theme updated Taehee Choi 2022-02-28 21:17:44 -0800
  • 2e7313c22d added home lu2019` 2022-02-28 21:09:26 -0800
  • bd92806f0a navbar completed Taehee Choi 2022-02-28 20:21:06 -0800
  • 69eb3fe20f remove bootstrap dependencies mbalsdon 2022-02-27 11:08:40 -0800
  • 4031d42246 add a missing boilerplate file mbalsdon 2022-02-27 11:06:37 -0800
  • 939abbc672
         Merge pull request #1 from CPSC319-Winter-term-2/material-ui-setup cth0604 2022-02-27 02:44:48 -0800
  • 72325791d6 initial material ui setup Taehee Choi 2022-02-27 02:44:03 -0800
  • 1eef65d60e Merge branch 'main' of github.com:CPSC319-Winter-term-2/Alley-HSBC-Frontend into main Taehee Choi 2022-02-20 12:43:14 -0800
  • 80ece8ed03 added more boilerplate code Taehee Choi 2022-02-20 12:35:39 -0800
  • 6f5b6b76a2 add boilerplate (try 2) spreadnuts 2022-02-16 19:23:47 -0800
  • 1d3c738633 Revert "upload boilerplate files" spreadnuts 2022-02-16 19:18:00 -0800
  • 8e91a0ae8d
         upload boilerplate files Mathew Balsdon 2022-02-16 19:00:29 -0800
  • 289c084c1c first commit Cochrane 2022-02-16 18:47:59 -0800