Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 45c5bebe8f final fixes before demo main Taehee Choi 2022-04-04 00:10:19 -0700
• 9683a55cd5
  Merge pull request #77 from CPSC319-Winter-term-2/live-participant-update-bug-fix estebanm123 2022-04-01 19:54:56 -0700
• deab0e89eb fixed but with start-prod CodeServer 2022-04-01 12:01:06 +0100
• d6df4b48bd
  Merge pull request #79 from CPSC319-Winter-term-2/docker-file Jincheng Lu 2022-03-31 19:58:35 -0700
• f4430067d0 changed docker-compose and readme CodeServer 2022-04-01 03:57:11 +0100
• 0ec7478728 status update fixed and warning message added Taehee Choi 2022-03-31 14:58:12 -0700
• 725e9a7931 changed port number on readme CodeServer 2022-03-31 20:35:23 +0100
• c9e51c21de fix typo CodeServer 2022-03-31 20:24:49 +0100
• 4f306d2fea
  Merge pull request #76 from CPSC319-Winter-term-2/edit-readme Jincheng Lu 2022-03-31 11:38:48 -0700
• 89505d9e35 added instructions CodeServer 2022-03-31 19:37:46 +0100
• e9faafdc0d writing deployment instructions CodeServer 2022-03-31 10:30:47 +0100
• 43e64028c1 added docker Jincheng Lu 2022-03-31 02:18:54 -0700
• 53bf9199ea
  Merge pull request #74 from CPSC319-Winter-term-2/login Jincheng Lu 2022-03-30 23:45:52 -0700
• 6e4506adc2 changed login styles CodeServer 2022-03-31 07:44:51 +0100
• 3c9d8e4822
  Merge pull request #73 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-30 22:49:52 -0700
• 5536c842d2 changed title CodeServer 2022-03-31 06:49:01 +0100
• 9f48d3788b fixed time display error in detailed meeting CodeServer 2022-03-31 06:46:17 +0100
• 272a7bf33e
  Merge pull request #72 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-30 22:14:37 -0700
• 2884759172 added EmptyMeetingsList CodeServer 2022-03-31 06:13:23 +0100
• 0044435a11
  Merge pull request #71 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-30 17:45:40 -0700
• f008abe473 bug fix for Schedule Meetings and Call Group CodeServer 2022-03-31 01:45:08 +0100
• eca6fba645
  Merge pull request #70 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-30 15:50:44 -0700
• b36b0ea01f Implemented Schedule Meeting and Call Group CodeServer 2022-03-30 23:49:51 +0100
• 9852ced6b6 Merge branch 'main' of github.com:CPSC319-Winter-term-2/Alley-HSBC-Frontend into main Taehee Choi 2022-03-30 12:56:58 -0700
• 1ebb45b73d contacts and meeting details pages now show joinUrl in a popup window Taehee Choi 2022-03-30 12:56:43 -0700
• c80cd95297
  Merge pull request #61 from CPSC319-Winter-term-2/mbalsdon-contacts-touchups-2 Mathew Balsdon 2022-03-30 10:04:25 -0700
• efff7ed104 fix spacing, minor color tweaks mbalsdon 2022-03-30 10:02:03 -0700
• 59d7df1437 fix merge issues Taehee Choi 2022-03-30 04:42:50 -0700
• 4d4278b958
  Merge pull request #51 from CPSC319-Winter-term-2/mbalsdon-browser-notifications cth0604 2022-03-30 04:39:02 -0700
• ffc230a631
  Merge branch 'main' into mbalsdon-browser-notifications cth0604 2022-03-30 04:38:54 -0700
• 7e97501269 minor fixes Taehee Choi 2022-03-30 04:24:01 -0700
• 667886224c
  Merge pull request #60 from CPSC319-Winter-term-2/various-fixes cth0604 2022-03-30 04:12:55 -0700
• 9b0b2a20ba
  Merge branch 'main' into various-fixes cth0604 2022-03-30 04:12:45 -0700
• 29a47707d7 linter fix Taehee Choi 2022-03-30 04:02:48 -0700
• 8c51821f6e
  Merge pull request #59 from CPSC319-Winter-term-2/mbalsdon-add-favs-notif Mathew Balsdon 2022-03-30 01:57:23 -0700
• d353da7e2a implement notification that pops up when users add someone to their favourites from sidebar mbalsdon 2022-03-30 01:54:10 -0700
• 9253170755
  Merge pull request #57 from CPSC319-Winter-term-2/mbalsdon-meeting-modal-touchups Mathew Balsdon 2022-03-30 01:21:38 -0700
• f1110f07b7 add functionality to modal; change styling mbalsdon 2022-03-30 01:19:55 -0700
• 981480d30d
  Merge pull request #56 from CPSC319-Winter-term-2/mbalsdon-contacts-touchups Mathew Balsdon 2022-03-30 00:06:03 -0700
• 9a2da4b441 change contactspage styling mbalsdon 2022-03-30 00:03:51 -0700
• 67a7216c95
  Merge pull request #55 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-29 23:16:05 -0700
• 719e67b172
  Merge branch 'main' into home Jincheng Lu 2022-03-29 23:15:57 -0700
• add5d90a83
  Merge pull request #54 from CPSC319-Winter-term-2/mbalsdon-homepage-touchups Jincheng Lu 2022-03-29 23:13:23 -0700
• 603452b046 removed unused mockdata CodeServer 2022-03-30 07:12:27 +0100
• 8fb6343b03 center and enlargen homepage buttons mbalsdon 2022-03-29 23:01:57 -0700
• 34815793e9 homepage styling changes mbalsdon 2022-03-29 22:53:09 -0700
• 612a937df9 small changes to obey eslint mbalsdon 2022-03-29 22:41:56 -0700
• 3a401dc316 add polling hook used for upcoming meetings notifications mbalsdon 2022-03-29 21:00:36 -0700
• 6202ab298e add notifications for upcoming meetings mbalsdon 2022-03-29 20:59:32 -0700
• 749732a6cf
  Merge pull request #49 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-29 16:29:38 -0700
• c0d0a8d96c removed unsupported buttons CodeServer 2022-03-30 00:28:21 +0100
• 63ed20dfb4 centered meeting time CodeServer 2022-03-30 00:16:16 +0100
• 9e2374987a open meetings details modal in home CodeServer 2022-03-29 23:28:12 +0100
• 956dfde2ff
  Merge pull request #48 from CPSC319-Winter-term-2/mbalsdon-calendar-touchup Mathew Balsdon 2022-03-27 15:26:00 -0700
• 0b4db87233 change calendar font mbalsdon 2022-03-26 17:34:22 -0700
• 35b0b528cd center calendar on page, change event color, change dropdown style mbalsdon 2022-03-26 17:33:59 -0700
• d92a27f5c1
  Merge pull request #47 from CPSC319-Winter-term-2/home Jincheng Lu 2022-03-25 15:54:29 -0700
• 3ed74c31cd
  Merge branch 'main' into home Jincheng Lu 2022-03-25 15:54:13 -0700
• c35acb91d6
  Merge pull request #46 from CPSC319-Winter-term-2/meetingspanel-fix Jincheng Lu 2022-03-25 15:44:30 -0700
• 664a34302b fixed the meetings panel bug CodeServer 2022-03-25 22:28:53 +0000
• 9300a4ca70 temp fix with uuid 1 CodeServer 2022-03-25 21:24:43 +0000
• d46f70895c temp fix CodeServer 2022-03-25 21:13:08 +0000
• 468d61b130 some fixes Taehee Choi 2022-03-25 13:32:11 -0700
• 63f2a293f9
  Merge pull request #45 from CPSC319-Winter-term-2/api-fetch cth0604 2022-03-25 13:18:46 -0700
• ff9f67222b
  Merge branch 'main' into api-fetch cth0604 2022-03-25 13:18:34 -0700
• ff8cd26a53 empty string for mock data Taehee Choi 2022-03-25 13:15:25 -0700
• b3ef13dd74 changed meetings style CodeServer 2022-03-25 19:50:41 +0000
• 03803ea711
  Merge pull request #43 from CPSC319-Winter-term-2/mbalsdon-calendar-upgrade cth0604 2022-03-25 11:53:54 -0700
