Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 7d5d707 Merge: 2bf3abe b66247e Author: Anthony Bernardi <[email protected]> Date: Thu Sep 15 12:24:38 2022 -0700 Merge pull request #185 from Northeastern-Electric-Racing/#70-wire-up-cr-button #70 - Wire Up Create New CR Button for Risks commit b66247e Merge: 02d5a20 2bf3abe Author: anthonybernardi <[email protected]> Date: Thu Sep 15 14:56:55 2022 -0400 Merge branch 'develop' into #70-wire-up-cr-button commit 2bf3abe Merge: 8d018ca 46dd804 Author: Anthony Bernardi <[email protected]> Date: Thu Sep 15 11:54:12 2022 -0700 Merge pull request #151 from Northeastern-Electric-Racing/#68 #68: Wire Up Risk Log commit 02d5a20 Author: Aritra (Ari) Saharay <[email protected]> Date: Thu Sep 15 09:33:36 2022 -0400 #70 - post merge tweaks commit edddeb5 Merge: 372f1f2 46dd804 Author: Aritra (Ari) Saharay <[email protected]> Date: Thu Sep 15 09:25:30 2022 -0400 Merge branch '#68' into #70-wire-up-cr-button # Conflicts: # src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/ProjectViewContainer.tsx # src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/RiskLog.tsx commit 46dd804 Author: Anthony Bernardi <[email protected]> Date: Wed Sep 14 23:10:21 2022 -0400 #68: forgot a curly brace lol commit 0e2a063 Author: Anthony Bernardi <[email protected]> Date: Wed Sep 14 23:05:06 2022 -0400 #68: describe skip is much better commit 663efe5 Author: Anthony Bernardi <[email protected]> Date: Wed Sep 14 23:04:23 2022 -0400 #68: updated so that query invalidation works and other small stuff commit 9778128 Author: Zack Roth <[email protected]> Date: Wed Sep 14 20:44:59 2022 -0400 #68 - Pushing Everything git add -A! commit 372f1f2 Author: Aritra (Ari) Saharay <[email protected]> Date: Wed Sep 14 15:16:55 2022 -0400 #70 - Refactored according to feedback commit 77f4bd4 Author: Aritra (Ari) Saharay <[email protected]> Date: Wed Sep 14 14:51:30 2022 -0400 #70 - post merge fixes commit 9e4d947 Merge: 8d67dde cfa164f Author: Aritra (Ari) Saharay <[email protected]> Date: Wed Sep 14 14:30:27 2022 -0400 Merge branch '#68' into #70-wire-up-cr-button # Conflicts: # src/frontend/src/components/CheckList.tsx # src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/ProjectViewContainer.tsx # src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/RiskLog.tsx commit 8d018ca Merge: 9be92ae 27138df Author: Anthony Bernardi <[email protected]> Date: Mon Sep 12 09:52:26 2022 -0700 Merge pull request #197 from Northeastern-Electric-Racing/#196 #196: Confluence commit 27138df Author: anthonybernardi <[email protected]> Date: Mon Sep 12 12:48:49 2022 -0400 #196: tearing out everything commit cfa164f Author: Zack Roth <[email protected]> Date: Mon Sep 12 10:14:37 2022 -0400 #68 - Added Risks APIs, hooks, and began to implement frontend logic. commit 9be92ae Merge: 34c368a 89533f6 Author: Anthony Bernardi <[email protected]> Date: Fri Sep 9 16:20:39 2022 -0700 Merge pull request #178 from Northeastern-Electric-Racing/#88-Add-New-Proposed-Solution-Endpoint #88-Added-a-new-endpoint-for-adding-proposed-solution commit 34c368a Merge: 69ded09 674f82f Author: Anthony Bernardi <[email protected]> Date: Fri Sep 9 16:02:31 2022 -0700 Merge pull request #193 from Northeastern-Electric-Racing/#184-google-calendar-links #184 - Add Google Calendar Links to the Dashboard commit 674f82f Author: Aritra (Ari) Saharay <[email protected]> Date: Fri Sep 9 17:00:20 2022 -0400 #184 - Refactored and updated tests commit 1391be9 Author: Aritra (Ari) Saharay <[email protected]> Date: Fri Sep 9 16:36:18 2022 -0400 #184 - Renamed Info to Information commit f0a78d7 Author: Aritra (Ari) Saharay <[email protected]> Date: Fri Sep 9 00:57:10 2022 -0400 #184 - Rebranded Help to Info & implemented Calendar Links commit 8d67dde Author: Aritra (Ari) Saharay <[email protected]> Date: Thu Sep 8 18:25:28 2022 -0400 #70 - Both wbsNum and risk details fill up properly now commit 7592145 Merge: 4b21e39 28a17d3 Author: Aritra (Ari) Saharay <[email protected]> Date: Thu Sep 8 16:53:43 2022 -0400 Merge branch '#68' into #70-wire-up-cr-button commit 4b21e39 Merge: bf46676 a81a4b2 Author: Aritra (Ari) Saharay <[email protected]> Date: Thu Sep 8 16:26:58 2022 -0400 Merge branch '#702-wire-up-risk-log' into #70-wire-up-cr-button commit bf46676 Merge: 6e2e6a1 69ded09 Author: Aritra (Ari) Saharay <[email protected]> Date: Thu Sep 8 15:59:33 2022 -0400 Merge branch 'develop' into #70-wire-up-cr-button commit 89533f6 Author: Ji-min Kim <[email protected]> Date: Wed Sep 7 13:10:07 2022 -0400 #88-updated-router-so-it-now-accpets-crId-instead-of-scopeCrId commit 69ded09 Merge: 382e336 36b52a1 Author: James Chang-Davidson <[email protected]> Date: Fri Sep 2 17:37:26 2022 -0700 Merge pull request #179 from Northeastern-Electric-Racing/#35 #35: Create new WP Query Params commit 36b52a1 Author: Anthony Bernardi <[email protected]> Date: Fri Sep 2 20:21:07 2022 -0400 #35: fixing tests commit a4e2774 Author: Anthony Bernardi <[email protected]> Date: Fri Sep 2 19:56:52 2022 -0400 #35: clicking create new change request now auto populates crid and wbs number commit 382e336 Merge: 2849be0 8c0ccf5 Author: Anthony Bernardi <[email protected]> Date: Fri Sep 2 16:20:21 2022 -0700 Merge pull request #173 from Northeastern-Electric-Racing/#172-stats-for-pm #172 - create baseline manual script for PM stats pull commit f1d9333 Author: Ji-min Kim <[email protected]> Date: Fri Sep 2 17:54:04 2022 -0400 #88-Added-a-new-endpoint-for-adding-proposed-solution commit 2849be0 Merge: 759c9fe 7b436a9 Author: Anthony Bernardi <[email protected]> Date: Fri Sep 2 14:33:54 2022 -0700 Merge pull request #146 from Northeastern-Electric-Racing/#77-submit-cr-slack #77 submit cr slack notification commit 7b436a9 Merge: 908f6c0 759c9fe Author: James C-D <[email protected]> Date: Thu Sep 1 21:24:42 2022 -0700 #77 - merge develop into branch commit 908f6c0 Author: James C-D <[email protected]> Date: Thu Sep 1 21:17:05 2022 -0700 #77 - proper stop if not prod commit 97b066a Author: James C-D <[email protected]> Date: Thu Sep 1 21:11:06 2022 -0700 #77 - only send messages if project linked to team and in prod commit 8c0ccf5 Merge: bbb76cb 759c9fe Author: James Chang-Davidson <[email protected]> Date: Thu Sep 1 20:23:14 2022 -0700 Merge branch 'develop' into #172-stats-for-pm commit bbb76cb Author: James C-D <[email protected]> Date: Thu Sep 1 20:20:34 2022 -0700 #172 - create baseline manual script for PM stats pull commit 964ee60 Author: James C-D <[email protected]> Date: Thu Sep 1 20:17:22 2022 -0700 #77 - add manual script for creating teams commit 759c9fe Merge: 0ba00c9 c85e9a2 Author: James Chang-Davidson <[email protected]> Date: Thu Sep 1 20:12:38 2022 -0700 #170 - Merge PR #170 - Apply prettier formatting commit c85e9a2 Author: James C-D <[email protected]> Date: Thu Sep 1 20:08:58 2022 -0700 #170 - Apply prettier formatting commit 0ba00c9 Merge: 868e2db 1c3d633 Author: Anthony Bernardi <[email protected]> Date: Wed Aug 31 16:54:13 2022 -0700 Merge pull request #150 from Northeastern-Electric-Racing/#85 #85: Proposed Solution schema changes commit 4328d95 Merge: 28a17d3 868e2db Author: Zack Roth <[email protected]> Date: Wed Aug 31 19:47:42 2022 -0400 Merge branch 'develop' into #68 commit 28a17d3 Author: Zack Roth <[email protected]> Date: Wed Aug 31 19:39:14 2022 -0400 #68 - Wired risks from DB to frontend, updated tests, fixed bug with String/string commit 1c3d633 Author: anthonybernardi <[email protected]> Date: Wed Aug 31 19:23:39 2022 -0400 #85: account for accepted crs commit a73b2d6 Merge: 6e1ca12 a81a4b2 Author: Zack Roth <[email protected]> Date: Wed Aug 31 19:16:35 2022 -0400 Merge branch 'test' into #68 commit ecf2ba6 Author: anthonybernardi <[email protected]> Date: Mon Aug 29 21:38:46 2022 -0400 #85: actual finishing touches commit 1f685b3 Author: anthonybernardi <[email protected]> Date: Mon Aug 29 21:33:42 2022 -0400 #85: finishing touches commit ec3ce62 Author: Anthony Bernardi <[email protected]> Date: Mon Aug 29 19:52:39 2022 -0400 #85: adding more commit c2399ab Author: anthonybernardi <[email protected]> Date: Mon Aug 29 19:19:45 2022 -0400 #85: better script commit 0d5f8af Author: anthonybernardi <[email protected]> Date: Mon Aug 29 19:13:24 2022 -0400 #85: migration script commit 13c0b17 Author: anthonybernardi <[email protected]> Date: Mon Aug 29 19:01:17 2022 -0400 #85: took out the proposed solutions on users lol commit 28d255a Author: anthonybernardi <[email protected]> Date: Mon Aug 29 19:00:08 2022 -0400 #85: feedback commit 868e2db Merge: e75e4a9 a38c574 Author: Anthony Bernardi <[email protected]> Date: Mon Aug 29 15:29:55 2022 -0700 Merge pull request #159 from Northeastern-Electric-Racing/#158 #158: changed the docs commit a38c574 Author: anthonybernardi <[email protected]> Date: Mon Aug 29 18:29:39 2022 -0400 #158: small typo commit f010b57 Author: anthonybernardi <[email protected]> Date: Mon Aug 29 18:26:02 2022 -0400 #158: changed the docs commit e75e4a9 Merge: ffbea1b 7c9be41 Author: James Chang-Davidson <[email protected]> Date: Sun Aug 28 21:14:06 2022 -0700 Merge pull request #156 from Northeastern-Electric-Racing/#131 #131: Reset script is os agnostic commit ffbea1b Merge: 6333299 14a2309 Author: Anthony Bernardi <[email protected]> Date: Sun Aug 28 20:08:28 2022 -0700 Merge pull request #154 from Northeastern-Electric-Racing/#18 #18: added version number to settings page commit 14a2309 Author: anthonybernardi <[email protected]> Date: Sun Aug 28 23:04:24 2022 -0400 #18: renaming commit 7c9be41 Author: anthonybernardi <[email protected]> Date: Sun Aug 28 22:50:58 2022 -0400 #131: added the package and changed the script commit 6333299 Merge: ce8bb97 78d85e8 Author: Anthony Bernardi <[email protected]> Date: Sun Aug 28 15:54:35 2022 -0700 Merge pull request #155 from Northeastern-Electric-Racing/#100 #100: what does this ticket even mean commit cf723a4 Author: Anthony Bernardi <[email protected]> Date: Sun Aug 28 18:52:40 2022 -0400 #18: sidebar commit 78d85e8 Author: Anthony Bernardi <[email protected]> Date: Sun Aug 28 17:56:53 2022 -0400 #100: what does this ticket even mean commit 2fbf531 Author: Anthony Bernardi <[email protected]> Date: Sun Aug 28 17:51:24 2022 -0400 #18: console log woops commit d5a4c0d Author: Anthony Bernardi <[email protected]> Date: Sun Aug 28 17:49:34 2022 -0400 #18: added version number to settings page commit ce8bb97 Merge: a8ad825 ff00731 Author: James Chang-Davidson <[email protected]> Date: Sat Aug 27 19:04:04 2022 -0400 Merge pull request #152 from Northeastern-Electric-Racing/#149-Make-WPs-appear-above-change-log commit ff00731 Author: Ji-min Kim <[email protected]> Date: Sat Aug 27 17:30:59 2022 -0400 #149-updated-the-projects-page-so-the-wps-block-appears-above-the-changes-block commit 6e1ca12 Author: Anthony Bernardi <[email protected]> Date: Sat Aug 27 16:21:49 2022 -0400 #68: updating backend so that projects send risks commit d4e21f4 Author: Anthony Bernardi <[email protected]> Date: Sat Aug 27 13:29:38 2022 -0400 #85: added initial ideas commit a8ad825 Merge: c143e23 e837a16 Author: Anthony Bernardi <[email protected]> Date: Sat Aug 27 12:32:05 2022 -0400 Merge branch 'main' into develop commit c143e23 Merge: 9705d87 34b3164 Author: James Chang-Davidson <[email protected]> Date: Fri Aug 26 19:13:19 2022 -0400 Merge pull request #147 from Northeastern-Electric-Racing/#24-fix-duration-calculation #24-now-uses-proper-duration-util-function commit 34b3164 Author: Kevin Chen <[email protected]> Date: Fri Aug 26 18:51:19 2022 -0400 #24-now-uses-proper-duration-util-function commit 719fa1d Author: James C-D <[email protected]> Date: Wed Aug 24 14:25:50 2022 -0400 #77 - add project name to activation and stage gate cr notifs commit 6d2cc8b Author: James C-D <[email protected]> Date: Wed Aug 24 14:08:43 2022 -0400 #77 - fix wrong text for activation cr commit 8e04015 Author: James C-D <[email protected]> Date: Wed Aug 24 13:51:10 2022 -0400 #77 - add budget threshold eboard ping commit 38f4106 Author: James C-D <[email protected]> Date: Wed Aug 24 02:56:33 2022 -0400 #77 - enhance the scope cr slack notification message commit 47363af Author: James C-D <[email protected]> Date: Wed Aug 24 02:47:38 2022 -0400 #77 - abstraction and enhance cr slack notif commit 9ee68c1 Author: James C-D <[email protected]> Date: Wed Aug 24 02:33:42 2022 -0400 #77 - use more fun message format for stage gate commit 9f6ba07 Author: James C-D <[email protected]> Date: Wed Aug 24 02:20:21 2022 -0400 #77 - add basic scope cr slack notification commit 1e84177 Author: James C-D <[email protected]> Date: Wed Aug 24 02:15:14 2022 -0400 #77 - add basic stage gate cr slack notification commit 3d4fd60 Author: James C-D <[email protected]> Date: Wed Aug 24 02:11:55 2022 -0400 #77 - add basic activation cr slack notification commit 8efa9b3 Author: James C-D <[email protected]> Date: Wed Aug 24 01:13:51 2022 -0400 #77 - add slack message send utility commit 16f4be4 Author: James C-D <[email protected]> Date: Wed Aug 24 00:17:53 2022 -0400 #77 - add Slack bot as first integration commit 9705d87 Merge: 5487962 cd4a6cf Author: Anthony Bernardi <[email protected]> Date: Sun Aug 21 16:33:26 2022 -0400 Merge pull request #144 from Northeastern-Electric-Racing/#67-delete-risk #67: Delete Risk Endpoint commit 5487962 Merge: 8f50afe f7d7eeb Author: Anthony Bernardi <[email protected]> Date: Sun Aug 21 16:30:22 2022 -0400 Merge pull request #140 from Northeastern-Electric-Racing/#138 #138: iykyk commit cd4a6cf Author: anthonybernardi <[email protected]> Date: Sat Aug 20 19:22:20 2022 -0400 #67: formatting commit a8d1d6b Merge: d2372ef 8f50afe Author: Anthony Bernardi <[email protected]> Date: Sat Aug 20 19:21:03 2022 -0400 Merge branch 'develop' into #67-delete-risk commit 8f50afe Merge: 099bc91 0dc1a38 Author: Anthony Bernardi <[email protected]> Date: Sat Aug 20 19:17:18 2022 -0400 Merge pull request #145 from Northeastern-Electric-Racing/#69-edit-risk #69: Edit Risk Endpoint commit 099bc91 Merge: 685bd49 6ea0d01 Author: Anthony Bernardi <[email protected]> Date: Sat Aug 20 18:50:00 2022 -0400 Merge pull request #130 from Northeastern-Electric-Racing/#84-individual-proposed-solution-form #84 - Created Individual Proposed Solution Form commit 6ea0d01 Author: Aritra (Ari) Saharay <[email protected]> Date: Sat Aug 20 17:05:46 2022 -0400 #84 - Moved files to proper location commit 0dc1a38 Author: Anthony Bernardi <[email protected]> Date: Sat Aug 20 14:35:12 2022 -0400 #69: updating perms for createRisk commit 87957e2 Author: Anthony Bernardi <[email protected]> Date: Sat Aug 20 14:22:03 2022 -0400 #69: (nice) adding the endpoint commit d2372ef Author: Anthony Bernardi <[email protected]> Date: Sat Aug 20 13:02:25 2022 -0400 #67: added permissions commit f7d7eeb Author: anthonybernardi <[email protected]> Date: Thu Aug 18 20:20:30 2022 -0400 #138: even better commit d56b0d7 Author: anthonybernardi <[email protected]> Date: Thu Aug 18 14:03:13 2022 -0400 #138: tests commit cc48614 Author: anthonybernardi <[email protected]> Date: Thu Aug 18 13:56:12 2022 -0400 #138: iykyk commit a81a4b2 Author: Zack Roth <[email protected]> Date: Thu Aug 18 08:51:54 2022 -0400 #702 - Updating project type and transformer to support risks commit 3c0775e Author: Zack Roth <[email protected]> Date: Thu Aug 18 08:51:02 2022 -0400 #702 - Updated RiskLog, CheckList, ProjectViewContainer to handle risks commit ba06f5a Author: Aritra (Ari) Saharay <[email protected]> Date: Wed Aug 17 22:54:04 2022 -0400 #84 - Added proper top margin for Add button commit 1840701 Author: Aritra (Ari) Saharay <[email protected]> Date: Wed Aug 17 22:48:39 2022 -0400 #84 - Rearranged components according to feedback and removed title commit 685bd49 Merge: 429656a d138e19 Author: Anthony Bernardi <[email protected]> Date: Wed Aug 17 19:24:37 2022 -0400 Merge pull request #137 from Northeastern-Electric-Racing/#133-move-up-risk-log #133 - moving the risk log below summary above gantt chart commit 9e92f9d Author: Zack Roth <[email protected]> Date: Wed Aug 17 19:15:44 2022 -0400 #702 - Added Test Data commit d138e19 Author: leoRysing <[email protected]> Date: Wed Aug 17 19:10:36 2022 -0400 #133 - moving the risk log below summary above gantt chart commit 004b100 Author: Aritra (Ari) Saharay <[email protected]> Date: Wed Aug 17 16:13:53 2022 -0400 #84 - Corrected Project Name in License commit 6d99774 Author: Aritra (Ari) Saharay <[email protected]> Date: Wed Aug 17 15:26:59 2022 -0400 #84 - Refactored according to feedback commit 429656a Author: anthonybernardi <[email protected]> Date: Wed Aug 17 14:15:23 2022 -0400 updating documentation commit ccce8dc Merge: 41f10a1 d95a677 Author: Anthony Bernardi <[email protected]> Date: Wed Aug 17 12:35:49 2022 -0400 Merge pull request #117 from Northeastern-Electric-Racing/#52-stop-self-reference-in-dependency-WP #52 stop self reference in dependency wp commit d95a677 Author: Kevin Chen <[email protected]> Date: Wed Aug 17 01:36:01 2022 -0400 #79 - changed to use existing wbs number comparision util commit 41f10a1 Merge: 960b678 76d533a Author: Anthony Bernardi <[email protected]> Date: Tue Aug 16 22:18:53 2022 -0400 Merge pull request #126 from Northeastern-Electric-Racing/#124-upcoming-deadlines-css #124 - updated home page to fix scroll commit 960b678 Merge: 7def825 c78c2de Author: Anthony Bernardi <[email protected]> Date: Tue Aug 16 22:16:41 2022 -0400 Merge pull request #127 from Northeastern-Electric-Racing/#125-fix-prettier-configs #125 fix prettier configs commit 33c6fba Author: Aritra (Ari) Saharay <[email protected]> Date: Tue Aug 16 18:14:23 2022 -0400 #84 - Added unit tests and updated Add Button behavior when readOnly commit 257ec04 Author: Aritra (Ari) Saharay <[email protected]> Date: Tue Aug 16 17:45:44 2022 -0400 #84 - Created Individual Proposed Solution Form commit 6e2e6a1 Author: Aritra (Ari) Saharay <[email protected]> Date: Tue Aug 16 14:59:08 2022 -0400 #70 - Create CR Button automatically opens the form with the 'what' section filled commit 76d533a Merge: c7aef80 7def825 Author: James C-D <[email protected]> Date: Tue Aug 16 12:57:03 2022 -0400 Merge branch 'develop' into #124-upcoming-deadlines-css commit c78c2de Merge: 930e43c 7def825 Author: James C-D <[email protected]> Date: Tue Aug 16 12:56:03 2022 -0400 Merge branch 'develop' into #125-fix-prettier-configs commit 7def825 Merge: 4cd7262 71ac95c Author: James Chang-Davidson <[email protected]> Date: Tue Aug 16 12:55:37 2022 -0400 Merge pull request #129 from Northeastern-Electric-Racing/#128-fix-name #128 - update test to FinishLine commit 71ac95c Author: James C-D <[email protected]> Date: Tue Aug 16 12:47:52 2022 -0400 #128 - update test to FinishLine commit 930e43c Author: James C-D <[email protected]> Date: Tue Aug 16 12:31:16 2022 -0400 #125 - run prettier on all files commit 4464224 Author: James C-D <[email protected]> Date: Tue Aug 16 12:30:47 2022 -0400 #125 - add file types to be formatted by prettier commit c7aef80 Author: James C-D <[email protected]> Date: Tue Aug 16 12:26:19 2022 -0400 #124 - updated home page to fix scroll commit 9b7f52f Author: Anthony Bernardi <[email protected]> Date: Sun Aug 14 23:41:39 2022 -0400 #67: added the endpoint commit d68f5b0 Author: Kevin Chen <[email protected]> Date: Fri Aug 12 16:12:38 2022 -0400 #52 - totally didn't get the issue number wrong and just reformatting commit 533cf5c Author: Kevin Chen <[email protected]> Date: Fri Aug 12 16:10:48 2022 -0400 nothing here commit c90332a Author: Kevin Chen <[email protected]> Date: Fri Aug 12 16:09:34 2022 -0400 #79 - reformat and not committing just to adhere to commit message syntax commit 28d89c5 Author: Kevin Chen <[email protected]> Date: Fri Aug 12 16:03:10 2022 -0400 switched from checking wbs object ids to checking dependency list for both creation/edting wps commit e44c27d Author: Kevin Chen <[email protected]> Date: Fri Aug 12 15:14:48 2022 -0400 Added prevention of self-reference for creation of work packages commit 500f8be Author: Kevin Chen <[email protected]> Date: Fri Aug 12 02:26:14 2022 -0400 prevents self dependency on editing, working on wp creation self dependency
- Loading branch information