Commit Graph

363 Commits

Author SHA1 Message Date
Quincy Larson
2d981d833c additional work on courseware 2015-05-15 23:34:20 -07:00
Quincy Larson
8981be2dca add more courseware and a working submit route 2015-05-15 18:43:07 -07:00
Quincy Larson
48a9bcbb52 Merge branch 'master' into courseware 2015-05-13 13:37:54 -07:00
Quincy Larson
f6697394b9 add more local groups and India group 2015-05-13 12:46:05 -07:00
Quincy Larson
5569b26e18 add local groups and India group 2015-05-13 12:43:56 -07:00
Quincy Larson
5b21f71f64 add additional cities 2015-05-12 22:36:57 -07:00
Quincy Larson
e8e538b1fa add additional coursewares 2015-05-12 19:44:40 -07:00
Quincy Larson
5cd87bc2a5 add new local groups 2015-05-12 18:19:37 -07:00
Quincy Larson
3ecf56d9fd finish courseware 29 2015-05-12 17:09:13 -07:00
Quincy Larson
d2044eca06 add some additional coursewares to front end curriculum 2015-05-12 15:36:41 -07:00
Quincy Larson
39a23c133e add local groups 2015-05-12 14:54:51 -07:00
Quincy Larson
682146b3f5 fix #443 2015-05-12 00:05:08 -07:00
Quincy Larson
4d0017a4d4 bower install jshint and build more coursewares 2015-05-11 23:40:04 -07:00
Quincy Larson
ab187f821a add another local group 2015-05-11 18:36:39 -07:00
Quincy Larson
bfe3c96ba9 add more local groups 2015-05-11 17:56:36 -07:00
Quincy Larson
2091f65dfd more courseware improvements 2015-05-11 14:27:29 -07:00
Quincy Larson
da9ac03a34 created a chai test for css attributes 2015-05-11 13:58:59 -07:00
Quincy Larson
b574bed0a1 start integrating html css coursewares 2015-05-11 13:43:12 -07:00
Quincy Larson
385573a36f add local groups 2015-05-11 11:45:16 -07:00
Quincy Larson
2a449b2eb1 add code school angular back in 2015-05-10 23:25:55 -07:00
Quincy Larson
40a58ec7e7 add berkeley local group 2015-05-10 18:14:33 -07:00
Quincy Larson
0f83072c4e add one more local group; 2015-05-10 17:52:25 -07:00
Quincy Larson
63d29827f3 update field guide 2015-05-10 17:45:32 -07:00
Quincy Larson
158785c605 update facebook groups 2015-05-10 12:26:57 -07:00
Quincy Larson
3b79bb6c03 add additional facebook groups 2015-05-10 03:25:52 -07:00
Quincy Larson
10c4cec293 update facebook groups 2015-05-09 23:20:35 -07:00
Quincy Larson
abc04c0065 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-09 18:36:41 -07:00
Quincy Larson
cc90d97bdb add code of conduct 2015-05-09 18:36:21 -07:00
Nathan
6759b432e0 Merge pull request #438 from QuincyLarson/news-points
News points
2015-05-09 19:41:38 -04:00
Nathan
760f01d2d5 Update coursewares.json 2015-05-09 19:39:39 -04:00
Nathan
18645f7f91 Merge pull request #434 from terakilobyte/staging
Change jQuery challenge description slightly.
2015-05-09 19:38:10 -04:00
Nathan
361b07c463 Merge pull request #432 from zapstar/fix-431
Added clarification to the search and replace bonfire (21)
2015-05-09 19:36:31 -04:00
Quincy Larson
47462991a4 add more facebook groups 2015-05-09 15:35:13 -07:00
Quincy Larson
c0f6c8d124 add new facebook groups 2015-05-09 13:31:45 -07:00
Quincy Larson
149c715cf7 Merge pull request #435 from QuincyLarson/facebook-groups
Facebook groups
2015-05-09 10:59:21 -07:00
Quincy Larson
b5747c7712 add facebook groups challenge, field guide and footer link 2015-05-09 10:52:02 -07:00
terakilobyte
e7a8d14f5b Change jQuery challenge description slightly. Closes #433 2015-05-08 20:50:13 -04:00
terakilobyte
b6349d55b3 Use exacty wikipedia definition for smallest common multiple 2015-05-08 17:12:16 -04:00
Thirumal Venkat
8e8c1c67d1 Added clarification to Search and Replace bonfire 2015-05-08 23:26:41 +05:30
Quincy Larson
fe86c13947 finish updating field guides 2015-05-07 22:58:20 -07:00
Quincy Larson
8d2b82111b refine field guides 2015-05-07 22:31:20 -07:00
Quincy Larson
c9e7b30867 fix privacy policy link and remove redundant field guide entry 2015-05-05 18:31:03 -07:00
Quincy Larson
52f7dcc96b Merge remote-tracking branch 'upstream/staging'
Conflicts:
	views/account/show.jade
2015-05-05 16:41:28 -07:00
Quincy Larson
f5a7195e42 add deploy a website without code field guide 2015-05-05 16:23:51 -07:00
Victor Påhlsson
c305f1f5cd Fix typo and add tests for Arguments Optional
Add tests for the second argument and fix a typo.
2015-05-05 11:49:18 +02:00
Quincy Larson
714ff14ea8 fix typo in field guide 2015-05-03 22:43:23 -07:00
Quincy Larson
04ed00f4b7 fix #412 2015-05-02 18:55:27 -07:00
Quincy Larson
7cbcf46377 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	app.js
	views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
terakilobyte
cbdba845df Resolve merge conflicts 2015-05-02 00:41:38 -04:00
terakilobyte
4729ef31b4 Get rid of duplicate field guide for mac keyboard shortcuts 2015-05-01 17:17:12 -04:00