• 34a1113686 Merge branch 'mbalsdon-calendar-upgrade' of github.com:CPSC319-Winter-term-2/Alley-HSBC-Frontend into mbalsdon-calendar-upgrade Taehee Choi 2022-03-25 11:51:58 -0700
• 364c920f77 currentUser now cannot be null Taehee Choi 2022-03-25 11:51:33 -0700
• 7f00d00198 revert changes mbalsdon 2022-03-25 11:32:27 -0700
• c654985e45 fix calendar height (was getting cut off) mbalsdon 2022-03-25 11:26:51 -0700
• f282d0d96c add dropdown that allows viewing meetings for other team members, or all team members at once mbalsdon 2022-03-25 11:21:19 -0700
• 62d120afb7 add another mock meeting mbalsdon 2022-03-25 11:19:40 -0700
• 04320c0ee5 linter fixes Taehee Choi 2022-03-25 11:08:49 -0700
• 492c66b8df
  Merge pull request #42 from CPSC319-Winter-term-2/home cth0604 2022-03-25 11:01:31 -0700
• 8dc4fef0c4 fetch calls and websocket Taehee Choi 2022-03-25 10:59:05 -0700
• 7b9ed5e313 move everything into one file mbalsdon 2022-03-25 09:55:20 -0700
• ee77e90aa2 fixed the but CodeServer 2022-03-25 10:43:05 +0000
• 5119cd5272 trying to fix meetings panel (still have bug) CodeServer 2022-03-25 09:01:20 +0000
• dcff2d70ef integrate backend meeting structure with calendar, add ability to bring up meeting menu when clicking calendar events mbalsdon 2022-03-25 00:14:53 -0700
• 6260910d47
  Merge pull request #39 from CPSC319-Winter-term-2/login-pass-uuid cth0604 2022-03-25 00:13:50 -0700
• f330be87b6
  Merge pull request #37 from CPSC319-Winter-term-2/mbalsdon-callfavs-improvement cth0604 2022-03-25 00:12:15 -0700
• 3d0bd5c4d9 allow selectUserUpcomingMeetings to take null uuid inputs due to TeamState in usersSlice.tsx supporting null user inputs mbalsdon 2022-03-25 00:12:12 -0700
• 877df73ea5 filter now uses includes Taehee Choi 2022-03-25 00:11:51 -0700
• ccb5719e4b add selector for uuid of user currently using the app mbalsdon 2022-03-25 00:08:25 -0700
• 9ce1314cae remove old mock data mbalsdon 2022-03-25 00:07:29 -0700
• 5ef38dad1a add more mock meeting data mbalsdon 2022-03-25 00:07:02 -0700
• 478ebc7881
  Merge pull request #38 from CPSC319-Winter-term-2/mbalsdon-sidebar-overlap-fix cth0604 2022-03-25 00:04:54 -0700
• e810900c7e sidebar position fixed Taehee Choi 2022-03-24 22:29:00 -0700
• b8ed1e825b
  Merge pull request #36 from CPSC319-Winter-term-2/mbalsdon-contacts-search cth0604 2022-03-24 22:04:29 -0700
• cdac8e9ef4 now search uses includes and num contacts updated properly Taehee Choi 2022-03-24 22:04:00 -0700
• 759422969a login connected backend CodeServer 2022-03-25 02:44:47 +0000
• 0a8546f6f7 partially fix bug where gear icon overlapped w/ names (still happens on very small viewports since flexShrink only adds a linebreak where there are spaces in text) mbalsdon 2022-03-24 18:30:26 -0700
• bee47e29a8 fix small issue where selected checkboxes stay selected after changing group mbalsdon 2022-03-24 17:34:37 -0700
• 0c247569b7 add onGroupChange input to GroupSelect component mbalsdon 2022-03-24 17:33:11 -0700
• a735ee8304 add onGroupChange function parameter (can be null) mbalsdon 2022-03-24 17:31:53 -0700
• c21e4785ce add search to call group dialog mbalsdon 2022-03-24 16:48:14 -0700
• fea1a6aae5 change 'call favourites' to 'call group' mbalsdon 2022-03-24 16:11:55 -0700
• ad5ecf2d41 add dropdown to switch between groups; remove select all button mbalsdon 2022-03-24 16:11:14 -0700