From d9ee70ce24b3eeda74bf24f123e3e95adab5f83b Mon Sep 17 00:00:00 2001 From: CassandraSehic <95361457+CassandraSehic@users.noreply.github.com> Date: Wed, 15 Feb 2023 13:36:24 -0500 Subject: [PATCH 001/116] Update issue templates --- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index ff68fa38..b600819a 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,7 +2,7 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: Things I learned +labels: '' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md new file mode 100644 index 00000000..65c8a223 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -0,0 +1,10 @@ +--- +name: Things I want to know +about: Describe this issue template's purpose here. +title: '' +labels: wanttoknow +assignees: '' + +--- + +Add an item you want to learn From a34edb69bf34161a3a0fb2354c9d9dc413eb0fda Mon Sep 17 00:00:00 2001 From: CassandraSehic <95361457+CassandraSehic@users.noreply.github.com> Date: Wed, 15 Feb 2023 13:37:34 -0500 Subject: [PATCH 002/116] Update issue templates --- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 2 +- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index e1bf9d35..55ba2f81 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -2,7 +2,7 @@ name: Things I don't understand about: Please add one item that you don't understand title: "[Don't Understand]" -labels: '' +labels: donotknow assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index b600819a..2807eb3d 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,7 +2,7 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: '' +labels: know assignees: '' --- From 1bb7ed75e7fae8d0c0630d41377a0dd79221ada3 Mon Sep 17 00:00:00 2001 From: CassandraSehic Date: Fri, 17 Feb 2023 12:03:13 -0500 Subject: [PATCH 003/116] syncing vs merging --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a14527b..3c9ee34e 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,6 @@ Collaborating on GitHub: ### Things you understand so far 1. Add items to the list ### Things you don't understand about what we are doing / web development. -1. Add items to the list +1. syncing vs merging ### Things you want to know next 1. How to connect viewjs to elastic search From da168ff04c9e5194248fd25fd5ae0d5a3d451129 Mon Sep 17 00:00:00 2001 From: CassandraSehic Date: Fri, 17 Feb 2023 12:16:47 -0500 Subject: [PATCH 004/116] the process of resolving merge conflicts --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3c9ee34e..136b8eb4 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,6 @@ Collaborating on GitHub: 1. Add items to the list ### Things you don't understand about what we are doing / web development. 1. syncing vs merging +2. the proccess of resolving merge conflicts ### Things you want to know next 1. How to connect viewjs to elastic search From 9e301f7e573d000badac60549847edd536f7ca5e Mon Sep 17 00:00:00 2001 From: CassandraSehic Date: Fri, 17 Feb 2023 12:27:21 -0500 Subject: [PATCH 005/116] things I learned --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 136b8eb4..17e2607b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,9 @@ Collaborating on GitHub: ## Put your items here ### Things you understand so far -1. Add items to the list +1. How to create a new branch +2. How to switch branches +3. How to push using gui in vscode ### Things you don't understand about what we are doing / web development. 1. syncing vs merging 2. the proccess of resolving merge conflicts From c514bf993e1b4c83fb46bc5ad7b4e6023189a166 Mon Sep 17 00:00:00 2001 From: CassandraSehic Date: Fri, 17 Feb 2023 12:36:20 -0500 Subject: [PATCH 006/116] things i want to learn --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 17e2607b..eca2a248 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,5 @@ Collaborating on GitHub: 2. the proccess of resolving merge conflicts ### Things you want to know next 1. How to connect viewjs to elastic search +2. Browser dev tools +3. Authentication From dabd83f2c1fcbb6c2cee7fd8b73a6c781b0c3bd6 Mon Sep 17 00:00:00 2001 From: CassandraSehic Date: Fri, 17 Feb 2023 12:41:31 -0500 Subject: [PATCH 007/116] do not know --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index eca2a248..6b7ac09d 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ Collaborating on GitHub: ### Things you don't understand about what we are doing / web development. 1. syncing vs merging 2. the proccess of resolving merge conflicts +3. watchtower ### Things you want to know next 1. How to connect viewjs to elastic search 2. Browser dev tools From 3afd5866ce3fa8c308e9f10d6e4a0ffa1d9e403f Mon Sep 17 00:00:00 2001 From: Flx232 <98140466+Flx232@users.noreply.github.com> Date: Fri, 17 Feb 2023 13:26:04 -0500 Subject: [PATCH 008/116] Update issue templates --- .github/ISSUE_TEMPLATE/completed-lists.md | 2 +- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 4 ++-- .github/ISSUE_TEMPLATE/things-i-learned.md | 4 ++-- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/completed-lists.md index c5cea21c..598dcc23 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/completed-lists.md @@ -2,7 +2,7 @@ name: Completed Lists about: This is for your master pull request to merge your master into this repo. title: Put your UCID as the title (replace this text) -labels: Compiled List +labels: '' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 472a5362..f948e0b7 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -2,8 +2,8 @@ name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' -labels: Things I Don't Understand -assignees: '' +labels: Don't Understand +assignees: Flx232 --- diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index ff68fa38..3131aa44 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,8 +2,8 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: Things I learned -assignees: '' +labels: Understand +assignees: Flx232 --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index 025fa8f1..d284b360 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -2,8 +2,8 @@ name: Things I want to know about: Describe this issue template's purpose here. title: 'Thing I want to know: [Thing I want to Knows]' -labels: Things I learned -assignees: '' +labels: Want to learn +assignees: Flx232 --- From 1cc2e646ee34a75fdbf871894ce1eb8665816f1c Mon Sep 17 00:00:00 2001 From: Flx232 <98140466+Flx232@users.noreply.github.com> Date: Fri, 17 Feb 2023 20:33:27 -0500 Subject: [PATCH 009/116] Update issue templates --- .../{completed-lists.md => master-pull-request.md} | 4 ++-- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 2 +- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename .github/ISSUE_TEMPLATE/{completed-lists.md => master-pull-request.md} (85%) diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/master-pull-request.md similarity index 85% rename from .github/ISSUE_TEMPLATE/completed-lists.md rename to .github/ISSUE_TEMPLATE/master-pull-request.md index 598dcc23..7c6fcbab 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -1,8 +1,8 @@ --- -name: Completed Lists +name: Master Pull Request about: This is for your master pull request to merge your master into this repo. title: Put your UCID as the title (replace this text) -labels: '' +labels: compiled list assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index f948e0b7..1c8839ab 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -3,7 +3,7 @@ name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' labels: Don't Understand -assignees: Flx232 +assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index 3131aa44..5067d329 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -3,7 +3,7 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" labels: Understand -assignees: Flx232 +assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index d284b360..2ae2f123 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -3,7 +3,7 @@ name: Things I want to know about: Describe this issue template's purpose here. title: 'Thing I want to know: [Thing I want to Knows]' labels: Want to learn -assignees: Flx232 +assignees: '' --- From 712b356f6bc2459d087728c5e9ad11d530900df6 Mon Sep 17 00:00:00 2001 From: Flx232 <98140466+Flx232@users.noreply.github.com> Date: Fri, 17 Feb 2023 20:37:05 -0500 Subject: [PATCH 010/116] Update issue templates --- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index 5067d329..ae66bcd3 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -7,4 +7,4 @@ assignees: '' --- -Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. +I understand diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index 2ae2f123..7bed5a1c 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -7,4 +7,4 @@ assignees: '' --- -Please describe what you want to know in less than 255 characters. +I want to know From d946cb200838cb821dc48e1b24a9cc56e4b88679 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 21:57:22 -0500 Subject: [PATCH 011/116] added something to Things we don't understand list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b49fb1d..07aa13d6 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Linux Directory listing[2] 3. Docker Installation[1] #### Things we don't understand -1. Git Stash[1] +1. sql and database 2. GIt pull[2] 3. GIT status[1] #### Things we want to know next** From 79df33090f4020038268dff1dad62ef055e576d9 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:03:50 -0500 Subject: [PATCH 012/116] added linux terimal and bash to things we understand list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b49fb1d..bb8dce74 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Your list should look like this: #### Things we understand** -1. Python Print[1] +1. Linux terminal and bash 2. Linux Directory listing[2] 3. Docker Installation[1] #### Things we don't understand From 799f8bf23cbf6839c7080550af19062170d6b7ff Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:09:43 -0500 Subject: [PATCH 013/116] added web maintenance and security to things we want to know next list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b49fb1d..5a306ba1 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. GIt pull[2] 3. GIT status[1] #### Things we want to know next** -1. Elastic Search Indexing [1] +1. web maintenance and security 2. Cloud deployment with Kubernetes[2] 3. Teraform[1] From 6c0ff54e854e50b5041eee7794c9a92d447ab554 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:10:47 -0500 Subject: [PATCH 014/116] added web maintenance and security to things we want to know next list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a306ba1..7b03f899 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. GIt pull[2] 3. GIT status[1] #### Things we want to know next** -1. web maintenance and security +1. web maintenance & security 2. Cloud deployment with Kubernetes[2] 3. Teraform[1] From 8b557a612458a0ab59c48341aa05b9beb1f1be06 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:13:51 -0500 Subject: [PATCH 015/116] added traefik to things we don't understand list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b49fb1d..790f98c9 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. Docker Installation[1] #### Things we don't understand 1. Git Stash[1] -2. GIt pull[2] +2. traefik 3. GIT status[1] #### Things we want to know next** 1. Elastic Search Indexing [1] From a9b7930f96f94304f9e262c411fbd3ed7a924bdd Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:19:24 -0500 Subject: [PATCH 016/116] added javascript to things we don't understand list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b49fb1d..4723dd53 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Linux Directory listing[2] 3. Docker Installation[1] #### Things we don't understand -1. Git Stash[1] +1. Javascript 2. GIt pull[2] 3. GIT status[1] #### Things we want to know next** From da305ea66cebb7689e541ae4a41cea4ba42582f9 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:26:05 -0500 Subject: [PATCH 017/116] added python libraries to things we understood list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73e97548..c7733342 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Your list should look like this: #### Things we understand** 1. Linux terminal and bash -2. Linux Directory listing[2] +2. Python Libraries 3. Docker Installation[1] #### Things we don't understand 1. sql and database From 891bcc146490013e02cccc387dce8e5c459bd05e Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:26:41 -0500 Subject: [PATCH 018/116] added python libraries to things we understood list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7733342..4d0acf59 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Your list should look like this: #### Things we understand** 1. Linux terminal and bash -2. Python Libraries +2. Python libraries 3. Docker Installation[1] #### Things we don't understand 1. sql and database From 69e60a39c490e4bb856dc0fee6d57fa3559ab802 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:35:00 -0500 Subject: [PATCH 019/116] added set up an oracle server in things we understand list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d0acf59..11c88244 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we understand** 1. Linux terminal and bash 2. Python libraries -3. Docker Installation[1] +3. Set up an oracle server #### Things we don't understand 1. sql and database 2. traefik From 8c01b2eda5c1e9ea9e548db47673a29dd3e696ad Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:36:47 -0500 Subject: [PATCH 020/116] added kubernetes to things we want to know next list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11c88244..81fdbb75 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. Javascript #### Things we want to know next** 1. web maintenance & security -2. Cloud deployment with Kubernetes[2] +2. Kubernetes 3. Teraform[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL From 44c46ec6d9f7826eebcf2ed620458b47120eaa79 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:39:43 -0500 Subject: [PATCH 021/116] added kubernetes to things we want to know next list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81fdbb75..42bb27bf 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Python libraries 3. Set up an oracle server #### Things we don't understand -1. sql and database +1. Sql and database 2. traefik 3. Javascript #### Things we want to know next** From 80adf31e3fb557f1a25e28490d5f4ead0b560033 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:40:22 -0500 Subject: [PATCH 022/116] added kubernetes to things we want to know next list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42bb27bf..81fdbb75 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Python libraries 3. Set up an oracle server #### Things we don't understand -1. Sql and database +1. sql and database 2. traefik 3. Javascript #### Things we want to know next** From 69aeabf25002f3e984c37c643f8c8bb654e5fd90 Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:42:42 -0500 Subject: [PATCH 023/116] added kubernetes to things we want to know next list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81fdbb75..42bb27bf 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Python libraries 3. Set up an oracle server #### Things we don't understand -1. sql and database +1. Sql and database 2. traefik 3. Javascript #### Things we want to know next** From 33fffbc1754c83391d910810e990f1b8854d866f Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:44:21 -0500 Subject: [PATCH 024/116] added kubernetes to things we want to know next list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42bb27bf..81fdbb75 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Python libraries 3. Set up an oracle server #### Things we don't understand -1. Sql and database +1. sql and database 2. traefik 3. Javascript #### Things we want to know next** From 40d7b5ad1285ac9177cff41a5a33540338fc0f4f Mon Sep 17 00:00:00 2001 From: Frank Xu Date: Fri, 17 Feb 2023 22:47:08 -0500 Subject: [PATCH 025/116] added write dockerfile to things we want to know next --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81fdbb75..49e6b9b7 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we want to know next** 1. web maintenance & security 2. Kubernetes -3. Teraform[1] +3. Write Dockerfile ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From ef2249abe60cce2ac4f62adad91d526191453c2d Mon Sep 17 00:00:00 2001 From: ddf-26 <99435616+ddf-26@users.noreply.github.com> Date: Sun, 19 Feb 2023 14:11:05 -0500 Subject: [PATCH 026/116] Update issue templates --- .../ISSUE_TEMPLATE/{completed-lists.md => master-lists.md} | 4 ++-- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 4 ++-- .github/ISSUE_TEMPLATE/things-i-learned.md | 4 ++-- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) rename .github/ISSUE_TEMPLATE/{completed-lists.md => master-lists.md} (86%) diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/master-lists.md similarity index 86% rename from .github/ISSUE_TEMPLATE/completed-lists.md rename to .github/ISSUE_TEMPLATE/master-lists.md index c5cea21c..7b667bae 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/master-lists.md @@ -1,8 +1,8 @@ --- -name: Completed Lists +name: Master Lists about: This is for your master pull request to merge your master into this repo. title: Put your UCID as the title (replace this text) -labels: Compiled List +labels: Master List assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 472a5362..3c2d66cf 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -2,9 +2,9 @@ name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' -labels: Things I Don't Understand +labels: Things I don't know assignees: '' --- -I don't understand +I don't understand: diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index ff68fa38..91b53f5b 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,9 +2,9 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: Things I learned +labels: Things I know assignees: '' --- -Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. +Please add one item that you learned: diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index 025fa8f1..70816fd3 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -1,10 +1,10 @@ --- name: Things I want to know about: Describe this issue template's purpose here. -title: 'Thing I want to know: [Thing I want to Knows]' -labels: Things I learned +title: "[Thing I want to Know]" +labels: Things I want to learn assignees: '' --- -Please describe what you want to know in less than 255 characters. +Please describe what you want to know in less than 255 characters: From 9527e951edc692ed83d30b98b94ebce498cfa150 Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 14:47:19 -0500 Subject: [PATCH 027/116] added pull request to things we understand --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b49fb1d..1afc88c2 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Your list should look like this: #### Things we understand** -1. Python Print[1] +1. Pull Request[1] 2. Linux Directory listing[2] 3. Docker Installation[1] #### Things we don't understand From cf452f2dc7290d7a9d5862da58330f49c1da79b8 Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 15:40:37 -0500 Subject: [PATCH 028/116] added git rebase to things we dont understand --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1afc88c2..a18930df 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Linux Directory listing[2] 3. Docker Installation[1] #### Things we don't understand -1. Git Stash[1] +1. Git Rebase[1] 2. GIt pull[2] 3. GIT status[1] #### Things we want to know next** From 655d641c7db2c1795c5b27c1da13bf1d8a3e5f72 Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 15:55:55 -0500 Subject: [PATCH 029/116] added git track to things we dont understand --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a18930df..13d99139 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. Docker Installation[1] #### Things we don't understand 1. Git Rebase[1] -2. GIt pull[2] +2. GIt Track[1] 3. GIT status[1] #### Things we want to know next** 1. Elastic Search Indexing [1] From e508810c97e4df644e8c1a571c229f158d031dc0 Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 16:31:43 -0500 Subject: [PATCH 030/116] added git cherry-pick to things we dont understand --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13d99139..795d5f96 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we don't understand 1. Git Rebase[1] 2. GIt Track[1] -3. GIT status[1] +3. Git Cherry-pick[1] #### Things we want to know next** 1. Elastic Search Indexing [1] 2. Cloud deployment with Kubernetes[2] From 3f569f2b572c51e7c207ed3df70b36e58d735992 Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 16:59:49 -0500 Subject: [PATCH 031/116] added git push to things we understand --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 795d5f96..21cc2267 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Your list should look like this: #### Things we understand** 1. Pull Request[1] -2. Linux Directory listing[2] +2. Git Push[1] 3. Docker Installation[1] #### Things we don't understand 1. Git Rebase[1] From 95b40d4b47c81e3650d0ebe448e1a5caba859f3a Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 17:05:12 -0500 Subject: [PATCH 032/116] added git commit to thins we understand --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21cc2267..027f57fb 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we understand** 1. Pull Request[1] 2. Git Push[1] -3. Docker Installation[1] +3. Git Commit[1] #### Things we don't understand 1. Git Rebase[1] 2. GIt Track[1] From feb89fe6900faf3ab35fe5558220f6499584308b Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 17:27:36 -0500 Subject: [PATCH 033/116] added django to things we want to know next --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 027f57fb..51d68ea2 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. GIt Track[1] 3. Git Cherry-pick[1] #### Things we want to know next** -1. Elastic Search Indexing [1] +1. Django [1] 2. Cloud deployment with Kubernetes[2] 3. Teraform[1] From 788cff8018838c8ccc753defbfcb543438fb2d7c Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 18:21:06 -0500 Subject: [PATCH 034/116] added OpenStack to things we want to know --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51d68ea2..49a2c469 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. Git Cherry-pick[1] #### Things we want to know next** 1. Django [1] -2. Cloud deployment with Kubernetes[2] +2. OpenStack[1] 3. Teraform[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL From 6400e358fd376c09bc23c66fcd5e4e5a8e50a90d Mon Sep 17 00:00:00 2001 From: davidfelix Date: Sun, 19 Feb 2023 18:54:29 -0500 Subject: [PATCH 035/116] added Ceph to things we want to know --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49a2c469..58414e53 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we want to know next** 1. Django [1] 2. OpenStack[1] -3. Teraform[1] +3. Ceph[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 2b04cd2db3f7fe9f2a50e7e40b9756dea5cd3fca Mon Sep 17 00:00:00 2001 From: CassandraSehic Date: Mon, 20 Feb 2023 20:53:45 -0500 Subject: [PATCH 036/116] kubernetes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b7ac09d..af93578a 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,6 @@ Collaborating on GitHub: 2. the proccess of resolving merge conflicts 3. watchtower ### Things you want to know next -1. How to connect viewjs to elastic search +1. Kubernetes 2. Browser dev tools 3. Authentication From 70263278e708bde47b729c5c550eb0d88f2ec0a0 Mon Sep 17 00:00:00 2001 From: Doron <70930396+TheDiamondSkyv32@users.noreply.github.com> Date: Wed, 22 Feb 2023 13:24:19 -0500 Subject: [PATCH 037/116] Update issue templates --- .../{completed-lists.md => master-pull-request.md} | 10 +++------- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 2 +- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) rename .github/ISSUE_TEMPLATE/{completed-lists.md => master-pull-request.md} (68%) diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/master-pull-request.md similarity index 68% rename from .github/ISSUE_TEMPLATE/completed-lists.md rename to .github/ISSUE_TEMPLATE/master-pull-request.md index c5cea21c..f8a8cfb1 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -1,14 +1,10 @@ --- -name: Completed Lists -about: This is for your master pull request to merge your master into this repo. +name: Master Pull Request +about: This is for your master pull request to merge your master into this repo title: Put your UCID as the title (replace this text) labels: Compiled List assignees: '' --- -You need to make a pull request and add the link to the pull request to this issue when you submit. - -PULL REQUEST LINK: - -UCID: +You need to make a pull request and add the link to the pull request to this issue when you submit. diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 472a5362..f7932d52 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -2,7 +2,7 @@ name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' -labels: Things I Don't Understand +labels: Things I Don't Know assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index ff68fa38..d414666d 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,7 +2,7 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: Things I learned +labels: Things I Know assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index 025fa8f1..d94252a0 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -2,7 +2,7 @@ name: Things I want to know about: Describe this issue template's purpose here. title: 'Thing I want to know: [Thing I want to Knows]' -labels: Things I learned +labels: Things I Want To Know assignees: '' --- From 375e8517ffc338c3f4f9f06f4d7811218cfbe46c Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Wed, 22 Feb 2023 13:44:37 -0500 Subject: [PATCH 038/116] added what i don't know to list --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 0b49fb1d..a7565eb8 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. You will learn to manage a basic project using GitHub Project. ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. +## Put your items here +### Things you understand so far +### Things you don't understand about what we are doing +1. I am lost on hows to pro-Docker +### Things you want to know next ### Your list should look like this: #### Things we understand** From 59cc9ad361d4c26c8aa88e80eea5fde92e8fc12c Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Wed, 22 Feb 2023 13:55:22 -0500 Subject: [PATCH 039/116] fixing base readme file --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 0b49fb1d..a7565eb8 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,11 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. You will learn to manage a basic project using GitHub Project. ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. +## Put your items here +### Things you understand so far +### Things you don't understand about what we are doing +1. I am lost on hows to pro-Docker +### Things you want to know next ### Your list should look like this: #### Things we understand** From 630de5d1e82c57d9db8edd6fab9b87513e41a5ab Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Wed, 22 Feb 2023 13:56:23 -0500 Subject: [PATCH 040/116] added another item to list --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0b49fb1d..bf92d955 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. You will learn to manage a basic project using GitHub Project. ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. +## Put your items here +### Things you understand so far +### Things you don't understand about what we are doing +1. I am lost on hows to pro-Docker +2. I am lost on hows to pro-Linux +### Things you want to know next ### Your list should look like this: #### Things we understand** From 5a39dbd9a553f6bd7b1f57e54555a206ed7daec3 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Wed, 22 Feb 2023 14:01:33 -0500 Subject: [PATCH 041/116] added last item for 'don't know' list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bf92d955..98cbc4ad 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux +3. I am lost on hows to setup my domain name with my Oracle account ### Things you want to know next ### Your list should look like this: From c57e4ebe340a59a67ffd5ba652d856028058dc79 Mon Sep 17 00:00:00 2001 From: kaw393939 Date: Wed, 22 Feb 2023 16:34:19 -0500 Subject: [PATCH 042/116] Revert "Merge pull request #128 from jidone7061/main" This reverts commit ec83353c9efdcfb0450f43c4c5bc287da87e473c, reversing changes made to 0745d4df3b9ee24094b7c68d16562e838aa1e192. --- .github/ISSUE_TEMPLATE/bcs25.md | 10 ---- .github/ISSUE_TEMPLATE/complete-list.md | 10 ---- .github/ISSUE_TEMPLATE/completed-lists.md | 5 +- .github/ISSUE_TEMPLATE/master-list.md | 10 ---- .github/ISSUE_TEMPLATE/master-pull-request.md | 11 ----- ...rstand.md => things-i-don-t-understand.md} | 4 +- .../{things-i-know.md => things-i-learned.md} | 4 +- ...-know-next.md => things-i-want-to-know.md} | 6 +-- .../ISSUE_TEMPLATE/things-we-understand.md | 10 ---- README.md | 49 ++++--------------- 10 files changed, 20 insertions(+), 99 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bcs25.md delete mode 100644 .github/ISSUE_TEMPLATE/complete-list.md delete mode 100644 .github/ISSUE_TEMPLATE/master-list.md delete mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md rename .github/ISSUE_TEMPLATE/{things-we-don-t-understand.md => things-i-don-t-understand.md} (68%) rename .github/ISSUE_TEMPLATE/{things-i-know.md => things-i-learned.md} (85%) rename .github/ISSUE_TEMPLATE/{things-we-want-to-know-next.md => things-i-want-to-know.md} (50%) delete mode 100644 .github/ISSUE_TEMPLATE/things-we-understand.md diff --git a/.github/ISSUE_TEMPLATE/bcs25.md b/.github/ISSUE_TEMPLATE/bcs25.md deleted file mode 100644 index 51785f76..00000000 --- a/.github/ISSUE_TEMPLATE/bcs25.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: bcs25 -about: Describe this issue template's purpose here. -title: '' -labels: '' -assignees: '' - ---- - - diff --git a/.github/ISSUE_TEMPLATE/complete-list.md b/.github/ISSUE_TEMPLATE/complete-list.md deleted file mode 100644 index 5ccd425b..00000000 --- a/.github/ISSUE_TEMPLATE/complete-list.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Complete List -about: Sending to upstream Repo -title: Use UCID -labels: Complete List -assignees: '' - ---- - - diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/completed-lists.md index e7796b43..c5cea21c 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/completed-lists.md @@ -2,9 +2,10 @@ name: Completed Lists about: This is for your master pull request to merge your master into this repo. title: Put your UCID as the title (replace this text) +labels: Compiled List +assignees: '' -labels: '' - +--- You need to make a pull request and add the link to the pull request to this issue when you submit. diff --git a/.github/ISSUE_TEMPLATE/master-list.md b/.github/ISSUE_TEMPLATE/master-list.md deleted file mode 100644 index c222948d..00000000 --- a/.github/ISSUE_TEMPLATE/master-list.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Master List -about: Describe this issue template's purpose here. -title: '' -labels: Master List -assignees: '' - ---- - -This is the master list for the ideas diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md deleted file mode 100644 index 475bc47c..00000000 --- a/.github/ISSUE_TEMPLATE/master-pull-request.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: Master Pull Request - - -about: This is for your master pull request to merge your master into this repo. -title: bcs25 - - - -You need to make a pull request snd add the link to the pull request to the issue when you submit. - diff --git a/.github/ISSUE_TEMPLATE/things-we-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md similarity index 68% rename from .github/ISSUE_TEMPLATE/things-we-don-t-understand.md rename to .github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 60a3fea9..472a5362 100644 --- a/.github/ISSUE_TEMPLATE/things-we-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -1,8 +1,8 @@ --- -name: Things we don't understand +name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' -labels: '' +labels: Things I Don't Understand assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-know.md b/.github/ISSUE_TEMPLATE/things-i-learned.md similarity index 85% rename from .github/ISSUE_TEMPLATE/things-i-know.md rename to .github/ISSUE_TEMPLATE/things-i-learned.md index 3bcf609a..ff68fa38 100644 --- a/.github/ISSUE_TEMPLATE/things-i-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -1,8 +1,8 @@ --- -name: Things I know +name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: '' +labels: Things I learned assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md similarity index 50% rename from .github/ISSUE_TEMPLATE/things-we-want-to-know-next.md rename to .github/ISSUE_TEMPLATE/things-i-want-to-know.md index 97638fe3..025fa8f1 100644 --- a/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -1,8 +1,8 @@ --- -name: Things we want to know next +name: Things I want to know about: Describe this issue template's purpose here. -title: 'Thing we want to know: [Thing we want to Knows]' -labels: Thing we want to know next +title: 'Thing I want to know: [Thing I want to Knows]' +labels: Things I learned assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-we-understand.md b/.github/ISSUE_TEMPLATE/things-we-understand.md deleted file mode 100644 index ac9b6d60..00000000 --- a/.github/ISSUE_TEMPLATE/things-we-understand.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things we understand -about: Add one item for each thing you learned keep to max of 255 characters -title: "[Things we understand]" -labels: Thing we understand -assignees: '' - ---- - -Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. diff --git a/README.md b/README.md index 23720273..0b49fb1d 100644 --- a/README.md +++ b/README.md @@ -9,50 +9,21 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. You will learn to merge pull requests and resolve merge conflicts 3. You will learn to manage a basic project using GitHub Project. -### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritize each issue. +### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. ### Your list should look like this: #### Things we understand** - - -1. git status [1] -2. git fetch [1] -3. git checkout [1] -4. Docker Setup[4] -5. Linux command[1] -6. I learned Python Pytest[1] -7. Create new branch and merge within my own repo[1] -8. Cloning Repository[2] -9. Python is integrated into pycharm[1] -10. Pycharm and Github workflow and integration process[1] -11. Create new branch and merge within my own repo[1] - +1. Python Print[1] +2. Linux Directory listing[2] +3. Docker Installation[1] #### Things we don't understand -1. Clarity on who Merges a pull request [1] -2. Difference between Docker build & Docker compose [1] -3. How docker pushes to dockerhub [1] -4. Git rebase Usage[1] -5. Git Stash Usage[1] -6. Git show Usage[1] -7. Undo specific git commit or git push[2] -8. Git Pull[2] -9. Docker Storage space limitation[2] -10. dockerization[1] -11. Git Push[1] -12. Teraform[1] -12. Cloud deployment with Kubernetes[1] - - +1. Git Stash[1] +2. GIt pull[2] +3. GIT status[1] #### Things we want to know next** -1. How to better work as a PM or as a subordinate [1] -2. Use Python program to write Hello World [1] -3. How Dockerhub pushes or uses resources against repos in scalable way [1] -4. How to deploy a web app with a database on the cloud [1] -5. Cloud deployment with Kubernetes[3] -6. Teraform Usage[3] -7. Elastic Search Indexing[3] -8. Security within our Github and Docker workflow[1] -9. Linux Directory Listings[1] +1. Elastic Search Indexing [1] +2. Cloud deployment with Kubernetes[2] +3. Teraform[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 3a7d477c6038d4361d5fd4766688a8e18d5bafa5 Mon Sep 17 00:00:00 2001 From: baileychant <91162434+baileychant@users.noreply.github.com> Date: Wed, 22 Feb 2023 18:24:48 -0500 Subject: [PATCH 043/116] Update issue templates --- .../{things-i-learned.md => things-i-know.md} | 4 ++-- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) rename .github/ISSUE_TEMPLATE/{things-i-learned.md => things-i-know.md} (85%) create mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-know.md similarity index 85% rename from .github/ISSUE_TEMPLATE/things-i-learned.md rename to .github/ISSUE_TEMPLATE/things-i-know.md index ff68fa38..3bcf609a 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-know.md @@ -1,8 +1,8 @@ --- -name: Things I learned +name: Things I know about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: Things I learned +labels: '' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md new file mode 100644 index 00000000..bae5cbdf --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -0,0 +1,10 @@ +--- +name: Things I want to know +about: Describe this issue template's purpose here. +title: '' +labels: '' +assignees: '' + +--- + + From c89c64ee2987c4954c10eeb7b390eede5428e47f Mon Sep 17 00:00:00 2001 From: baileychant <91162434+baileychant@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:20:22 -0500 Subject: [PATCH 044/116] Update issue templates --- .github/ISSUE_TEMPLATE/master-pull-request.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 2 +- .github/ISSUE_TEMPLATE/things-i-know.md | 2 +- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md new file mode 100644 index 00000000..525acf33 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -0,0 +1,10 @@ +--- +name: Master Pull Request +about: This is for your master pull request to merge your master into this repo. +title: '' +labels: Compiled List +assignees: '' + +--- + +You need to make a pull request and add the link to the pull request to this issue when you submit. diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index e1bf9d35..67c897fb 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -2,7 +2,7 @@ name: Things I don't understand about: Please add one item that you don't understand title: "[Don't Understand]" -labels: '' +labels: Don't Understand assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-know.md b/.github/ISSUE_TEMPLATE/things-i-know.md index 3bcf609a..9bae02f7 100644 --- a/.github/ISSUE_TEMPLATE/things-i-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-know.md @@ -2,7 +2,7 @@ name: Things I know about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: '' +labels: I know assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index bae5cbdf..8f0592fd 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -2,7 +2,7 @@ name: Things I want to know about: Describe this issue template's purpose here. title: '' -labels: '' +labels: Want to Know assignees: '' --- From 8e1413ae19c2c9ca1562eeca793ecd9b144ae22d Mon Sep 17 00:00:00 2001 From: baileychant <91162434+baileychant@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:24:35 -0500 Subject: [PATCH 045/116] Update issue templates --- .github/ISSUE_TEMPLATE/master-pull-request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md index 525acf33..ac1ac113 100644 --- a/.github/ISSUE_TEMPLATE/master-pull-request.md +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -1,7 +1,7 @@ --- name: Master Pull Request about: This is for your master pull request to merge your master into this repo. -title: '' +title: Put your UCID as the title (replace this text) labels: Compiled List assignees: '' From d819d3dd6455b08833d1ed2b16e008149b5b7810 Mon Sep 17 00:00:00 2001 From: Indiedude78 Date: Thu, 23 Feb 2023 15:44:22 -0500 Subject: [PATCH 046/116] closes #1 --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 0b49fb1d..03a38488 100644 --- a/README.md +++ b/README.md @@ -92,3 +92,9 @@ Collaborating on GitHub: 13. update your local main branch with the changes from the merge by doing git pull origin main 14. Repeat again, and again, and again +### Consolidated List +#### Things I don't know +1. I don't know how docker works +#### Things I want to know + +#### Things I know \ No newline at end of file From c2ee9b5f6ab02ce789f9d7d9407bb19548efdcfd Mon Sep 17 00:00:00 2001 From: Indiedude78 Date: Thu, 23 Feb 2023 16:38:34 -0500 Subject: [PATCH 047/116] closes #3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 03a38488..5277d81c 100644 --- a/README.md +++ b/README.md @@ -96,5 +96,5 @@ Collaborating on GitHub: #### Things I don't know 1. I don't know how docker works #### Things I want to know - +1. I learned hot to use git project boards #### Things I know \ No newline at end of file From b98897c214606dc888f7b4a9377521a2911c8d3f Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 17:42:42 -0500 Subject: [PATCH 048/116] added somthing i want to know to the list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5a14527b..a82ebc3c 100644 --- a/README.md +++ b/README.md @@ -33,3 +33,4 @@ Collaborating on GitHub: 1. Add items to the list ### Things you want to know next 1. How to connect viewjs to elastic search +2. This is something I want to know \ No newline at end of file From ec68534473726c3c20714e2720d09911427c75a8 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Thu, 23 Feb 2023 17:44:17 -0500 Subject: [PATCH 049/116] Update issue templates --- .../{completed-lists.md => master-pull-request.md} | 4 ++-- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 2 +- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename .github/ISSUE_TEMPLATE/{completed-lists.md => master-pull-request.md} (77%) diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/master-pull-request.md similarity index 77% rename from .github/ISSUE_TEMPLATE/completed-lists.md rename to .github/ISSUE_TEMPLATE/master-pull-request.md index c5cea21c..9942bdb2 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -1,7 +1,7 @@ --- -name: Completed Lists +name: Master Pull Request about: This is for your master pull request to merge your master into this repo. -title: Put your UCID as the title (replace this text) +title: jk259 labels: Compiled List assignees: '' diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 472a5362..cf4f2ec9 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -2,7 +2,7 @@ name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' -labels: Things I Don't Understand +labels: I don't know assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index ff68fa38..ed830519 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,7 +2,7 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: Things I learned +labels: I know assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index 025fa8f1..f5743c08 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -2,7 +2,7 @@ name: Things I want to know about: Describe this issue template's purpose here. title: 'Thing I want to know: [Thing I want to Knows]' -labels: Things I learned +labels: I want to know assignees: '' --- From dd949c65ad02a070981c4ba7ec4d4bc3e80e9f03 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:03:22 -0500 Subject: [PATCH 050/116] added 1st to dont understand --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 0b49fb1d..0a2d30b8 100644 --- a/README.md +++ b/README.md @@ -92,3 +92,10 @@ Collaborating on GitHub: 13. update your local main branch with the changes from the merge by doing git pull origin main 14. Repeat again, and again, and again +### Joshua Kaisar's List: +#### Things we understand** + +#### Things we don't understand +1. Difference between Scrum and Kanban + +#### Things we want to know next** From f64d4009149766f89d55a555333912054e9062d6 Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 18:22:07 -0500 Subject: [PATCH 051/116] added something to the dont understant list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a82ebc3c..529fe4dc 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ Collaborating on GitHub: 1. Add items to the list ### Things you don't understand about what we are doing / web development. 1. Add items to the list +2. Don't understand forking ### Things you want to know next 1. How to connect viewjs to elastic search 2. This is something I want to know \ No newline at end of file From 5cc98c7464f2ad0a3a5ec5906c02913e6419748c Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:24:50 -0500 Subject: [PATCH 052/116] added terraform automation to list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0a2d30b8..4c715973 100644 --- a/README.md +++ b/README.md @@ -97,5 +97,6 @@ Collaborating on GitHub: #### Things we don't understand 1. Difference between Scrum and Kanban +2. Terraform Automation #### Things we want to know next** From 4179b78ca986e8e24f122590c084a8d25b7671b1 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:27:27 -0500 Subject: [PATCH 053/116] added static --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0a2d30b8..e100f9bb 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ Collaborating on GitHub: ### Joshua Kaisar's List: #### Things we understand** +1. How to make a static website #### Things we don't understand 1. Difference between Scrum and Kanban From c292ac38053c5d72dbe7af8dfacfc76a0509dcd7 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:29:31 -0500 Subject: [PATCH 054/116] added git --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0a2d30b8..f87a3517 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,8 @@ Collaborating on GitHub: ### Joshua Kaisar's List: #### Things we understand** +1. How to make a static website +2. Git #### Things we don't understand 1. Difference between Scrum and Kanban From deab469b2a3024ce356992a42db37cb00fb8370c Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:33:18 -0500 Subject: [PATCH 055/116] added agile --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0a2d30b8..a5cf1c92 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,9 @@ Collaborating on GitHub: ### Joshua Kaisar's List: #### Things we understand** +1. How to make a static website +2. Git +3. Agile #### Things we don't understand 1. Difference between Scrum and Kanban From 21283a48972218aa116a18b506fbe478e22ccff5 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:35:27 -0500 Subject: [PATCH 056/116] azure --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0a2d30b8..241855e2 100644 --- a/README.md +++ b/README.md @@ -99,3 +99,4 @@ Collaborating on GitHub: 1. Difference between Scrum and Kanban #### Things we want to know next** +1. Microsoft Azure \ No newline at end of file From 4b3fe773b8d049c2cf8d8b8b37405c9eb08e07ba Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:37:10 -0500 Subject: [PATCH 057/116] docker --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0a2d30b8..25c0619f 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,10 @@ Collaborating on GitHub: ### Joshua Kaisar's List: #### Things we understand** +1. How to make a static website +2. Git +3. Agile +4. Docker #### Things we don't understand 1. Difference between Scrum and Kanban From e17ee2adf16e597bd9ec11d0d373ebb8f7c879e1 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:40:27 -0500 Subject: [PATCH 058/116] Kubernetes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0a2d30b8..3507e141 100644 --- a/README.md +++ b/README.md @@ -97,5 +97,7 @@ Collaborating on GitHub: #### Things we don't understand 1. Difference between Scrum and Kanban +2. Terraform Automation +3. Kubernetes #### Things we want to know next** From d4915bccfec0576e9ca127d61549db323040a911 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Thu, 23 Feb 2023 18:42:20 -0500 Subject: [PATCH 059/116] aws s3 bucket --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0a2d30b8..a713d9cd 100644 --- a/README.md +++ b/README.md @@ -99,3 +99,5 @@ Collaborating on GitHub: 1. Difference between Scrum and Kanban #### Things we want to know next** +1. Microsoft Azure +2. AWS S3 Buckets \ No newline at end of file From b4cc684e15940c55b0135487dca118471c2067c0 Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 19:48:40 -0500 Subject: [PATCH 060/116] added something to the dont understand list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 529fe4dc..efaabe6f 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Collaborating on GitHub: ### Things you don't understand about what we are doing / web development. 1. Add items to the list 2. Don't understand forking +3. Don't Understand Oracle Cloud ### Things you want to know next 1. How to connect viewjs to elastic search 2. This is something I want to know \ No newline at end of file From 0538a79acbebe8bda7f12d567a9f47f8236985bc Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 19:59:35 -0500 Subject: [PATCH 061/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b49fb1d..43a7bd5c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Linux Directory listing[2] 3. Docker Installation[1] #### Things we don't understand -1. Git Stash[1] +1. Git Stash[2] 2. GIt pull[2] 3. GIT status[1] #### Things we want to know next** From 10f3623127b9410a7a7024649e7b99a89d971620 Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:00:22 -0500 Subject: [PATCH 062/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 43a7bd5c..0df5281c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. Docker Installation[1] #### Things we don't understand 1. Git Stash[2] -2. GIt pull[2] +2. GIt pull[3] 3. GIT status[1] #### Things we want to know next** 1. Elastic Search Indexing [1] From e15c1734ec3409268d65a2272eb36c17d757a168 Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:01:01 -0500 Subject: [PATCH 063/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0df5281c..3537b823 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we don't understand 1. Git Stash[2] 2. GIt pull[3] -3. GIT status[1] +3. GIT status[2] #### Things we want to know next** 1. Elastic Search Indexing [1] 2. Cloud deployment with Kubernetes[2] From c46aeca33ea777722b33abcf7b5accee5b1d0c00 Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:02:28 -0500 Subject: [PATCH 064/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3537b823..7595aa50 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Your list should look like this: #### Things we understand** -1. Python Print[1] +1. Python[1] 2. Linux Directory listing[2] 3. Docker Installation[1] #### Things we don't understand From 07c2253dad2f3307509b0dc759665610cbbeb2a4 Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:02:59 -0500 Subject: [PATCH 065/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7595aa50..8cc46a65 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Your list should look like this: #### Things we understand** 1. Python[1] -2. Linux Directory listing[2] +2. Linux Directory listing[3] 3. Docker Installation[1] #### Things we don't understand 1. Git Stash[2] From c190d5619528265fda6b18fb3d6084caad1ab531 Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:04:17 -0500 Subject: [PATCH 066/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cc46a65..877590d7 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we understand** 1. Python[1] 2. Linux Directory listing[3] -3. Docker Installation[1] +3. Docker [1] #### Things we don't understand 1. Git Stash[2] 2. GIt pull[3] From f2827f1e91b8da0abdd835ab788045b93a4ae560 Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:04:48 -0500 Subject: [PATCH 067/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 877590d7..17fbfffc 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. GIt pull[3] 3. GIT status[2] #### Things we want to know next** -1. Elastic Search Indexing [1] +1. Elastic Search Indexing [2] 2. Cloud deployment with Kubernetes[2] 3. Teraform[1] From 59556c29d7e8d3b382ead6e2301b13d9d7f458cc Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:05:28 -0500 Subject: [PATCH 068/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17fbfffc..99d62636 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. GIT status[2] #### Things we want to know next** 1. Elastic Search Indexing [2] -2. Cloud deployment with Kubernetes[2] +2. Cloud deployment with Kubernetes[3] 3. Teraform[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL From 664f027606677dc302e9ee7f8733c0ba1f6eebb3 Mon Sep 17 00:00:00 2001 From: aron-s Date: Thu, 23 Feb 2023 20:06:11 -0500 Subject: [PATCH 069/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99d62636..ffcf1065 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we want to know next** 1. Elastic Search Indexing [2] 2. Cloud deployment with Kubernetes[3] -3. Teraform[1] +3. Teraform[2] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From f6bb0e87572dd1b8b6a0ff3f12c311d1937bc47a Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 20:18:10 -0500 Subject: [PATCH 070/116] added something to the dont understand list --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index efaabe6f..437e4693 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,9 @@ Collaborating on GitHub: ### Things you understand so far 1. Add items to the list ### Things you don't understand about what we are doing / web development. -1. Add items to the list -2. Don't understand forking -3. Don't Understand Oracle Cloud +1. Don't understand forking +2. Don't Understand Oracle Cloud +3. Don't understand the difference between cloning and forking ### Things you want to know next 1. How to connect viewjs to elastic search 2. This is something I want to know \ No newline at end of file From 2716e3e74f642aa96b78a25883d4471db75400fd Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 20:25:58 -0500 Subject: [PATCH 071/116] added something to the I Know list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 437e4693..6399416e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Collaborating on GitHub: ## Put your items here ### Things you understand so far -1. Add items to the list +1. I know how to make ssh keys ### Things you don't understand about what we are doing / web development. 1. Don't understand forking 2. Don't Understand Oracle Cloud From db2646103d7f30f60128b657f001d63fc8ecad83 Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 20:29:29 -0500 Subject: [PATCH 072/116] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0b49fb1d..07b77c94 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 1. Python Print[1] 2. Linux Directory listing[2] 3. Docker Installation[1] +4. Git #### Things we don't understand 1. Git Stash[1] 2. GIt pull[2] From 515aa38a7113dc8aa753aa4d7bbf4b14fc3e326a Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 20:32:16 -0500 Subject: [PATCH 073/116] added something to I Know list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6399416e..615bb697 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Collaborating on GitHub: ## Put your items here ### Things you understand so far 1. I know how to make ssh keys +2. I know personal domain use ### Things you don't understand about what we are doing / web development. 1. Don't understand forking 2. Don't Understand Oracle Cloud From 028a10787611c0b89a8972e44f171a76ac36db22 Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 20:36:30 -0500 Subject: [PATCH 074/116] added something to the I Know list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 615bb697..6b58ebe7 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Collaborating on GitHub: ### Things you understand so far 1. I know how to make ssh keys 2. I know personal domain use +3. I know how to make a personal token ### Things you don't understand about what we are doing / web development. 1. Don't understand forking 2. Don't Understand Oracle Cloud From 8b44ab78b09b81220e9d9c5d4970d14755c6eb13 Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 20:42:54 -0500 Subject: [PATCH 075/116] added somthing to the Want To Know List --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b58ebe7..a7502e6e 100644 --- a/README.md +++ b/README.md @@ -36,5 +36,4 @@ Collaborating on GitHub: 2. Don't Understand Oracle Cloud 3. Don't understand the difference between cloning and forking ### Things you want to know next -1. How to connect viewjs to elastic search -2. This is something I want to know \ No newline at end of file +1. More in depth SQL \ No newline at end of file From 644f39a4d8c1d7a602702b60614e86206032d309 Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 20:46:49 -0500 Subject: [PATCH 076/116] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ba13be71..e4aefb70 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Linux Directory listing[3] 3. Docker [1] 4. Git +5. JavaScript #### Things we don't understand 1. Git Stash[2] 2. GIt pull[3] From 837889d0c9fdd52f8fe64671e68d1e64b46a5dd8 Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 20:49:05 -0500 Subject: [PATCH 077/116] added something to the Want To Know List --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a7502e6e..dec45d35 100644 --- a/README.md +++ b/README.md @@ -36,4 +36,5 @@ Collaborating on GitHub: 2. Don't Understand Oracle Cloud 3. Don't understand the difference between cloning and forking ### Things you want to know next -1. More in depth SQL \ No newline at end of file +1. More in depth SQL +2. More HTML/CSS \ No newline at end of file From b0d5d6c398e230f5df591baad9a14a935dd0ea09 Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 20:50:21 -0500 Subject: [PATCH 078/116] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e4aefb70..9e7144e1 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. Docker [1] 4. Git 5. JavaScript +6. React #### Things we don't understand 1. Git Stash[2] 2. GIt pull[3] From a275b81d2b458635ff1753545c2ddb2f4f204635 Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 20:55:14 -0500 Subject: [PATCH 079/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e7144e1..c28111fe 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. GIt pull[3] 3. GIT status[2] #### Things we want to know next** -1. Elastic Search Indexing [2] +1. Elastic Search Indexing [3] 2. Cloud deployment with Kubernetes[3] 3. Teraform[2] From 07602ad72650df847eeb48720cdf10b5aa199f67 Mon Sep 17 00:00:00 2001 From: baileychant Date: Thu, 23 Feb 2023 20:58:19 -0500 Subject: [PATCH 080/116] added something to the Want To Know list --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dec45d35..b4a5a4c3 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,5 @@ Collaborating on GitHub: 3. Don't understand the difference between cloning and forking ### Things you want to know next 1. More in depth SQL -2. More HTML/CSS \ No newline at end of file +2. More HTML/CSS +3. SEO Knowledge \ No newline at end of file From 6d1521c8da914538a5ae21f085982a3947d64cff Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 20:58:32 -0500 Subject: [PATCH 081/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c28111fe..66eef872 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. GIT status[2] #### Things we want to know next** 1. Elastic Search Indexing [3] -2. Cloud deployment with Kubernetes[3] +2. Cloud deployment with Kubernetes[4] 3. Teraform[2] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL From 1ff905f76e8c8bd2324f4a7e9b10bd4e194e237f Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:00:05 -0500 Subject: [PATCH 082/116] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66eef872..57f1a499 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we want to know next** 1. Elastic Search Indexing [3] 2. Cloud deployment with Kubernetes[4] -3. Teraform[2] +3. Teraform[3] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 6c32f8a0b44a7fb883c8676aa1a0c313ced5e23e Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:03:41 -0500 Subject: [PATCH 083/116] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 57f1a499..27565f05 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 1. Git Stash[2] 2. GIt pull[3] 3. GIT status[2] +4. Watchtower #### Things we want to know next** 1. Elastic Search Indexing [3] 2. Cloud deployment with Kubernetes[4] From 862344733f806ca6ee4bc6dc3d9fa04c40fdc8d6 Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:05:54 -0500 Subject: [PATCH 084/116] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 27565f05..68ca075f 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. GIt pull[3] 3. GIT status[2] 4. Watchtower +5. Traefik #### Things we want to know next** 1. Elastic Search Indexing [3] 2. Cloud deployment with Kubernetes[4] From 8179d0104d4e4a3b284012851d48a402433dcbc4 Mon Sep 17 00:00:00 2001 From: morgha <77805833+morganhah99@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:13:08 -0500 Subject: [PATCH 085/116] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 68ca075f..25d61e7b 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. GIT status[2] 4. Watchtower 5. Traefik +6. Continuous integration/continuous deployment (CI/CD) #### Things we want to know next** 1. Elastic Search Indexing [3] 2. Cloud deployment with Kubernetes[4] From 1c37f633dd75a3ae2f2b45c1c83b391f869e9d01 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Fri, 24 Feb 2023 13:25:28 -0500 Subject: [PATCH 086/116] fixed issue --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 4eb2d9fa..4a2da6fa 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,6 @@ Collaborating on GitHub: 1. I learned hot to use git project boards #### Things I know -#### Things I know ### Joshua Kaisar's List: #### Things we understand** 1. How to make a static website From f1c697eb909769ca0c491dbd163e84147bffd1dc Mon Sep 17 00:00:00 2001 From: Joshua Kaisar Date: Fri, 24 Feb 2023 13:56:00 -0500 Subject: [PATCH 087/116] fixed issue --- .github/ISSUE_TEMPLATE/master-pull-request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md index 9942bdb2..94b80667 100644 --- a/.github/ISSUE_TEMPLATE/master-pull-request.md +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -2,7 +2,7 @@ name: Master Pull Request about: This is for your master pull request to merge your master into this repo. title: jk259 -labels: Compiled List +labels: Submitting master branch assignees: '' --- From 02f903fd07b3c9ed0a17f6836700d9ca015017c8 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:15:46 -0500 Subject: [PATCH 088/116] fixed issue --- .github/ISSUE_TEMPLATE/master-pull-request.md | 14 -------------- .../ISSUE_TEMPLATE/things-i-don-t-understand.md | 10 ---------- .github/ISSUE_TEMPLATE/things-i-learned.md | 10 ---------- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ---------- 4 files changed, 44 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-don-t-understand.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-learned.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md deleted file mode 100644 index 94b80667..00000000 --- a/.github/ISSUE_TEMPLATE/master-pull-request.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Master Pull Request -about: This is for your master pull request to merge your master into this repo. -title: jk259 -labels: Submitting master branch -assignees: '' - ---- - -You need to make a pull request and add the link to the pull request to this issue when you submit. - -PULL REQUEST LINK: - -UCID: diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md deleted file mode 100644 index cf4f2ec9..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I Don't Understand -about: This is for adding issues that you don't understand -title: '' -labels: I don't know -assignees: '' - ---- - -I don't understand diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md deleted file mode 100644 index ed830519..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I learned -about: Add one item for each thing you learned keep to max of 255 characters -title: "[Things I Learned]" -labels: I know -assignees: '' - ---- - -Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md deleted file mode 100644 index f5743c08..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I want to know -about: Describe this issue template's purpose here. -title: 'Thing I want to know: [Thing I want to Knows]' -labels: I want to know -assignees: '' - ---- - -Please describe what you want to know in less than 255 characters. From 1e99a6e52810f6c5233fa0a7d8ca432993883275 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:17:01 -0500 Subject: [PATCH 089/116] fixed issue --- .github/ISSUE_TEMPLATE/master-pull-request.md | 14 ++++++++++++++ .../ISSUE_TEMPLATE/things-i-don-t-understand.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/things-i-learned.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ++++++++++ 4 files changed, 44 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-don-t-understand.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-learned.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md new file mode 100644 index 00000000..94b80667 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -0,0 +1,14 @@ +--- +name: Master Pull Request +about: This is for your master pull request to merge your master into this repo. +title: jk259 +labels: Submitting master branch +assignees: '' + +--- + +You need to make a pull request and add the link to the pull request to this issue when you submit. + +PULL REQUEST LINK: + +UCID: diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md new file mode 100644 index 00000000..cf4f2ec9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -0,0 +1,10 @@ +--- +name: Things I Don't Understand +about: This is for adding issues that you don't understand +title: '' +labels: I don't know +assignees: '' + +--- + +I don't understand diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md new file mode 100644 index 00000000..ed830519 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -0,0 +1,10 @@ +--- +name: Things I learned +about: Add one item for each thing you learned keep to max of 255 characters +title: "[Things I Learned]" +labels: I know +assignees: '' + +--- + +Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md new file mode 100644 index 00000000..f5743c08 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -0,0 +1,10 @@ +--- +name: Things I want to know +about: Describe this issue template's purpose here. +title: 'Thing I want to know: [Thing I want to Knows]' +labels: I want to know +assignees: '' + +--- + +Please describe what you want to know in less than 255 characters. From 9dbf92caf0b2b802130503b5464cd3abc0f5dc05 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:20:32 -0500 Subject: [PATCH 090/116] fixed issue --- .github/ISSUE_TEMPLATE/master-pull-request.md | 14 -------------- .../ISSUE_TEMPLATE/things-i-don-t-understand.md | 10 ---------- .github/ISSUE_TEMPLATE/things-i-learned.md | 10 ---------- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ---------- README.md | 7 ------- 5 files changed, 51 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-don-t-understand.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-learned.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md deleted file mode 100644 index 94b80667..00000000 --- a/.github/ISSUE_TEMPLATE/master-pull-request.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Master Pull Request -about: This is for your master pull request to merge your master into this repo. -title: jk259 -labels: Submitting master branch -assignees: '' - ---- - -You need to make a pull request and add the link to the pull request to this issue when you submit. - -PULL REQUEST LINK: - -UCID: diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md deleted file mode 100644 index cf4f2ec9..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I Don't Understand -about: This is for adding issues that you don't understand -title: '' -labels: I don't know -assignees: '' - ---- - -I don't understand diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md deleted file mode 100644 index ed830519..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I learned -about: Add one item for each thing you learned keep to max of 255 characters -title: "[Things I Learned]" -labels: I know -assignees: '' - ---- - -Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md deleted file mode 100644 index f5743c08..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I want to know -about: Describe this issue template's purpose here. -title: 'Thing I want to know: [Thing I want to Knows]' -labels: I want to know -assignees: '' - ---- - -Please describe what you want to know in less than 255 characters. diff --git a/README.md b/README.md index 4a2da6fa..da7529c8 100644 --- a/README.md +++ b/README.md @@ -92,13 +92,6 @@ Collaborating on GitHub: 13. update your local main branch with the changes from the merge by doing git pull origin main 14. Repeat again, and again, and again -### Consolidated List - Smit -#### Things I don't know -1. I don't know how docker works -#### Things I want to know -1. I learned hot to use git project boards -#### Things I know - ### Joshua Kaisar's List: #### Things we understand** 1. How to make a static website From 235d37ac0ddffbc93c6733044e5ac5b62bcb0237 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:20:54 -0500 Subject: [PATCH 091/116] fixed issue --- .github/ISSUE_TEMPLATE/master-pull-request.md | 14 ++++++++++++++ .../ISSUE_TEMPLATE/things-i-don-t-understand.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/things-i-learned.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ++++++++++ 4 files changed, 44 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-don-t-understand.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-learned.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md new file mode 100644 index 00000000..94b80667 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/master-pull-request.md @@ -0,0 +1,14 @@ +--- +name: Master Pull Request +about: This is for your master pull request to merge your master into this repo. +title: jk259 +labels: Submitting master branch +assignees: '' + +--- + +You need to make a pull request and add the link to the pull request to this issue when you submit. + +PULL REQUEST LINK: + +UCID: diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md new file mode 100644 index 00000000..cf4f2ec9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -0,0 +1,10 @@ +--- +name: Things I Don't Understand +about: This is for adding issues that you don't understand +title: '' +labels: I don't know +assignees: '' + +--- + +I don't understand diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md new file mode 100644 index 00000000..ed830519 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -0,0 +1,10 @@ +--- +name: Things I learned +about: Add one item for each thing you learned keep to max of 255 characters +title: "[Things I Learned]" +labels: I know +assignees: '' + +--- + +Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md new file mode 100644 index 00000000..f5743c08 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -0,0 +1,10 @@ +--- +name: Things I want to know +about: Describe this issue template's purpose here. +title: 'Thing I want to know: [Thing I want to Knows]' +labels: I want to know +assignees: '' + +--- + +Please describe what you want to know in less than 255 characters. From 935011e45ff3ae834a4d252b27012ad92e03fcd8 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:21:49 -0500 Subject: [PATCH 092/116] fixed issue --- .github/ISSUE_TEMPLATE/master-pull-request.md | 14 -------------- .../ISSUE_TEMPLATE/things-i-don-t-understand.md | 10 ---------- .github/ISSUE_TEMPLATE/things-i-learned.md | 10 ---------- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ---------- 4 files changed, 44 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-don-t-understand.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-learned.md delete mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md deleted file mode 100644 index 94b80667..00000000 --- a/.github/ISSUE_TEMPLATE/master-pull-request.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Master Pull Request -about: This is for your master pull request to merge your master into this repo. -title: jk259 -labels: Submitting master branch -assignees: '' - ---- - -You need to make a pull request and add the link to the pull request to this issue when you submit. - -PULL REQUEST LINK: - -UCID: diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md deleted file mode 100644 index cf4f2ec9..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I Don't Understand -about: This is for adding issues that you don't understand -title: '' -labels: I don't know -assignees: '' - ---- - -I don't understand diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md deleted file mode 100644 index ed830519..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I learned -about: Add one item for each thing you learned keep to max of 255 characters -title: "[Things I Learned]" -labels: I know -assignees: '' - ---- - -Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md deleted file mode 100644 index f5743c08..00000000 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Things I want to know -about: Describe this issue template's purpose here. -title: 'Thing I want to know: [Thing I want to Knows]' -labels: I want to know -assignees: '' - ---- - -Please describe what you want to know in less than 255 characters. From 586c0280b497962530456e6df893770a66fdade9 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:25:57 -0500 Subject: [PATCH 093/116] fixed issue --- .DS_Store | Bin 0 -> 6148 bytes .github/ISSUE_TEMPLATE/master-pull-request.md | 14 ++++++++++++++ .../ISSUE_TEMPLATE/things-i-don-t-understand.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/things-i-learned.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 10 ++++++++++ 5 files changed, 44 insertions(+) create mode 100644 .DS_Store create mode 100644 .github/ISSUE_TEMPLATE/master-pull-request.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-don-t-understand.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-learned.md create mode 100644 .github/ISSUE_TEMPLATE/things-i-want-to-know.md diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..51c4d4c6ccb55f6a69a7d223b500648d94001c63 GIT binary patch literal 6148 zcmeHK%}T>S5T32oG>FiHLXQhxi`G_!;w8lT0!H+pQWIJ<7_-u*_D~8r>kIiLK94iI z8|jap1QnTq-EVewCSksWogDxW{;0PHPz8Vr4#JX)( diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md new file mode 100644 index 00000000..ed830519 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -0,0 +1,10 @@ +--- +name: Things I learned +about: Add one item for each thing you learned keep to max of 255 characters +title: "[Things I Learned]" +labels: I know +assignees: '' + +--- + +Please add one item that you learned. File new issues for each item that you learned. Please keep the number of characters to no more than 255. diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md new file mode 100644 index 00000000..f5743c08 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -0,0 +1,10 @@ +--- +name: Things I want to know +about: Describe this issue template's purpose here. +title: 'Thing I want to know: [Thing I want to Knows]' +labels: I want to know +assignees: '' + +--- + +Please describe what you want to know in less than 255 characters. From dee6bd079eda745e63cb1f91679542c38aecabf6 Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:43:11 -0500 Subject: [PATCH 094/116] fixed issue --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 723ef36f..3671e2e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +.github \ No newline at end of file From f4f4c33a292f0d792ab74f3e879a71ccf9197e9d Mon Sep 17 00:00:00 2001 From: Joshua Kaisar <76829245+joshuakaisar@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:43:29 -0500 Subject: [PATCH 095/116] fixed issue --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3671e2e3..723ef36f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -.idea -.github \ No newline at end of file +.idea \ No newline at end of file From afdc6fb61b87e96a7c5086d2ba10556b80489caf Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 18:45:43 -0500 Subject: [PATCH 096/116] added my 'i know' item --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 98cbc4ad..81ed54b6 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. ## Put your items here ### Things you understand so far +1. I understand how to push to github ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux From f16415195e5b0c6513770a94381505916c565d64 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 18:57:20 -0500 Subject: [PATCH 097/116] new issue to dont kno wlist --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 81ed54b6..6cbc36b5 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account +4. I am lost on hows pull for this assignment ### Things you want to know next ### Your list should look like this: From 1365cac3e0f2b918692199d2e5deeb8dd07ff426 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:00:09 -0500 Subject: [PATCH 098/116] added new idk item --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 81ed54b6..ce92a9a7 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account +4. I am lost on hows Docker ### Things you want to know next ### Your list should look like this: From 683fb1a193ecdb60c96d7be5fd3fce3db5b9c49c Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:03:47 -0500 Subject: [PATCH 099/116] added idk linus --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 81ed54b6..248d9010 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account +4. I am lost on hows linux commands ### Things you want to know next ### Your list should look like this: From f39639fd740e8f1993bcf4f8924e48eac4b8838d Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:07:14 -0500 Subject: [PATCH 100/116] added i want to know item --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 81ed54b6..e372a897 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account ### Things you want to know next +1. I want to know why this is tedious ### Your list should look like this: #### Things we understand** From dbc801801f240a99aefeb7ee0b85b28af80fa4b1 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:09:50 -0500 Subject: [PATCH 101/116] added learn item --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 81ed54b6..26749597 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account ### Things you want to know next +1. setup domain name ### Your list should look like this: #### Things we understand** From cb956b1cc5def8acc2fd84540b976ad4fd3bfb97 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:19:44 -0500 Subject: [PATCH 102/116] fixed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e372a897..e194658c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account ### Things you want to know next -1. I want to know why this is tedious +1. I want to know why this is tedious. ### Your list should look like this: #### Things we understand** From 40a92f4ad1f0fb1c930279ffad198d559ab527dd Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:21:57 -0500 Subject: [PATCH 103/116] fixed prev issue --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 888a56e8..a00ccf75 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 4. I am lost on hows pull for this assignment ### Things you want to know next 1. setup domain name +2. why tedious assignment ### Your list should look like this: #### Things we understand** From 3e437a0db566de75764ba89683b784e159b39772 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:24:42 -0500 Subject: [PATCH 104/116] added know item --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a00ccf75..f191d0b4 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ## Put your items here ### Things you understand so far 1. I understand how to push to github +2. github conflict ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux From 01420f04d6f962627b31b1d1dd9a639348f55c9e Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 19:28:04 -0500 Subject: [PATCH 105/116] added know item merge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f191d0b4..3f2d459b 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Things you understand so far 1. I understand how to push to github 2. github conflict +3. how to merge ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux From a3b514c66e9627f3f0d782e6c232bebe818541eb Mon Sep 17 00:00:00 2001 From: baileychant Date: Fri, 24 Feb 2023 20:43:43 -0500 Subject: [PATCH 106/116] merging pull request --- .idea/.gitignore | 3 + .idea/dbnavigator.xml | 410 ++++++++++++++++++ .../inspectionProfiles/profiles_settings.xml | 6 + .idea/misc.xml | 4 + .idea/modules.xml | 8 + .idea/project-management-github-activity.iml | 8 + .idea/vcs.xml | 6 + 7 files changed, 445 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/dbnavigator.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/project-management-github-activity.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 00000000..ec3902bc --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 00000000..105ce2da --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..aab4bcc3 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..23c82d06 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/project-management-github-activity.iml b/.idea/project-management-github-activity.iml new file mode 100644 index 00000000..d0876a78 --- /dev/null +++ b/.idea/project-management-github-activity.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From ea7aa0c47b2f2f712b6588ead342e75a2a0bedd3 Mon Sep 17 00:00:00 2001 From: baileychant Date: Fri, 24 Feb 2023 20:55:47 -0500 Subject: [PATCH 107/116] accepting pull req --- .idea/misc.xml | 2 +- .idea/project-management-github-activity.iml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index aab4bcc3..08550103 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/project-management-github-activity.iml b/.idea/project-management-github-activity.iml index d0876a78..b23d8836 100644 --- a/.idea/project-management-github-activity.iml +++ b/.idea/project-management-github-activity.iml @@ -1,8 +1,10 @@ - - + + + + \ No newline at end of file From da31de2bd887acf5fd7c22d7ffa325b22866b422 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:11:14 -0500 Subject: [PATCH 108/116] a new fix --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ebac385c..bd3cee19 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,8 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. how to merge ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker -2. I am lost on hows to pro-Linux +2. I am lost on ho +3. ws to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account 4. I am lost on hows pull for this assignment ### Things you want to know next From 325284af1847c96b347063201ebc0d0ef105fd44 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:12:02 -0500 Subject: [PATCH 109/116] added new learned item --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ced4bd73..7916bb20 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 1. I understand how to push to github 2. github conflict 3. how to merge +4. How to merge things even better ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux From 84cfe53951cbb8c9c5acced6bd272d824a76ddab Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:15:30 -0500 Subject: [PATCH 110/116] fixed formatting --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index bb49521d..1be45ef2 100644 --- a/README.md +++ b/README.md @@ -12,16 +12,13 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. ## Put your items here ### Things you understand so far -<<<<<<< HEAD -<<<<<<< HEAD 1. I understand how to push to github 2. github conflict 3. how to merge 4. How to merge things even better ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker -2. I am lost on ho -3. ws to pro-Linux +2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account 4. I am lost on hows pull for this assignment ### Things you want to know next From 45c8c2560d1eb3242d16944de35dbb3d830fa73d Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:17:14 -0500 Subject: [PATCH 111/116] added idk how to config --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1be45ef2..aca7c5a2 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account 4. I am lost on hows pull for this assignment +5. I am lost on how to config ### Things you want to know next 1. setup domain name 2. why tedious assignment From 6f532072ee7738ea9ca2da07f6139e48ccabaa07 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:21:40 -0500 Subject: [PATCH 112/116] new idk conflict added --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3ccfd3aa..f308cba5 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. I am lost on hows to setup my domain name with my Oracle account 4. I am lost on hows pull for this assignment 5. I am lost on how to config +6. I am lost on what causes conflict ### Things you want to know next 1. setup domain name 2. why tedious assignment From 1670cf3a4ae9711b081a4866a7e4bcacf2ed18c0 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:24:17 -0500 Subject: [PATCH 113/116] added new want to know --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f308cba5..7a8fd866 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Things you want to know next 1. setup domain name 2. why tedious assignment +3. I want to know how to resolve conflicts ### Your list should look like this: #### Things we understand** From 2a90487040e6cbf91c726191ebbb4047accfa292 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:26:29 -0500 Subject: [PATCH 114/116] added new item i know --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7a8fd866..912059c2 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. github conflict 3. how to merge 4. How to merge things even better +5. I know how to use vim ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux From f4f528c8f165637a622845860f84759a5e52e232 Mon Sep 17 00:00:00 2001 From: TheDiamondSkyv32 Date: Fri, 24 Feb 2023 21:28:16 -0500 Subject: [PATCH 115/116] added new item i know bash scripts --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 912059c2..c9af6403 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. how to merge 4. How to merge things even better 5. I know how to use vim +6. I know how to use bash scripts ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux From 56b32dd455cf7a23490b4ce00b8b92a9451a533a Mon Sep 17 00:00:00 2001 From: baileychant Date: Fri, 24 Feb 2023 21:29:56 -0500 Subject: [PATCH 116/116] readme update --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index fa453958..88f7d95b 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,20 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ## Put your items here ### Things you understand so far 1. I understand how to push to github +2. github conflict +3. how to merge ### Things you don't understand about what we are doing 1. I am lost on hows to pro-Docker 2. I am lost on hows to pro-Linux 3. I am lost on hows to setup my domain name with my Oracle account +4. I am lost on hows pull for this assignment ### Things you want to know next +<<<<<<< HEAD 1. I want to know why this is tedious. +======= +1. setup domain name +2. why tedious assignment +>>>>>>> ea878a88519878f7cad07ff82aa728c9026ddbd8 ### Your list should look like this: #### Things we understand**