diff --git a/documents/developers/fork-method.md b/documents/developers/fork-method.md new file mode 100644 index 0000000000000000000000000000000000000000..d7435511a6cca0f23eb1a587751c09bb4fcf9c0b --- /dev/null +++ b/documents/developers/fork-method.md @@ -0,0 +1,14 @@ + +# Fork Method + +The forking model of development has one major consideration: + +## MAKE MINIMAL CHANGES ONLY + +The whole point of forking is to be able to merge the change *back into* the forked project. + +When miscellaneous files (such as the README, or the docs) are changed, these will appear in the merge request. + +To avoid these unwanted changes from appearing, it is important ***to not change these files***. + +With the setup of EvaP, it is highly recommended that you use **branches** for each of your merge-requests, and use a **separate repo** for any non-critical items (documents, issues, etcetera). diff --git a/documents/discussions/2022-02-14.md b/documents/discussions/2022-02-14.md index 1f1a1660ce27691b9c10e98f47c843e247661edd..07495505a4698e40144b904157824ca8eb8cfa8a 100644 --- a/documents/discussions/2022-02-14.md +++ b/documents/discussions/2022-02-14.md @@ -1,60 +1,99 @@ ## 2022-02-14 -## Meeting Agenda -- I am glad you are all here -- I do not want to waste anyone's time - -1. [Review Notes from the Weekend](2022-02-12.md) -2. [Where do we Want Notes?](#notes-location) -3. [What are our expectations?](#expectations) -4. [Do we Understand the Repo?](#understanding-the-repo) -5. [What working style do we want to follow? (Branches, Work Days)](#working-style) -6. [What Notifications do we want?](#notifications) -7. [More Repo Setup](#more-repo-setup) -8. [Going Forward](#going-forward) - -## Notes Location -- Peter: Have noticed that no-one else is using the OneNote notebook -- Peter: Would we like to consolidate our notes into the [repo/docs folder](https://gitlab.cci.drexel.edu/courseeval/team-blue/-/tree/main/documents) from now on? -- Peter: Still intend to keep any "sensitive" notes only in the OneNote notebook and the Teams for any Documents - -## Expectations -- Peter: What do you guys want from this project? -- Peter: Need way better deadlines - -## Understanding the Repo -- Documents/Decisions -- Documents/Developers/Contributing -- Documents/Developers/Conduct - -## Working Style -- Peter: How do we want to work on this? -- Peter: I do not want to be stuck with it - -## Notifications -- Peter: I added a Discord Bot because I noticed no one received any notifications via email -- See for Help: [Discord Notifications service | GitLab](https://docs.gitlab.com/ee/user/project/integrations/discord_notifications.html) -- See for Help: [Discord Notifications · Integrations · Settings · CourseEval / Team Blue · GitLab (drexel.edu)](https://gitlab.cci.drexel.edu/courseeval/team-blue/-/integrations/discord/edit) - -## More Repo Setup -- Peter: [Created a Fork of EvaP for all CourseEval to use](https://gitlab.cci.drexel.edu/courseeval/EvaP) and [added it as a submodule within our own project](https://gitlab.cci.drexel.edu/courseeval/team-blue/-/commit/0e38f3133f56813beb9c62f9a05340d3f1de9309) -- See for Help: [How do I work with a git repository within another repository?](https://stackoverflow.com/questions/1811730/how-do-i-work-with-a-git-repository-within-another-repository) -- See for Help: [! [remote rejected] errors after mirroring a git repository](https://stackoverflow.com/questions/34265266/remote-rejected-errors-after-mirroring-a-git-repository) -- Peter: [Created branch `docs`]() - -## Going Forward - -### Not enough time to spend time investigating and voting -- Peter: [Played around with Sakai at this URL](https://experimental.nightly.sakaiproject.org/portal/site/99949356-ae19-41c3-9bf8-67a704c47e44/tool/f123b3d2-d816-4531-97db-094e629767e9/add) - - (Username: `pjm`, Password: `12345`) -- Peter: See the "Tests & Quizzes" tab for the "Evaluation" -- Peter: I think the evaluation system only works from inside Sakai (lot of system to support for one feature) -- Peter: Their form-builder also appears to be lacking -- Peter: As such, I do not recommend us trying to contribute to it - -### Need Better Issue Templates -- Peter: I can spend time on this, what would we like on it? - -### Reaching out to the University of Potsdam -- Peter: I intend to do this, any considerations/objections? +## Context +- Started: 2022-02-14T15:00:00-04:00 +- Ended: 2022-02-14T15:33:00-04:00 + +> ## Meeting Agenda +> - I am glad you are all here +> - I do not want to waste anyone's time + +> 1. [Review Notes from the Weekend](2022-02-12.md) +> 2. [Where do we Want Notes?](#notes-location) +> 3. [What are our expectations?](#expectations) +> 4. [Do we Understand the Repo?](#understanding-the-repo) +> 5. [What working style do we want to follow? (Branches, Work Days)](#working-style) +> 6. [What Notifications do we want?](#notifications) +> 7. [More Repo Setup](#more-repo-setup) +> 8. [Going Forward](#going-forward) + +> ## Notes Location +> - Peter: Have noticed that no-one else is using the OneNote notebook +> - Peter: Would we like to consolidate our notes into the [repo/docs folder](https://gitlab.cci.drexel.edu/courseeval/team-blue/-/tree/main/documents) from now on? +> - Peter: Still intend to keep any "sensitive" notes only in the OneNote notebook and the Teams for any Documents + +- Hoang: Please use OneNote +- Jay: Just post the link for today's note in the Discord +- Todo: (Peter) Move *this* note to OneNote +- Todo: (Peter) Move *all* notes to OneNote + +> ## Expectations +> - Peter: What do you guys want from this project? +> - Peter: Need way better deadlines + +- Peter: Do not want to be waiting till last minute and being only one +- All: Ok with setting deadlines in Outlook + +> ## Understanding the Repo +> - Documents/Decisions +> - Documents/Developers/Contributing +> - Documents/Developers/Conduct + +- Peter: I am just doing this to meet the professor's requirement + +> ## Working Style +> - Peter: How do we want to work on this? +> - Peter: I do not want to be stuck with it + +- Peter: (All) please complete the weekly when2meet +- Peter: (All) is everyone ok with working with Git, and specifically branches? +- Eric: I would like some help +- Peter: (Makes Diagram) +- Peter: I am available for peer-coding, please ask (took me 2 years to get comfortable with this) + + + +> ## Notifications +> - Peter: I added a Discord Bot because I noticed no one received any notifications via email +> - See for Help: [Discord Notifications service | GitLab](https://docs.gitlab.com/ee/user/project/integrations/discord_notifications.html) +> - See for Help: [Discord Notifications · Integrations · Settings · CourseEval / Team Blue · GitLab (drexel.edu)](https://gitlab.cci.drexel.edu/courseeval/team-blue/-/integrations/discord/edit) + +- Eric: I did not receive any notifications via email +- All: Is ok with having a discord bot + +> ## More Repo Setup +> - Peter: [Created a Fork of EvaP for all CourseEval to use](https://gitlab.cci.drexel.edu/courseeval/EvaP) and [added it as a submodule within our own project](https://gitlab.cci.drexel.edu/courseeval/team-blue/-/commit/0e38f3133f56813beb9c62f9a05340d3f1de9309) +> - See for Help: [How do I work with a git repository within another repository?](https://stackoverflow.com/questions/1811730/how-do-i-work-with-a-git-repository-within-another-repository) +> - See for Help: [! [remote rejected] errors after mirroring a git repository](https://stackoverflow.com/questions/34265266/remote-rejected-errors-after-mirroring-a-git-repository) +> - Peter: [Created branch `docs`]() + +- Peter: `dev` and `doc` branches unnecessary, will remove (from team-blue) +- Peter: (Forking model - might need better explanation) + +> ## Going Forward +> +> ### Not enough time to spend time investigating and voting +> - Peter: [Played around with Sakai at this URL](https://experimental.nightly.sakaiproject.org/portal/site/99949356-ae19-41c3-9bf8-67a704c47e44/tool/f123b3d2-d816-4531-97db-094e629767e9/add) +> - (Username: `pjm`, Password: `12345`) +> - Peter: See the "Tests & Quizzes" tab for the "Evaluation" +> - Peter: I think the evaluation system only works from inside Sakai (lot of system to support for one feature) +> - Peter: Their form-builder also appears to be lacking +> - Peter: As such, I do not recommend us trying to contribute to it +> +> ### Need Better Issue Templates +> - Peter: I can spend time on this, what would we like on it? +> +> ### Reaching out to the University of Potsdam +> - Peter: I intend to do this, any considerations/objections? + +### Meeting Notes +- Peter: I will write an email this evening +- Peter: Please look at the "`simple`" issues on the EvaP project and find ones that interest you +- Peter: Then write them up in the "Issues" on our repository + +## Miscellaneous +- Peter: Gitlab has a "milestones" feature that can globally set a deadline for all issues +- Peter: Everyone can set their own deadlines in their own issues +- Peter: I am trying **not to assign issues to anyone** so that **each person** can choose **their own issues** and handle **assigning it to themselves** +- Peter: I have been doing this so you can manage yourselves, my apologies if this was ever unclear diff --git a/documents/resources/2022-02-14.git-workflow.png b/documents/resources/2022-02-14.git-workflow.png new file mode 100644 index 0000000000000000000000000000000000000000..d6b7fcf1a55fa958a24b61ea131fc547b6772922 Binary files /dev/null and b/documents/resources/2022-02-14.git-workflow.png differ