Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
fdf2339
Answers for exercises 9,10,11 for Tuesday Week 2
JohnLoftin Jul 21, 2020
e9fb4cd
RobP exercises
RpowellIV Jul 22, 2020
8eafcc8
Answers to HTML 101 exercise
JohnLoftin Jul 22, 2020
506aaaa
html exercises 1-9
RudyCruisin Jul 22, 2020
b760596
Add exercises 1-8 from Tuesday Class
caitlincraw Jul 22, 2020
8d2860f
added answers 1-6
christyph Jul 22, 2020
e182028
Add the true exercise 6 and reorder exercises 7-9
caitlincraw Jul 22, 2020
d46ff35
Added answers 7-9 to HTML 101 exercise
JohnLoftin Jul 22, 2020
8204398
added html exercise answers
Jul 22, 2020
2b9cc8c
added italics tag to line 11
Jul 23, 2020
e59967d
Tuesday's Homework
Jul 23, 2020
b71ad9b
conflicting pull request
RudyCruisin Jul 23, 2020
4aaa972
Further breaking code
Jul 23, 2020
3daaf17
added conflict
JohnLoftin Jul 23, 2020
24d7310
fixed conflict
RudyCruisin Jul 23, 2020
a6f446c
conflict resolution round 2
RudyCruisin Jul 23, 2020
c717c42
added answer to exercise7
christyph Jul 24, 2020
87ae937
updated file extension
christyph Jul 24, 2020
509eb8d
add answer to exercise8
christyph Jul 24, 2020
98c052d
added answer to exercise8
christyph Jul 24, 2020
4d55826
revised answer to exercise2
Jul 25, 2020
5bc884d
added answers to exercise
Jul 25, 2020
ef01933
added answers to exercise 8
Jul 25, 2020
583f3c8
added answers to exercise 9
Jul 25, 2020
f9aa46f
Rob DC BLog & DgtlCrfts
RpowellIV Jul 26, 2020
bafddd8
added files to blog exercise
christyph Jul 26, 2020
28f79fd
add files to exercise DC docs
christyph Jul 26, 2020
1462615
Rob DC Docs attempt + previous
RpowellIV Jul 26, 2020
9960f4a
DC_Blog practice
RudyCruisin Jul 27, 2020
b94ac22
Add caitcraw DC_Blog and DgtlCrfts Mock-Ups
caitlincraw Jul 28, 2020
5994fab
Add caitcraw DC_Docs
caitlincraw Jul 29, 2020
ed8c64e
dc_docs html and css
RudyCruisin Jul 29, 2020
cc38bbf
Fixed quote
RudyCruisin Jul 29, 2020
93866ad
formatting adjustments
RudyCruisin Jul 29, 2020
1fe9101
adjusted width to bodytext
RudyCruisin Jul 29, 2020
5085793
added week 3 mock web exercises
JohnLoftin Jul 30, 2020
a4fb1bb
Update all exercises
caitlincraw Jul 30, 2020
80b9754
added html and css to exercise
christyph Aug 1, 2020
a8c3d15
work in progress
RudyCruisin Aug 1, 2020
24c0b0a
Merge branch 'master' of https://github.com/samuraijane/dc-flex into …
christyph Aug 1, 2020
19e73bc
added DCinterest exercise
christyph Aug 1, 2020
e017b6f
Add caitcraw DCinterest
caitlincraw Aug 1, 2020
dac112f
Merge branch 'master' into caitlincraw/week4
caitlincraw Aug 1, 2020
7c33cac
adding my answer to pixel exercise
Aug 4, 2020
8183d70
adding styles.css
Aug 4, 2020
35a528b
added week 4 plumber and DCInterest exercises
JohnLoftin Aug 4, 2020
5644d19
inital mario
christyph Aug 4, 2020
07a697d
adding homepage
Aug 4, 2020
d36f001
adding files
Aug 5, 2020
c3a5c67
adding home.html
Aug 5, 2020
39d22a8
adding files
Aug 5, 2020
bfb128a
Add caitcraw Mario exercise
caitlincraw Aug 6, 2020
ef62299
added index.html
Aug 6, 2020
8a5a5af
added js file
Aug 7, 2020
f4d5e9d
jsdom exercise answer
Aug 7, 2020
c4087b2
highoncoding exercise
RudyCruisin Aug 7, 2020
3df3640
added updates
Aug 7, 2020
5546ba3
added hands to mario image
Aug 7, 2020
93edea0
added background image to mario pixel art
Aug 7, 2020
c4ba5b9
adding all updates
Aug 7, 2020
fa4dc15
Merge pull request #29 from samuraijane/JohnLoftin/Week3/Tuesday/Exer…
samuraijane Aug 8, 2020
c257206
Merge pull request #28 from samuraijane/JohnLoftin/week2/Tuesday/misc…
samuraijane Aug 8, 2020
51036b7
Merge branch 'master' into RobP72120
samuraijane Aug 8, 2020
13a2a16
Merge pull request #31 from samuraijane/RobP72120
samuraijane Aug 8, 2020
7ac6f49
Merge pull request #32 from samuraijane/tuesdayHTML/caitlincraw
samuraijane Aug 8, 2020
dff9cf8
Merge pull request #33 from samuraijane/Rudy/Html
samuraijane Aug 8, 2020
3b62f80
Merge pull request #34 from samuraijane/christy/week3/1-Tuesday/class
samuraijane Aug 8, 2020
666700e
Merge pull request #42 from samuraijane/room4/alikasper
samuraijane Aug 8, 2020
cb2a125
Merge pull request #43 from samuraijane/Rudy/confliction
samuraijane Aug 8, 2020
3fa9fc1
Merge pull request #56 from samuraijane/christy/week3/1-Tuesday/exerc…
samuraijane Aug 8, 2020
517c097
Merge pull request #60 from samuraijane/christy/week3/3-Saturday/home…
samuraijane Aug 8, 2020
abfc330
Merge pull request #61 from samuraijane/christy/week3/3-Saturday/home…
samuraijane Aug 8, 2020
2d4e6ac
Merge pull request #65 from samuraijane/stacey/plumberexercise
samuraijane Aug 8, 2020
8fddb1f
Merge pull request #76 from samuraijane/groupB/company
samuraijane Aug 8, 2020
056e5fa
Merge branch 'master' into stacey/htmlweek3
samuraijane Aug 8, 2020
5e13413
Merge pull request #40 from samuraijane/stacey/htmlweek3
samuraijane Aug 8, 2020
e9e23ed
Merge branch 'master' into alikasper/conflict
samuraijane Aug 8, 2020
ec695c4
Merge pull request #50 from samuraijane/alikasper/conflict
samuraijane Aug 8, 2020
3d2f62a
Merge branch 'master' into JohnLoftin-conflict
samuraijane Aug 8, 2020
2a2eaa9
Merge pull request #51 from samuraijane/JohnLoftin-conflict
samuraijane Aug 8, 2020
a728eb7
Merge branch 'master' into robP72520
samuraijane Aug 8, 2020
6c175f5
Merge pull request #57 from samuraijane/robP72520
samuraijane Aug 8, 2020
3de54f5
Merge branch 'master' into caitlincraw/satClassExercises
samuraijane Aug 8, 2020
28efe1b
Merge pull request #58 from samuraijane/caitlincraw/satClassExercises
samuraijane Aug 8, 2020
d34ec64
Merge branch 'master' into Rudy/website_imitation
samuraijane Aug 8, 2020
32e598f
Merge pull request #59 from samuraijane/Rudy/website_imitation
samuraijane Aug 8, 2020
7a7320c
Merge branch 'master' into JohnLoftin/Week3/mockWebExercises
samuraijane Aug 8, 2020
e7f8cf8
Merge pull request #62 from samuraijane/JohnLoftin/Week3/mockWebExerc…
samuraijane Aug 8, 2020
c5c4e9e
Merge branch 'master' into christy/week4/2-thursday/exercise
samuraijane Aug 8, 2020
0228786
Merge pull request #63 from samuraijane/christy/week4/2-thursday/exer…
samuraijane Aug 8, 2020
07d544c
Merge branch 'master' into JohnLoftin/week4/Exercises
samuraijane Aug 8, 2020
7786682
Merge pull request #66 from samuraijane/JohnLoftin/week4/Exercises
samuraijane Aug 8, 2020
0eba12a
Merge branch 'master' into caitlincraw/week4
samuraijane Aug 8, 2020
8f3e4e9
Merge pull request #74 from samuraijane/caitlincraw/week4
samuraijane Aug 8, 2020
6567805
resolving merge conflict
Aug 8, 2020
53a0c41
Add week 5 Thursday homework answers
Aug 9, 2020
f4835cd
Resolve merge conflicts
Aug 9, 2020
406da18
Merge branch 'Rudy/highoncode'
Aug 9, 2020
1cfab4b
Resolve merge conflicts
Aug 9, 2020
5b7f0ef
Merge branch 'stacey/week5'
Aug 9, 2020
d03d196
Revise README
Aug 9, 2020
6108987
Fix formatting in README
Aug 9, 2020
1ed7d0f
Clarify group branching protocols
Aug 9, 2020
2c3e7c2
Update aboutus.html
ejw773 Aug 10, 2020
c0e9af6
added styling to about-us and contactus pages
JohnLoftin Aug 11, 2020
5a60c30
Merge pull request #80 from samuraijane/groupD
JohnLoftin Aug 11, 2020
6f252b3
about us additions
DanielBGallagher Aug 11, 2020
9678282
update ali bio
Aug 11, 2020
c1c18d5
update ali bio
Aug 11, 2020
b9dffc4
form functionality
DanielBGallagher Aug 15, 2020
943efd1
update ali bio
Aug 15, 2020
d3b8e73
disable button
Aug 15, 2020
9fab177
update
Aug 15, 2020
2a087db
working on popup
DanielBGallagher Aug 15, 2020
7ddeffd
spinny thing
DanielBGallagher Aug 15, 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
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
# These files and folders won't be committed to git
.DS_Store
node_modules

# Instructor Files
admin
.DS_Store

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading