gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
24,311 Commits 9 Branches 0 Tags
f834d557eb0bf9e57f247dcd9dc1a64e3eacb56c
Commit Graph

24311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quincy Larson
91a28559a6 Merge pull request #3220 from FreeCodeCamp/fix/set-isInitRun-flag 
fix modal showing when challenge already completed
 2015-09-09 20:25:53 -07:00
Quincy Larson
ad26885a03 remove unnecessary css 2015-09-09 20:23:18 -07:00
Quincy Larson
1c7f798cea Revert "update fb share button and remove vestigial style from main.less" 
This reverts commit ba8119b4da.
 2015-09-09 20:22:14 -07:00
Berkeley Martinez
5490557592 Merge pull request #3041 from QuincyLarson/meta 
Update meta tags and copy
 2015-09-09 20:20:32 -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
Quincy Larson
fb090aa195 update feedback copy for ziplines and basejumps 2015-09-09 20:05:10 -07:00
Quincy Larson
09c4b542a0 update feedback copy for ziplines and basejumps 2015-09-09 20:05:10 -07:00
Quincy Larson
08907b8ddb improve signin page copy and move twitter to bottom of list 2015-09-09 19:55:23 -07:00
Quincy Larson
c70fe77952 Merge branch 'staging' into unauthenticated-buttons 
Conflicts:
	server/views/coursewares/showVideo.jade
	server/views/coursewares/showZiplineOrBasejump.jade
 2015-09-09 19:54:13 -07:00
Quincy Larson
ee9a2d681f make help, pair, bug buttons accessible to unauthenticated campers 2015-09-09 19:51:24 -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
Berkeley Martinez
a5f30414ab Merge pull request #3206 from QuincyLarson/more-info 
remove unnecessary elipses from more info buttons
 2015-09-09 18:59:56 -07:00
Berkeley Martinez
dba53bc4cd Merge pull request #3214 from QuincyLarson/animations 
simplify modal animations
 2015-09-09 18:59:27 -07:00
Quincy Larson
4d427f8318 simplify modal animations and close #2792 2015-09-09 18:55:20 -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
eac3120090 Merge pull request #3187 from QuincyLarson/learn-button 
add learn button
 2015-09-09 18:30:22 -07:00
Quincy Larson
308071b33c Merge pull request #3187 from QuincyLarson/learn-button 
add learn button
 2015-09-09 18:30:22 -07:00
Ben McMahon
2d082d4ea1 Merge pull request #3209 from FreeCodeCamp/fix/emmet-undefined 
fix emmet undefined in non-html challenges
 2015-09-09 22:55:13 +01:00
Berkeley Martinez
f3f6dad026 fix emmet undefined in non-html challenges 2015-09-09 14:39:01 -07:00
Quincy Larson
7f3446ddec Merge pull request #3115 from abhisekp/add-test-bf-palindrome 
Add and Update test cases for "Bonfire: Check for Palindromes"
 2015-09-09 14:29:56 -07:00
Quincy Larson
5a50c13823 Merge pull request #3115 from abhisekp/add-test-bf-palindrome 
Add and Update test cases for "Bonfire: Check for Palindromes"
 2015-09-09 14:29:56 -07:00
Quincy Larson
f8657efc0e Merge pull request #3129 from tcyrus/patch-2 
Fixed tests in "Split your Bootstrap Row" and "Create Bootstrap Wells"
 2015-09-09 14:24:34 -07:00
Quincy Larson
cdd56ed4b5 Merge pull request #3129 from tcyrus/patch-2 
Fixed tests in "Split your Bootstrap Row" and "Create Bootstrap Wells"
 2015-09-09 14:24:34 -07:00
Quincy Larson
3739998d73 Merge pull request #3137 from natac13/fix-parentheses-in-description-#3133 
fix parenthesis in the description of first jquery challenge
 2015-09-09 14:10:37 -07:00
Quincy Larson
2777f31874 Merge pull request #3137 from natac13/fix-parentheses-in-description-#3133 
fix parenthesis in the description of first jquery challenge
 2015-09-09 14:10:37 -07:00
Quincy Larson
c5577ee9e5 Merge pull request #3185 from awesomeaniruddh/awesomeaniruddh-3172 
fixed test descriptions in OOJavascript waypoint
 2015-09-09 14:08:49 -07:00
Quincy Larson
495c2e73f0 Merge pull request #3185 from awesomeaniruddh/awesomeaniruddh-3172 
fixed test descriptions in OOJavascript waypoint
 2015-09-09 14:08:49 -07:00
Quincy Larson
606009a0dd Merge branch 'ahstro-mdnlinks' into staging 
t push origin staging
:wq
 2015-09-09 14:06:55 -07:00
Quincy Larson
5c504a1343 fix additional spacing issues 2015-09-09 14:06:16 -07:00
Quincy Larson
5db725d82c fix additional spacing issues 2015-09-09 14:06:16 -07:00
Quincy Larson
ea32ad5763 Merge branch 'mdnlinks' of https://github.com/ahstro/freecodecamp into ahstro-mdnlinks 2015-09-09 13:56:05 -07:00
Quincy Larson
1c09217953 Merge branch 'mdnlinks' of https://github.com/ahstro/freecodecamp into ahstro-mdnlinks 2015-09-09 13:56:05 -07:00
Quincy Larson
ba8119b4da update fb share button and remove vestigial style from main.less 2015-09-09 13:51:13 -07:00
Quincy Larson
0eeb6891f7 Merge branch 'staging' into fb-share 2015-09-09 13:47:54 -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
Quincy Larson
501bd51e8b remove unnecessary elipses from more info buttons 2015-09-09 13:38:18 -07: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
Ben McMahon
e6f927c791 Merge pull request #3195 from awesomeaniruddh/awesomeaniruddh-2779 
Wording error in description of HTML waypoint
 2015-09-09 18:21:26 +01:00
Ben McMahon
3c18fabacf Merge pull request #3195 from awesomeaniruddh/awesomeaniruddh-2779 
Wording error in description of HTML waypoint
 2015-09-09 18:21:26 +01:00
Ben McMahon
ee8b767124 Merge pull request #3199 from FreeCodeCamp/NewCurriculumOrder 
Set up new curriculum order
 2015-09-09 18:18:37 +01:00
benmcmahon100
977c0e4e73 Set up new curriculum order. OOPF is now before basic bonfires and where art thou is now in intermediate 2015-09-09 18:10:22 +01:00
benmcmahon100
7b04184fcc Set up new curriculum order. OOPF is now before basic bonfires and where art thou is now in intermediate 2015-09-09 18:10:22 +01:00
Aniruddh Agarwal
c6d0040183 Wording error in description of HTML waypoint 
`16 colors` instead of `16 values`
closes #2779
 2015-09-09 22:42:55 +08:00
Aniruddh Agarwal
43cfd024df Wording error in description of HTML waypoint 
`16 colors` instead of `16 values`
closes #2779
 2015-09-09 22:42:55 +08:00
bugron
8fed7d7f91 fixes a test and some text 2015-09-09 18:32:20 +04:00
bugron
acf6ae2eda fixes a test and some text 2015-09-09 18:32:20 +04:00
ahstro
38cdc44368 Cleaned up seed/bonfireMDNlinks.js 
The indentation mixed tabs and spaces, so I converted everything to
spaces. I also edited the top comment to look a bit more stylish.
 2015-09-09 10:17:57 +02:00
ahstro
e432536d5f Cleaned up seed/bonfireMDNlinks.js 
The indentation mixed tabs and spaces, so I converted everything to
spaces. I also edited the top comment to look a bit more stylish.
 2015-09-09 10:17:57 +02:00