gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,451 Commits 9 Branches 0 Tags
a8494b29da91b4fa65b8bbc06ec1c46aceea2aba
Commit Graph

658 Commits

Author SHA1 Message Date
Quincy Larson
61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
 2015-06-09 13:48:29 -07:00
Quincy Larson
ccc440fb4f replace _id with id 2015-06-09 13:30:57 -07:00
Quincy Larson
1a2a610520 Merge branch 'master' of https://github.com/ekojsalim/freecodecamp into ekojsalim-master 2015-06-09 13:04:21 -07:00
Quincy Larson
26eb488ded fix #873 2015-06-09 12:58:50 -07:00
Quincy Larson
5eee9b7ac3 fix #867 2015-06-09 12:53:08 -07:00
Quincy Larson
4de23ac8ac close #874 2015-06-09 12:51:19 -07:00
Quincy Larson
56df2f37db fix #870 2015-06-08 22:37:07 -07:00
Quincy Larson
528344f0ca update cities 2015-06-08 22:31:46 -07:00
Quincy Larson
68ac12d757 improve the wrap an anchor element within a paragraph element challenge 2015-06-07 23:31:16 -07:00
Quincy Larson
6c9db8c27f super nitpicky copy edit 2015-06-07 22:26:58 -07:00
Quincy Larson
400bcaf8c8 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-07 22:23:13 -07:00
Quincy Larson
32c327593e add cities 2015-06-07 22:23:08 -07:00
Quincy Larson
b7145f4604 fix #856 2015-06-07 21:59:04 -07:00
Quincy Larson
198d7897f7 Merge pull request #844 from treece/treece-841 
Fixes RegExp so it matches the class .blue-text
 2015-06-07 21:55:08 -07:00
Quincy Larson
b88533d189 Merge pull request #855 from treece/treece-845 
Removed aarmy example from descr and changed the test for it to passing
 2015-06-07 21:52:51 -07:00
Charles Treece
de831a9d3c Removed aarmy example from descr and changed the test for it to passing 2015-06-06 21:53:27 -04:00
Charles Treece
be633105c5 Fixed blue-text and urgently-red regex constructors 2015-06-06 16:43:27 -04:00
Berkeley Martinez
debb746222 Merge pull request #851 from nighthawk702/nighthawk702-get-set-typo-fix 
Fixed typo in Get Set for Ziplines waypoint.
 2015-06-06 10:51:05 -07:00
Quincy Larson
a0dcf77a14 add Saturday School field guide 2015-06-06 08:44:53 -07:00
Alexandru Ungurianu
a740bfd8bd Fixed typo in Get Set for Ziplines waypoint. 
Changed "Click the gear next the JavaScript." to "Click the gear next to the JavaScript."
 2015-06-06 14:38:43 +03:00
ekojsalim
7b7e6adff6 Add tests for confirm the ending bonfire 2015-06-05 19:34:12 +07:00
Quincy Larson
7d2546335c fix typo in basic javascript challenges 2015-06-04 23:52:04 -07:00
Charles Treece
04ed850ef9 Escaped dot in RegExp for the Waypoint: Override Styles with Important 2015-06-05 01:33:10 -04:00
Quincy Larson
d00db04211 fix broken link and add city 2015-06-04 20:40:26 -07:00
Quincy Larson
f808587827 add get emails script 2015-06-04 18:07:00 -07:00
Quincy Larson
b6ddb0fa4b fix 839 2015-06-04 14:20:00 -07:00
Quincy Larson
1515462fcf fix #819 2015-06-04 12:50:42 -07:00
Quincy Larson
79e90c82a8 close issues by updating json files 2015-06-04 01:01:48 -07:00
Quincy Larson
aa0ba45bf2 fix checkbox challenge issue 2015-06-03 08:02:08 -07:00
Quincy Larson
5d651bce18 closes 824 2015-06-03 07:53:52 -07:00
Quincy Larson
217ad9c85c finish QAing bootstrap challenges 2015-06-03 00:27:25 -07:00
Quincy Larson
af706fb84d fix bootstrap more issues 2015-06-03 00:07:39 -07:00
Quincy Larson
8682a0ea25 fix bootstrap issues 2015-06-02 23:39:40 -07:00
Berkeley Martinez
272d9b4ad5 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
Berkeley Martinez
3a3d296847 Fix typo in Kitty Ipsum challenge 2015-06-02 19:59:29 -07:00
Quincy Larson
c5b20185e5 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-02 19:54:56 -07:00
Quincy Larson
10cbd8f3ec fix wording on HTML challenge 2015-06-02 19:48:59 -07:00
Berkeley Martinez
d0fc96c133 fix typo in field-guide style-guide 
closes #794
 2015-06-02 19:27:40 -07:00
Quincy Larson
f7601946aa update bootstrap and html5 waypoints 2015-06-02 15:55:26 -07:00
Quincy Larson
95cfb70026 finish qa-ing html5 challenges 2015-06-02 14:14:20 -07:00
Quincy Larson
e87e132325 Further improvements to html5 tests 2015-06-02 13:30:45 -07:00
Quincy Larson
b42abe4ace QA up to the placeholder challenge on basic-html5 2015-06-01 23:52:44 -07:00
Quincy Larson
52147821b6 add embedded google forms 2015-06-01 21:33:53 -07:00
Quincy Larson
b8b5f3471f Merge branch 'master' into staging 
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
 2015-06-01 17:40:09 -07:00
Quincy Larson
223c4499ba minor fixes so far 2015-06-01 17:22:09 -07:00
Quincy Larson
b5eef8a5e8 fix systemic typo in challenges 2015-06-01 17:11:24 -07:00
Quincy Larson
04de3ecf9b Merge branch 'master' into staging 2015-06-01 17:07:33 -07:00
Quincy Larson
16eb003c1f Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-01 16:17:19 -07:00
Quincy Larson
4f45867b6e move to freecodecamp.slack.com 2015-06-01 16:17:06 -07:00
Quincy Larson
207d95e026 normalize all instructions in bootstrap challenges 2015-06-01 16:10:28 -07:00