Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into feature with updated package.json settings #340

Open
wants to merge 67 commits into
base: feature/update-meeting-patterns-2023
Choose a base branch
from

Conversation

SophiaSun18
Copy link
Collaborator

No description provided.

@kvlinden
Copy link
Collaborator

Is there a reason we haven't merged this branch into develop? I'm ready to do some scheduling work to help test all the changes.

@SophiaSun18
Copy link
Collaborator Author

Is there a reason we haven't merged this branch into develop? I'm ready to do some scheduling work to help test all the changes.

We created another branch from Prof. Pruim's feature branch and worked with that branch last Thursday to avoid changing Prof. Pruim's code. We merged develop into the new branch then merged the new branch back to develop to ensure nothing's broken, but then it seemed like the new feature wasn't working quite right and I'm not sure if Prof. Pruim has fixed that yet. If so we can merge this PR so you can do some testing.

@kvlinden
Copy link
Collaborator

Ah, I remember. I had the impression that Randy had sorted that problem out.
Let's talk today at 3:30 and merge (probably).

SophiaSun18 and others added 30 commits March 26, 2024 00:11
…-format

Feature/update scheduling format
Merging code from both Sophia and Faeren's branches into the Develop Branch
- Moved external user documentation to the About and Help pages.
- Distributed internal documentation between the root README (project-general development philosophy) and the Schedulizer client README (client-specific workflows)
Documentation cleanup and deployment test
Finished updating internal and external documentation
- configured Corepack and pnpm to set the correct versions of Node and pnpm
- made final edits to the client workflow documentation
- fixed the versions for 3 npm packages so that the system compiles and runs
- fixed Sam's image
All the npm package versions will need to be revisited and, perhaps, updated.
…bers

added 2024 proposal and status report
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants