Commit Graph

27 Commits

Author SHA1 Message Date
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
benmcmahon100
1c85bdf8bd Tweaked how the modal is focused 2015-09-04 21:51:34 +01:00
benmcmahon100
f7d7990c4f Fixed double click issue 2015-09-04 21:34:07 +01:00
Berkeley Martinez
3cb16bfa18 fix codeStorage not saving on keyUp events
closes #2894
2015-08-31 22:48:20 -07:00
Berkeley Martinez
a737466e68 fix remove hack causing looping 2015-08-30 01:54:55 -07:00
benmcmahon100
71b6e21e77 Added the accessibility fix and added the hack to fix the challenge complete modal 2015-08-30 00:31:07 +01:00
Berkeley Martinez
376b58cc15 combine sandbox into commonFramework
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
Berkeley Martinez
ed9e89b51f super lint commonFramework 2015-08-27 11:23:17 -07:00
Berkeley Martinez
384dec42ac mid finished linting commonFramework 2015-08-27 00:15:13 -07:00
Berkeley Martinez
8f54932cab fix refactor codemirror 2015-08-27 00:02:07 -07:00
Berkeley Martinez
306c441ae7 add revisioning to js/css files to break caching
This moves the location of javascript files, commonFramework,
iFrameScript, sandbox, plugin, and all the less files.
On gulp or gulp build these files are moved and revisioned.
Places where they are references in jade/html are now removed and
replaced with the use of a helper function `rev`. This function will
take the required file and return a string referencing the revisioned
file. This should alleviate the need for hard refreshing and will break
caches when files change, so fixes for firefox caching issue as well.

NOTE: @benmcmahon @quincylarson, This means files will need to be build
on the server in production before doing a server restart/reload
In production: 'npm run build' To build and revision js/css files

`gulp` and `gulp build` will used in development

npm install also needs to be run in production on initial deploy
2015-08-26 23:30:33 -07:00