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

3446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
terakilobyte
5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04:00
terakilobyte
25e500a457 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-09 16:49:10 -04:00
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
terakilobyte
870c80d72d Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch. 2015-06-09 16:46:41 -04:00
Quincy Larson
ccc440fb4f replace _id with id 2015-06-09 13:30:57 -07:00
Quincy Larson
c338b25a77 Merge branch 'ekojsalim-master't push origin master: 2015-06-09 13:04:26 -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
f33269d2b9 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
 2015-06-09 12:56:22 -07:00
Quincy Larson
6ffdbb7b8a Merge pull request #872 from treece/treece-864 
Fixed regexp on both ul and li opening tags
 2015-06-09 12:54:30 -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
Charles Treece
6b46c097be Changed regexp to Quincy's normal method 2015-06-09 03:22:30 -04: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
Charles Treece
a10bd3c456 Fixed regexp on both ul and li opening tags 2015-06-08 23:34:51 -04: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
Berkeley Martinez
78dac937f7 remove email verification. 2015-06-07 22:07:38 -07:00
Berkeley Martinez
28f273e7ee save users into new user collection 2015-06-07 22:06:57 -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
Berkeley Martinez
0c6c170754 initial script to flatten user object 2015-06-07 17:15:53 -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
terakilobyte
5bcffa3ccb Add necessary emmet js file 2015-06-06 20:17:35 -04:00
terakilobyte
426a1c27c2 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-06 20:11:28 -04:00
terakilobyte
e5a8c27e07 Add emmet functionality to html views 2015-06-06 20:10:47 -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
49b938173a Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-06 10:18:26 -07:00
Quincy Larson
ef504339cc remove saturday summit modal 2015-06-06 10:17:49 -07:00
terakilobyte
b210d7226c Update returnnextfieldguide to look at dashedName property 2015-06-06 11:57:53 -04: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
Quincy Larson
aef35860dc fix mobile view issue 2015-06-05 22:35:13 -07:00
Quincy Larson
6e1d5968bc improve mobile menu 2015-06-05 22:11:30 -07:00
Berkeley Martinez
c4b26214da Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-05 21:52:43 -07:00
terakilobyte
1a27c133c5 Update user account fetching for profile view 2015-06-05 15:57:27 -04:00
terakilobyte
6b6de50ad4 Update story query for loopback. 2015-06-05 15:00:54 -04:00
terakilobyte
21b9405f06 Update links for new api model in views for stories. 2015-06-05 14:58:42 -04:00
terakilobyte
4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04:00
terakilobyte
d782ac9520 Update find method in fieldGuide.js 2015-06-05 13:25:28 -04:00
terakilobyte
a0b34c8e90 Redirect to home path on unsuccessful query rather than induce infinite redirect loop. 2015-06-05 09:41:53 -04:00
terakilobyte
8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
ekojsalim
7b7e6adff6 Add tests for confirm the ending bonfire 2015-06-05 19:34:12 +07:00
Quincy Larson
b8b807a38d update twitter contest text 2015-06-05 00:25:23 -07:00
Quincy Larson
b606450aec update field guide flash message 2015-06-05 00:15:38 -07:00