Commit Graph
60 Commits
Author SHA1 Message Date
SaintPeter 86e4165c4c Step Challenge - Prev from end, x/y step display 2015-11-16 21:57:35 -08:00
Berkeley Martinez 9ca11ebed2 Hotfix ignore bonfireExecute on basejump challenges 2015-11-08 20:12:56 -08:00
Berkeley Martinez 8fe3a075bf Hotfix fix basejump-zipline completion 2015-11-08 20:05:12 -08:00
Berkeley Martinez 2ed6143c68 Add type safety to arrayToNewLineString 2015-11-06 17:53:06 -08:00
Berkeley Martinez a57d288aa7 Rename arrayToNewLineString
because naming things is hard
2015-11-06 17:51:04 -08:00
Berkeley Martinez 5dbfbfcf57 Add head/tail to challenge spec.
Lint EVERYTHING!
2015-11-06 17:32:01 -08:00
Berkeley Martinez 696c038a26 Merge pull request #4168 from ltegman/fix/code-editor-spamming-browser-history-4167
Fix Code Editor Changes Creating Duplicate History Entries
2015-11-05 17:28:13 -08:00
Berkeley Martinez 8f3c3e3972 Fix most lint issues 2015-11-04 12:37:25 -08:00
Logan Tegman c38841c5af Fix Code Editor Changes Creating Duplicate History Entries
Closes #4167
2015-11-04 11:04:54 -08:00
Logan Tegman 9bc6048a8d Merge pull request #4122 from junhaoyap/feature/command-key
The cmd and ctrl button now both trigger events
2015-11-03 21:26:09 -08:00
junhaoyap 64ab919613 Make cmd and ctrl both trigger events 2015-11-03 20:59:07 -08:00
Berkeley Martinez e04e70493a Merge pull request #3873 from ankitaggarwal011/fix/removeComments-method-improvement
Temporary fix for bugs due to removeComments method
2015-11-01 22:13:17 -08:00
Berkeley Martinez 254e0cdbf3 Merge pull request #3984 from ltegman/fix/ctrl-enter-works-when-not-logged-in-3900
Fix Ctrl-Enter doesn't work when not logged in.
2015-11-01 17:27:55 -08:00
Arsen Melikyan ab83f6d5fa adds back button for step challenges 2015-10-31 17:24:05 +04:00
Logan Tegman 7fd5174fe0 Fix Ctrl-Enter doesn't work when not logged in.
Closes #3900

