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
ee9a2d681f
make help, pair, bug buttons accessible to unauthenticated campers
2015-09-09 19:51:24 -07:00
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
a5f30414ab
Merge pull request #3206 from QuincyLarson/more-info
...
remove unnecessary elipses from more info buttons
2015-09-09 18:59:56 -07:00
dba53bc4cd
Merge pull request #3214 from QuincyLarson/animations
...
simplify modal animations
2015-09-09 18:59:27 -07:00
4d427f8318
simplify modal animations and close #2792
2015-09-09 18:55:20 -07:00
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
308071b33c
Merge pull request #3187 from QuincyLarson/learn-button
...
add learn button
2015-09-09 18:30:22 -07:00
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
f3f6dad026
fix emmet undefined in non-html challenges
2015-09-09 14:39:01 -07:00
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
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
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
c5577ee9e5
Merge pull request #3185 from awesomeaniruddh/awesomeaniruddh-3172
...
fixed test descriptions in OOJavascript waypoint
2015-09-09 14:08:49 -07:00
606009a0dd
Merge branch 'ahstro-mdnlinks' into staging
...
t push origin staging
:wq
2015-09-09 14:06:55 -07:00
5db725d82c
fix additional spacing issues
2015-09-09 14:06:16 -07:00
1c09217953
Merge branch 'mdnlinks' of https://github.com/ahstro/freecodecamp into ahstro-mdnlinks
2015-09-09 13:56:05 -07:00
ba8119b4da
update fb share button and remove vestigial style from main.less
2015-09-09 13:51:13 -07:00
0eeb6891f7
Merge branch 'staging' into fb-share
2015-09-09 13:47:54 -07:00
f4f9f183ba
Merge pull request #3203 from FreeCodeCamp/fix/run-button
...
fix isInitRun flag not set
2015-09-09 21:46:27 +01:00
501bd51e8b
remove unnecessary elipses from more info buttons
2015-09-09 13:38:18 -07:00
82f7b3825c
Merge pull request #3123 from abhisekp/add-emmet
...
Restore emmet.io support
2015-09-09 13:15:16 -07:00
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
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
3c18fabacf
Merge pull request #3195 from awesomeaniruddh/awesomeaniruddh-2779
...
Wording error in description of HTML waypoint
2015-09-09 18:21:26 +01:00
ee8b767124
Merge pull request #3199 from FreeCodeCamp/NewCurriculumOrder
...
Set up new curriculum order
2015-09-09 18:18:37 +01:00
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
43cfd024df
Wording error in description of HTML waypoint
...
`16 colors` instead of `16 values`
closes #2779
2015-09-09 22:42:55 +08:00
acf6ae2eda
fixes a test and some text
2015-09-09 18:32:20 +04:00
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
d15a40ccf3
Merge pull request #2598 from suhussai/suhussai-2557
...
Added link about Roman Numeral to MDNLinks section.
2015-09-09 10:08:38 +02:00
2896cee8f5
simplify fb-share call to action and minimize sizze
2015-09-09 00:10:36 -07:00
239fac04f0
Merge branch 'QuincyLarson-learn-button' into learn-button
2015-09-08 23:49:10 -07:00
cfba4edb29
add further code to be QAd after sleeping
2015-09-08 23:48:11 -07:00
05864b4813
Fixed wording error in HTML/CSS waypoint
...
Waypoint 'Add Different Padding to Each Side of an Element' had a small wording error: the tests were missing `the`
closes #3130
2015-09-08 23:48:11 -07:00
dccfcfeb2e
Fix typo in basic-javascript waypoint
...
Waypoint 'Invert Regular Expression Matches with JavaScript' had a semi-colon in the description for the regex example which is not needed.
closes #3148
2015-09-08 23:48:11 -07:00
b1ceff3ee2
Fixed typo in Basic Javascript Waypoint
...
Waypoint 'Sift through Text with Regular Expressions' had `...` in its description instead of `.`. Made the required changes.
closes #3169
2015-09-08 23:48:11 -07:00
b228cc064c
Clarifies instructions for shift() challenge; closes #1875
2015-09-08 23:48:11 -07:00
c4c9068950
start refactoring account view into show view
2015-09-08 22:52:32 -07:00
b2d04ec7c5
remove save to user on return individual user
2015-09-08 22:41:03 -07:00
9cc862e9a6
add learn button functionality
...
learn button looks for current challenge in localStorage
if not present sends user to map
2015-09-08 22:31:20 -07:00
184ba1fa37
add challengeId to localStorage
...
remove unneeded current challenge route
2015-09-08 22:18:25 -07:00
f0a4924671
start refactoring next challenge logic
2015-09-08 21:45:53 -07:00
f58e3c07bc
Merge pull request #3125 from natac13/change-test-in-javascript-challenges-and-add-optional-spaces-in-jquery-aswell
...
Test improvements, single and double quote jQuery selectors
2015-09-09 08:39:42 +04:00
44d54b7f69
fixed test descriptions in OOJavascript waypoint
...
The first and the second waypoints in the Object Orientated and Functional Programming section had errors in the test descriptions
closes #3172
2015-09-09 12:31:42 +08:00
1e82165ed2
add learn button back in and fix redirect loop associated with it
2015-09-08 21:15:18 -07:00
c9c454dd69
Merge pull request #3183 from awesomeaniruddh/awesomeaniruddh-3130
...
Fixed wording error in HTML/CSS waypoint
2015-09-09 08:02:45 +04:00
1991a81069
Merge pull request #3184 from awesomeaniruddh/awesomeaniruddh-3148
...
Fix typo in basic-javascript waypoint
2015-09-09 07:58:54 +04:00
471236b814
Fixed wording error in HTML/CSS waypoint
...
Waypoint 'Add Different Padding to Each Side of an Element' had a small wording error: the tests were missing `the`
closes #3130
2015-09-09 11:57:39 +08:00
9067154566
Fix typo in basic-javascript waypoint
...
Waypoint 'Invert Regular Expression Matches with JavaScript' had a semi-colon in the description for the regex example which is not needed.
closes #3148
2015-09-09 11:52:21 +08:00
