Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

phase_0 #2

Open
wants to merge 334 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
334 commits
Select commit Hold shift + click to select a range
9ccfb89
added submission form
Mar 18, 2014
c859581
renamed week_instructions to readme
Mar 18, 2014
77c792b
Changed to imposter syndrome workshop
rmw Mar 19, 2014
b0c1743
Added link to research and formatting
rmw Mar 19, 2014
118c10f
Update 7_cultural_blog.md
rmw Mar 19, 2014
cfbcff9
Update 7_cultural_blog.md
rmw Mar 19, 2014
2485982
Update 6_technical_blog.md
rmw Mar 19, 2014
77a57ad
Update 5_group_project.md
rmw Mar 19, 2014
9bf3942
updated readme
Mar 20, 2014
0392a68
added rspec tests
Mar 20, 2014
258790b
changed week instructions to readme
Mar 20, 2014
802834e
Update 7_cultural_blog.md
rmw Mar 20, 2014
f742d03
Update 7_cultural_blog.md
rmw Mar 20, 2014
9e4eb92
changed to files from directories
Mar 22, 2014
ce9425f
modified instructions
Mar 23, 2014
2fe168b
edited challenge instructions
Mar 23, 2014
e234172
modified instructions
Mar 23, 2014
12e4cbd
added working links
Mar 23, 2014
fd52eb3
added resources
Mar 23, 2014
6e506c8
added resources
Mar 23, 2014
826266b
edited layout
Mar 23, 2014
f6b635e
fixed typo
Mar 23, 2014
8b16a03
added GPS 1.2
Mar 23, 2014
fbac536
fixed typo
Mar 23, 2014
706b79b
fixed typo
Mar 23, 2014
855b2ee
added group challenge instructions
Mar 23, 2014
3e64d64
fixed typo
Mar 23, 2014
91e526a
added reflection bit
Mar 23, 2014
455f654
fixed formatting
Mar 23, 2014
c46d673
changed confusing line
Mar 23, 2014
a5af826
changed confusing line
Mar 23, 2014
e288122
modified instructions
Mar 23, 2014
3e4370a
modified instructions
Mar 23, 2014
89051cc
added navigation back to week_3
Mar 23, 2014
10a5f31
renamed to week_3
Mar 23, 2014
d4e73a8
removed week_4
Mar 23, 2014
0fb5da4
modified submission instructions
Mar 23, 2014
b739862
fixed numbering
Mar 23, 2014
b1324cf
added technical blog questions
Mar 23, 2014
21ff3fa
added cultural blog assignment
Mar 23, 2014
572f3bd
modified readme
Mar 23, 2014
fe08c9b
fixed link
Mar 23, 2014
d1fec5e
changed week
Mar 23, 2014
8306dc2
took out resource
Mar 23, 2014
65e0cdd
fixed links
Mar 23, 2014
f090ab0
fixed links
Mar 23, 2014
87f0b09
fixed links
Mar 23, 2014
a94630c
took out empty link to submission
Mar 23, 2014
5ac4611
fixed merge conflict in readme
Mar 23, 2014
c5775f0
added submission form
Mar 23, 2014
32e3b8d
modified learning objectives
Mar 23, 2014
171bada
added submission for cultural blog
Mar 26, 2014
9cf0c71
removed regular_expression
Mar 26, 2014
489638a
fixed silly typo usethe
Mar 26, 2014
f329e81
changed objective to and/or
Mar 27, 2014
2e4a094
removed extra space in objective
Mar 27, 2014
305a3b0
added learning objectives
Mar 28, 2014
9a35da0
added submission heading
Mar 28, 2014
42b8452
Split HTML and CSS into 2 weeks
rmw Mar 31, 2014
3015367
Update readme.md
rmw Mar 31, 2014
7982610
Update readme.md
rmw Mar 31, 2014
4bfa901
Update readme.md
rmw Mar 31, 2014
a5ce512
Update readme.md
rmw Mar 31, 2014
ed1548f
Update readme.md
rmw Mar 31, 2014
e339d83
Update readme.md
rmw Mar 31, 2014
0e66ed4
Update readme.md
rmw Mar 31, 2014
0a0161c
Update 7_cultural_blog.md
rmw Mar 31, 2014
3bec520
Update 7_cultural_blog.md
rmw Mar 31, 2014
6cabc1c
removed week 2 and 3 curriculum
Mar 31, 2014
b72d53a
removed week 2 and 3
Mar 31, 2014
c88b5d3
Update readme.md
Apr 1, 2014
8a50ba6
Update readme.md
Apr 1, 2014
4d77287
Update readme.md
Apr 1, 2014
3700592
Update readme.md
Apr 1, 2014
28eb30a
Update readme.md
Apr 1, 2014
6975103
Update readme.md
Apr 1, 2014
a54da00
Update 7_cultural_blog.md
Apr 1, 2014
86e7cd4
Update readme.md
Apr 2, 2014
beda85e
added week 2 and 3 curriculum
Apr 6, 2014
6efaf59
added week 2 and 3 links to readme
Apr 6, 2014
b427bbe
bolded note
Apr 6, 2014
e1b3b7c
Update readme.md
Apr 9, 2014
6312b12
changed unit1_week1 name to unit1_projects
Apr 9, 2014
0459a6b
Update readme.md
Apr 9, 2014
1736784
Update readme.md
Apr 9, 2014
2575809
Update readme.md
Apr 9, 2014
1391f43
update instructions from gist version to repo
tsamb Apr 9, 2014
c770246
Update readme.md
Apr 9, 2014
3b4ae03
added unit goals to main page
Apr 11, 2014
dc4697a
added unit goals to readme
Apr 11, 2014
1000fe6
added unit goals to readme
Apr 11, 2014
7a777cc
added unit goals to readme
Apr 11, 2014
4a65f32
changed formatting of unit goals
Apr 11, 2014
cceb8d6
changed formatting of unit goals
Apr 11, 2014
c2fdc8c
changed formatting of unit goals and submission
Apr 11, 2014
e9584c7
modified reflection
Apr 14, 2014
55b460d
fixed merge conflicts
Apr 14, 2014
8cc0961
removed gist from instructions
Apr 14, 2014
578c7d4
Updated instructions for driver code
Apr 15, 2014
4ea6359
Merge branch 'master' of https://github.com/Devbootcamp/phase_0_unit_1
Apr 15, 2014
42810f3
added more details on instructions
Apr 15, 2014
17c4854
changed learning objective to learning competencies
Apr 15, 2014
5d3124c
updated broken link for html5
Apr 16, 2014
7d7630f
made greater than or equal to
Apr 16, 2014
26a2f30
changed purpose or background to summary
Apr 16, 2014
7286685
Pulled master from github
Apr 16, 2014
2e0d17e
renamed files and structure
Apr 16, 2014
a8db11d
added reflections to each challenge
Apr 16, 2014
c6caee2
modified reflection instructions
Apr 16, 2014
b006333
added image files
Apr 16, 2014
b31395a
changed names and added reflection instructions
Apr 16, 2014
4c6a57f
added additional screenshots for instructions
Apr 16, 2014
81356fa
modified links for testing images
Apr 16, 2014
56bee3f
modified links
Apr 16, 2014
8700db2
removed instructions about monday email
Apr 16, 2014
c2d471e
updated refactoring instructions
Apr 17, 2014
697354e
clarified reflection instructions.
Apr 17, 2014
f1aa160
deleted extra period
Apr 17, 2014
003f922
updated review instructions
Apr 17, 2014
b07aadd
renamed files and structure
Apr 16, 2014
cf76b03
added reflections to each challenge
Apr 16, 2014
5fb6981
modified reflection instructions
Apr 16, 2014
819b0df
added image files
Apr 16, 2014
51d953b
changed names and added reflection instructions
Apr 16, 2014
345b4b9
added additional screenshots for instructions
Apr 16, 2014
31a3ad9
modified links for testing images
Apr 16, 2014
73ea243
modified links
Apr 16, 2014
2165bca
changed all competencies to unordered lists
Apr 16, 2014
c3b7601
clarified reflection instructions
Apr 16, 2014
93cdc58
changed directions to release
Apr 17, 2014
d59c035
modified image links
Apr 17, 2014
ad1c846
modified reflection instructions
Apr 17, 2014
0c6bd03
changed directions to releases refl. modified
Apr 17, 2014
984ea6d
fixed repo typo
Apr 17, 2014
f64b63d
changed name to design code combat mission
Apr 17, 2014
e9efb24
changed instructions to be clearer about designing not creating
Apr 18, 2014
d52c63a
changed link for design code combat mission
Apr 18, 2014
f9f17af
modified to use release format
Apr 18, 2014
d7d8871
changed reflection instructions
Apr 18, 2014
b55bb54
added clarification on repo
Apr 18, 2014
41c5ae8
changing to release format
Apr 18, 2014
73c2cb1
clarified blog instructions
Apr 18, 2014
59ed853
changed to release format
Apr 18, 2014
8f1043c
modified instructions
Apr 18, 2014
589ecc1
removed gist from confusing week 3 instructions
Apr 18, 2014
a14089c
added links to my_solution files
Apr 18, 2014
fd5e859
added links to my_solution files
Apr 18, 2014
238b4ea
changed blog instructions
Apr 18, 2014
8058dc5
added release 5
Apr 18, 2014
5cf9756
fixed merge conflicts
Apr 18, 2014
6bb640b
fixed merge conflicts
Apr 18, 2014
b723531
removed inappropriate gist directions
Apr 18, 2014
a17b9c4
made instructions not to look at week 2 or 3
Apr 19, 2014
c0c2161
fixed date for week 3 preparedness
Apr 19, 2014
4ff5d91
changed blog topic
Apr 19, 2014
ae65290
2_set_up_repo/readme.md
Apr 19, 2014
99f48f8
fixed links for submissions
Apr 19, 2014
465f68b
added links to student handbook
Apr 19, 2014
58807e1
took out old part about response to cohort
Apr 19, 2014
0205c2c
fixed links in readme
Apr 19, 2014
67cf45e
removed week 1 submission form link
Apr 20, 2014
e67e33b
Fixed horrible instructions
Apr 22, 2014
b8a1171
added instructions for fetching changes
Apr 22, 2014
7d12bca
removed broken link
Apr 22, 2014
06d9df6
updated broken link for comparing websites blog
Apr 23, 2014
9ec1a0a
fixed image link
Apr 23, 2014
2121931
fixed broken link
Apr 23, 2014
e517e56
removed bad link and replaced
Apr 23, 2014
01c4f1b
fixed formatting
Apr 23, 2014
aaf6299
added submission instructions
Apr 24, 2014
f50ae31
updated to release format
Apr 26, 2014
b43cc22
took out instructions not to do week 2
Apr 26, 2014
a37f4c7
emphasized cultural assignment first
Apr 26, 2014
60cd6d5
fixed wrong repo name
Apr 26, 2014
09ae519
fixed submission link
Apr 26, 2014
a0b3871
fixed typo semicolon
Apr 29, 2014
3651bcd
added instructions for fetching changes
Apr 30, 2014
8392f46
updated readme to remove reference to resources
May 2, 2014
bf89868
made optimize learning optional
May 2, 2014
731807c
retrieved updates from github repo
May 2, 2014
eda9480
replaced graphics
May 2, 2014
ba6d300
Update my_reflection.md
KellyDevBootcamp May 2, 2014
1154128
Update my_reflection.md
KellyDevBootcamp May 2, 2014
05d9307
traded conflict for kitchen
May 2, 2014
1b4f3aa
changed numbering to bullets
May 2, 2014
6f096eb
added git challenge to week 3
May 2, 2014
b1525aa
changed numbering
May 2, 2014
89b519e
updated readme.md
May 2, 2014
710b1c0
added proper link
May 2, 2014
52b7ae4
pulled web changes
May 2, 2014
5244c77
added comment
May 2, 2014
b8445a9
removed unnecessary paren
May 2, 2014
edcb224
fixed formatting
May 3, 2014
53798ef
fixed formatting
May 3, 2014
9ea54cb
fixed formatting
May 3, 2014
74bddcb
added release format to blog
May 3, 2014
84b1e30
changed gps instructions
May 3, 2014
a787cba
Update readme.md
gregRV May 5, 2014
a26678e
Update readme.md
gregRV May 6, 2014
5b1b5a1
formatted list properly
May 8, 2014
4f378f2
Update our_solution.js
Birdrock May 9, 2014
789a860
curriculum and challenge names updated
May 10, 2014
13921f4
fixed merge conflict
May 10, 2014
bd66ff0
fixed bolding formatting
May 10, 2014
e0ebe83
Merge pull request #34 from Birdrock/patch-1
abinoda May 11, 2014
f8c67f8
added push/sync to sync instructions
mbtomori May 11, 2014
ebbe21b
added links to coding references
mbtomori May 11, 2014
3381088
fixed formatting of title
mbtomori May 11, 2014
b3ef230
added challenge title
mbtomori May 11, 2014
2c45dff
made html file week 3
May 12, 2014
5fd3c02
Update my_reflection.md
eshem May 12, 2014
8c2dcc8
finished
eshem May 13, 2014
29d6389
finished
eshem May 13, 2014
e1f122f
finished
eshem May 13, 2014
e09022a
finished
eshem May 16, 2014
c743d7c
finish - need link
eshem May 19, 2014
b4944d0
finished
eshem May 19, 2014
6959326
finished
eshem May 19, 2014
b3b3fab
finished
eshem May 20, 2014
fc1f842
finished
eshem May 20, 2014
804fbd6
finished2
eshem May 20, 2014
091b7fa
finished2
eshem May 20, 2014
5cc9a6c
made small curriculum updates
May 17, 2014
7aa1db1
made changes to blog instructions
May 17, 2014
c104cfd
made changes to blog instructions
May 17, 2014
55fe209
added internet archive link for pseudo elements
May 19, 2014
32b7f23
fixed typo
May 19, 2014
864a621
added instructions to clarify repos
May 19, 2014
a9e0663
deleted extra period
May 19, 2014
3ee432e
added resource
May 19, 2014
e390760
clarified instructions
May 20, 2014
cb5f127
updated instructions to clarify html vs css
May 20, 2014
8d5bdc0
finished
eshem May 22, 2014
dd82435
finished
eshem May 24, 2014
4d2c239
finished
eshem May 25, 2014
a5678af
finished
eshem May 26, 2014
e3b44f8
pix
eshem May 26, 2014
dad5f72
finished
eshem May 26, 2014
a13350a
finished
eshem May 26, 2014
d2adcf8
finished
eshem May 27, 2014
4e17733
half
eshem May 27, 2014
d6a8bae
finished
eshem May 27, 2014
94ef45b
Update my_solution.js
eshem May 27, 2014
5767261
finished
eshem May 27, 2014
3938b3b
finished - need reflect
eshem May 27, 2014
540194f
finished
eshem May 29, 2014
7fea66f
finished
eshem May 30, 2014
07bf36d
finished
eshem May 31, 2014
5fd4383
finished
eshem Jun 1, 2014
5688568
sols
eshem Jun 2, 2014
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
Update 7_cultural_blog.md
rmw committed Mar 20, 2014
commit f742d03bf7bcf7932260829a0c3d9a89d5f3bfa4
3 changes: 2 additions & 1 deletion week_2/7_cultural_blog.md
Original file line number Diff line number Diff line change
@@ -123,7 +123,8 @@ Pick one value and write a couple of sentences about why one of the values you c

#### Exercise 3:

Answer the following:
Answer the following for the values you chose in Exercise 1:

In general, I try to live up to these values:

Disagree 1 ----- 2 ----- 3 ----- 4 ----- 5 Agree