Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Update of 011-InfraAsCode-ARM-DSC hack to use new WTH templates #91

Merged
merged 38 commits into from
Jun 24, 2020
Merged

Update of 011-InfraAsCode-ARM-DSC hack to use new WTH templates #91

Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6811a6b
Added a draft of new hack homepage
jrzyshr Jun 19, 2020
bd07aba
Replaced root readme.md with new Hack Description template
jrzyshr Jun 19, 2020
82ffd8d
added ARM Challenge 01 with new template
jrzyshr Jun 19, 2020
c1abd49
added ARM Challenge 02 with new template
jrzyshr Jun 19, 2020
acd76d4
added ARM Challenge 03 with new template
jrzyshr Jun 19, 2020
e994df6
Updated navigation links on challenges
jrzyshr Jun 19, 2020
8bb32d3
Added ARM Challenge 4 using new template
jrzyshr Jun 19, 2020
9462210
Re-organized and moved Student resources into Challenge sub folders
jrzyshr Jun 19, 2020
cd2c9f1
Cleaned up errors in ARM Challenge 04
jrzyshr Jun 19, 2020
25ef677
Moved VMSS script to ARM-Challenge-10 folder
jrzyshr Jun 19, 2020
eb394cb
Added ARM-Challenge-05 with new template
jrzyshr Jun 19, 2020
6e2c9d9
Added additional tips to ARM Challenge 5
jrzyshr Jun 19, 2020
59b4859
Added C4 & C5 links to homepage
jrzyshr Jun 19, 2020
5301dd7
Added challenge links to the root readme of the hack
jrzyshr Jun 20, 2020
25666b8
Updated contributors
jrzyshr Jun 20, 2020
a148178
Updated install_apache.sh script files to remove references to P20 an…
jrzyshr Jun 20, 2020
f995db7
Added ARM-Challenge-06 using new template
jrzyshr Jun 20, 2020
f35b79c
Renamed "Host" folder to "Coach"
jrzyshr Jun 20, 2020
159fe45
Removed "Guides" folder from "Coach" folder, and moved Lecture PPT an…
jrzyshr Jun 20, 2020
bd0beeb
Additional tip for ARM Challenge 6
jrzyshr Jun 20, 2020
29ffdbf
Added ARM-Challenge-07 with new template
jrzyshr Jun 20, 2020
25fabc0
Added new ARM-Challenge-08 with template
jrzyshr Jun 20, 2020
8432854
Edited ARM challenge 7
jrzyshr Jun 20, 2020
b590954
Added new ARM Challenge 09 with template
jrzyshr Jun 20, 2020
86f2edc
added new ARM challenges 10-12 with templates
jrzyshr Jun 20, 2020
14eb36d
Added resource links to ARM challenge 7 for HA
jrzyshr Jun 20, 2020
c8201f3
Minor edit to ARM challenge 10
jrzyshr Jun 20, 2020
2ee0dae
tweak to challenge 12 text
jrzyshr Jun 20, 2020
fe0babf
Adding updated DSC challenges using templates
jrzyshr Jun 22, 2020
3d97c81
Added resource links to DSC challenges. Removed resource links from …
jrzyshr Jun 23, 2020
544d9db
Move pre-reqs to the student folder
jrzyshr Jun 23, 2020
30f4dfe
Removed old challenge markdown files and removed the Guides folder.
jrzyshr Jun 23, 2020
a2e81a5
commented out darkula theme, switching to midnight theme.
jrzyshr Jun 23, 2020
6848572
setting GH page theme back to hacker
jrzyshr Jun 23, 2020
01746b5
Merge branch 'IaC-ARM-DSC/1.2'
jrzyshr Jun 23, 2020
3f6b2d4
Merge branch 'master' of github.com:Microsoft/WhatTheHack
jrzyshr Jun 23, 2020
dfe3b83
fixed config.yaml
jrzyshr Jun 23, 2020
c421258
Merge branch 'master' of github.com:Microsoft/WhatTheHack
jrzyshr Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:Microsoft/WhatTheHack 
# Conflicts:
#	_config.yml
  • Loading branch information
@jrzyshr
jrzyshr committed Jun 23, 2020
commit 3f6b2d4833dfd3878c4b37ca4fa6cf53bb556db2
3 changes: 3 additions & 0 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<<<<<<< HEAD
# remote_theme: "dracula/gh-pages"

=======
>>>>>>> 3e0c4ac5f20c2a8615497a4af4ed877a8f281675
theme: jekyll-theme-hacker
You are viewing a condensed version of this merge commit. You can view the full changes here.