Commit Graph

667 Commits

Author SHA1 Message Date
Quincy Larson
b6fc2551d9 Merge branch 'interview' into staging
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
Berkeley Martinez
147f1d1d37 fix user.exists returns an object with property exists 2015-06-10 17:21:57 -07:00
Berkeley Martinez
f3b1b5ca0d remove misc console.logs 2015-06-10 17:14:48 -07:00
Berkeley Martinez
9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez
a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07: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
0c799ec02f make bonfire view look like html view 2015-06-07 21:49:14 -07:00
Quincy Larson
b84d41bcd6 write tests for first 5 jquery challenges 2015-06-07 18:29:00 -07:00
Quincy Larson
6953cb6347 make the view even more compact 2015-06-06 22:55:24 -07:00
Quincy Larson
feb0678a46 start shrinking down the views. 2015-06-06 22:51:39 -07:00
terakilobyte
7cfca0b5f8 Bump a delay on test runs and show pattern for expect tests 2015-06-06 23:58:27 -04:00
terakilobyte
5bcffa3ccb Add necessary emmet js file 2015-06-06 20:17:35 -04:00
terakilobyte
e5a8c27e07 Add emmet functionality to html views 2015-06-06 20:10:47 -04: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
terakilobyte
8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
terakilobyte
53a31509e6 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 22:36:08 -04:00
terakilobyte
f002e7c3f7 Always output tests in the order ran ignoring success or failure. Bump version numbers of framework files to force fresh browser fetches. 2015-06-04 22:35:42 -04:00
Berkeley Martinez
cfb5f06cdf Use strings for challengeMap
fixes switch when numbers are strings
2015-06-04 13:28:35 -07:00
Quincy Larson
3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson
b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Quincy Larson
79e90c82a8 close issues by updating json files 2015-06-04 01:01:48 -07:00
Quincy Larson
ee1f336475 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	public/css/main.less
2015-06-04 00:22:16 -07:00
Charles Treece
d6f1565e19 changed z-index of iframe-croll class to 1 2015-06-03 23:04:43 -04:00
Quincy Larson
d6e09ad1e5 fix the html mobile view to have taller iframe 2015-06-03 15:50:28 -07:00
Quincy Larson
51bfa12c33 make iphone stand out over footer 2015-06-02 19:45:58 -07:00
Quincy Larson
2fa0f34eb8 add progress bars 2015-06-01 23:27:33 -07:00
Quincy Larson
4f45867b6e move to freecodecamp.slack.com 2015-06-01 16:17:06 -07:00
Quincy Larson
5380a9ea74 add yet unfinished curriculum overview to challengeMap 2015-05-31 02:01:55 -07:00
Quincy Larson
e322b3b7d6 Merge branch 'master' into modals
Conflicts:
	seed_data/field-guides.json
	views/coursewares/showHTML.jade
2015-05-28 17:25:34 -07:00
terakilobyte
193f9d16db Set a refresh on codemirror instance rather than setting the cursor position. Closes #640 2015-05-28 19:51:42 -04:00
Quincy Larson
8501de396f finish fixing modals 2015-05-28 16:18:04 -07:00
Quincy Larson
673a617151 create pair, help, bug modals 2015-05-28 14:29:45 -07:00
terakilobyte
131b9ad1b7 bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes # 2015-05-28 14:13:31 -04:00
terakilobyte
718ae04f2f Add ability to test editor contents. Ensures classes are implemented, closes # 684 2015-05-28 08:26:25 -04:00
terakilobyte
bada25f381 Improve mobile view of showHTML 2015-05-27 16:42:08 -04:00
terakilobyte
57fad7d923 proper fix for uncomment html challenge, improved codemirror performance 2015-05-27 15:29:31 -04:00
terakilobyte
79b20d9798 Update copy for uncomment html. Fix iframe view covering up button in narrow width. Make iframe fixed so it's viewable as code editor expands and people scroll down. closes #596, closes #655 2015-05-27 15:15:28 -04:00
terakilobyte
6a2d365b9a Update framework version, set cursor to line 15 on load to force full display. Closes #653 2015-05-27 14:40:06 -04:00
terakilobyte
cad39e1b5e Fixes duplication bug in Firefox 2015-05-27 13:39:37 -04:00
terakilobyte
fa43dd1051 Unbind click handler on next-courseware-button to prevent repeated presses from advancing more than one challenge 2015-05-26 12:32:50 -04:00
terakilobyte
e7c855d72f Fully disable all help buttons for now, remove post to slack functionality for aventerous campers who enable the buttons through their console 2015-05-26 11:10:10 -04:00
terakilobyte
ff6e11433c Update bonfire framework to know how to use chai.should() 2015-05-26 10:41:50 -04:00
terakilobyte
186d320d01 version updates to force browser fetch so buttons works 2015-05-26 09:14:10 -04:00
Quincy Larson
7581ed9b30 quick challenge hot fixes 2015-05-26 00:33:13 -07:00
terakilobyte
6ce5ccf449 Rename framework file to force new browser fetching. Update view to remove unused vars 2015-05-26 02:31:10 -04:00
terakilobyte
1c4b40c8e6 Update to bonfires. Successfully completing triggers a save. "Paired with" form field moved to bonfire view. Controller hardened for checking pair as button is no longer disabled for unfound username 2015-05-25 17:27:27 -04:00
Quincy Larson
31e10444a5 improve field guide look and add cracking code interview article 2015-05-25 00:42:32 -07:00