First time contributing real code, so please let me know any critiques or style changes I should make.
2015-10-29 00:13:20 -07:00
Ben McMahon 3883483d8d Merge pull request #3595 from FreeCodeCamp/curriculum/JSONAndAJAX
Curriculum/json and ajax for QA and copy check
2015-10-26 00:47:30 +00:00
Ankit Aggarwal 8157c6e20c Temporary fix to bugs due to removeComments method-closes #3763 2015-10-24 12:45:30 +05:30
Quincy Larson e7c6e626e0 merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
Berkeley Martinez 756efcd9fb Fix linting in JavaScript editor 2015-10-23 15:38:51 -07:00
Quincy Larson 51012bd121 remove console.log statement 2015-10-11 17:05:28 -07:00
Berkeley Martinez 1627aa522a Fix form action attribute regex
Should ignore whitespace and new lines
2015-10-10 11:44:20 -07:00
Berkeley Martinez 113c9a297b Fix form action attr throwing xss errors
This PR fixes codeURI xss errors in chrome due to action
attribute.
2015-10-07 16:16:02 -07:00
Quincy Larson cdbd052b35 Merge branch 'staging' into clementine 2015-10-07 01:29:15 -07:00
Berkeley Martinez 33e8f35bbf Fix replace script tags in URL
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -07:00
benmcmahon100 a0885d4481 Merge remote-tracking branch 'origin/staging' into curriculum/JSONAndAJAX
:ting with '#' will be ignored, and an empty message aborts
:
aad]
dad
2015-10-06 22:34:20 +01:00
Quincy Larson c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
Berkeley Martinez 8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
benmcmahon100 da09a7b650 Brought in line with staging and added spoofigator! 2015-10-05 23:42:30 +01:00
Berkeley Martinez 72e0595ca6 add uri code storage 2015-09-30 22:32:31 -07:00
Berkeley Martinez 5de6837959 Merge pull request #3548 from FreeCodeCamp/converge-bonfires
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
Quincy Larson 416a866ec0 add step based challenge to framework 2015-09-30 13:26:06 -07:00
Quincy Larson 03675ef0a6 finish QAing basic and intermediate bonfires 2015-09-30 01:33:07 -07:00
Quincy Larson 27f231e72f refactor tests to show same message when passing and failing 2015-09-27 23:22:06 -07:00
bugron 615173ef91 fixes 'only 11 lines' issue 2015-09-14 08:37:45 +04:00
Berkeley Martinez 2186f36067 fix modal auto-submitting 2015-09-09 21:33:45 -07:00
Quincy Larson 8ed1cf2fb9 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-09-09 20:41:13 -07:00
Quincy Larson 0d31256a10 Merge branch 'feature/ctrl-enter-submit' of github.com:FreeCodeCamp/freecodecamp into feature/ctrl-enter-submit
Conflicts:
	client/commonFramework.js
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showJS.jade
2015-09-09 20:40:40 -07:00
Quincy Larson d02ad70913 Merge pull request #3205 from FreeCodeCamp/feature/ctrl-enter-submit
add ctrl enter press to submit on modal
2015-09-09 20:40:02 -07:00
Berkeley Martinez f1b29a6fd1 fix modal showing when challenge already completed
This fix fixes a regression introduced in an earlier commit.
Now, isInitRun is always set false on user involvement.
This prevents the completion modal from poping up during challenges
that have preview windows.
2015-09-09 20:13:35 -07:00
Berkeley Martinez d3e77f1282 add ctrl enter press to submit on modal
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 19:33:01 -07:00
Quincy Larson 09b6dae11b Merge branch 'staging' into feature/ctrl-enter-submit
Conflicts:
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showHTML.jade
2015-09-09 18:32:31 -07:00
Quincy Larson 308071b33c Merge pull request #3187 from QuincyLarson/learn-button
add learn button
2015-09-09 18:30:22 -07:00
Berkeley Martinez f3f6dad026 fix emmet undefined in non-html challenges 2015-09-09 14:39:01 -07:00
Ben McMahon f4f9f183ba Merge pull request #3203 from FreeCodeCamp/fix/run-button
fix isInitRun flag not set
2015-09-09 21:46:27 +01:00
Berkeley Martinez 82f7b3825c Merge pull request #3123 from abhisekp/add-emmet
Restore emmet.io support
2015-09-09 13:15:16 -07:00
Berkeley Martinez c10f81408a add ctrl enter press to submit on modal
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 12:57:22 -07:00
Berkeley Martinez 7874dc5222 fix isInitRun flag not set
When doing jQuery challenges and starting with failing tests
isInitRun, the flag that prevents initial run from auto submitting
a challenge does not get set due to bonfireExecute not running in
this situation. This fixes that by setting consitantly setting
the flag on failing tests so that when tests do pass by camper
the flag will always be set and allow the camper to continue.

closes #2772
2015-09-09 12:07:00 -07:00
Quincy Larson f0a4924671 start refactoring next challenge logic 2015-09-08 21:45:53 -07:00
Ben McMahon 6e9e7bb7a9 Merge pull request #2945 from FreeCodeCamp/fix/coreStorage-not-saving
fix codeStorage not saving on keyUp events
2015-09-07 21:49:30 +01:00
Abhisek Pattnaik c043e370d9 Restore emmet.io support
close FreeCodeCamp/FreeCodeCamp#2720
2015-09-06 21:34:33 +05:30