Commit Graph

301 Commits

Author SHA1 Message Date
terakilobyte
810bf9a3f7 force https for blob url in _frame.js. Updates helmet to allow more inspectlet domains. 2015-06-16 15:59:22 -04:00
terakilobyte
308e539e1e More protocol experimentation 2015-06-16 12:23:49 -04:00
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
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
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
terakilobyte
8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -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
4f45867b6e move to freecodecamp.slack.com 2015-06-01 16:17:06 -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
57fad7d923 proper fix for uncomment html challenge, improved codemirror performance 2015-05-27 15:29:31 -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
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
bf0cf4cc7d add the bug, pair and help buttons to challenge views 2015-05-24 00:53:01 -07:00
Quincy Larson
1949005632 remove modal from field guide and create index view 2015-05-23 18:39:30 -07:00
Quincy Larson
a3ab32f339 improve get help and add find a pair 2015-05-23 00:53:41 -07:00
terakilobyte
b626c811d0 Add initial I need help button and slack webhook integration 2015-05-23 02:26:29 -04:00
Berkeley Martinez
4ad757ebd5 Merge pull request #466 from terakilobyte/challenge-restructure
Challenge restructure
2015-05-21 00:12:52 -07:00
terakilobyte
5e918bdd7c Remove bonfire and courseware controller, relying on all challenge related logic in challenge.js. Remove bonfire folder. Move necessary JS to coursewares folder and rename. 2015-05-20 22:31:20 -04:00
terakilobyte
16ca72f716 Update views for new variable names. Get profile view working. Update challenge map. 2015-05-20 21:50:31 -04:00
LumenTeun
7b9faabd32 Github => GitHub 2015-05-20 16:29:05 +02:00
terakilobyte
a174a1c630 Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js 2015-05-19 22:31:01 -04:00
Quincy Larson
ae70d0abd9 Merge branch 'courseware' into challenge-restructure 2015-05-18 23:33:03 -07:00
Quincy Larson
45d4954a43 fix script tag importing issue in coursewares 2015-05-18 22:25:48 -07:00
terakilobyte
e6851b22d8 Minor updates 2015-05-18 21:20:32 -04:00
Quincy Larson
68962d4d82 further improvements to coursewares and bonfires 2015-05-10 22:33:04 -07:00
Quincy Larson
d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00