Berkeley Martinez
744a8182ba
Merge pull request #2650 from AryanJ-NYC/AryanJ-NYC-2623
...
Changed 'Show the Local Weather' wording
2015-09-10 12:52:12 -07:00
Berkeley Martinez
6aa75f7c67
Merge pull request #2967 from bugron/bugron-2966
...
fixes a small typo
2015-09-10 12:37:57 -07:00
Anton Strömkvist
1e63840308
Merge pull request #3227 from bugron/bugron-replace_all-matches
...
fixes user agent semicolon replacement
2015-09-10 19:21:51 +02:00
bugron
e24ced0d39
fixes user agent semicolon replacement
2015-09-10 20:32:45 +04:00
Arsen Melikyan
5557290116
Merge pull request #3223 from awesomeaniruddh/awesomeaniruddh-2595
...
Added external link to substantiate js waypoint
2015-09-10 16:28:27 +04:00
Aniruddh Agarwal
627bc03f92
Added external link to substantiate js waypoint
...
Added a link to FCC wiki to provide explanation of the formula used in the 'Create a JavaScript Slot Machine' basic javascript waypoint as well as the "Generate Random Whole Numbers within a Range" waypoint
closes #2595
2015-09-10 20:20:58 +08:00
Aniruddh Agarwal
de4b2cbaef
Updated description of voting app basejump
...
Updated description of the Voting App basejump so that unauthenticated users can now vote.
fixes #1398
2015-09-10 19:48:19 +08:00
Berkeley Martinez
e41342c50d
Merge pull request #3222 from QuincyLarson/meta
...
Update Meta tags for Facebook scraping
2015-09-09 23:07:26 -07:00
Quincy Larson
0391faf5a2
fix meta tags for facebook
2015-09-09 23:05:58 -07:00
Quincy Larson
c601aa542e
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-09-09 22:41:40 -07:00
Quincy Larson
17eb57ff82
Merge branch 'master' into staging
2015-09-09 22:41:27 -07:00
Berkeley Martinez
ac74f266ff
Merge branch 'master' into staging
2015-09-09 22:41:22 -07:00
Quincy Larson
2138845e3f
Merge pull request #3221 from FreeCodeCamp/fix/keydown-binding
...
fix modal auto-submitting
2015-09-09 21:52:03 -07:00
Berkeley Martinez
2186f36067
fix modal auto-submitting
2015-09-09 21:33:45 -07:00
Berkeley Martinez
0791c99945
remove commit garbage
2015-09-09 20:47:46 -07:00
Berkeley Martinez
ad59c25aad
Merge pull request #3218 from QuincyLarson/feedback-copy
...
update feedback copy for ziplines and basejumps
2015-09-09 20:43:42 -07:00
Berkeley Martinez
ca50f8250f
Merge pull request #3217 from QuincyLarson/signin-copy
...
improve signin page copy and move twitter to bottom of list
2015-09-09 20:41:59 -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
3afedf14f7
Merge branch 'feature/ctrl-enter-submit' into staging
2015-09-09 20:41:02 -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
40f53fc7c8
Merge pull request #3216 from QuincyLarson/unauthenticated-buttons
...
Help, Pair and Bug buttons for unauthenticated campers
2015-09-09 20:38:36 -07:00
Berkeley Martinez
7ab36aa785
Merge pull request #3207 from QuincyLarson/fb-share
...
Fb share button on map
2015-09-09 20:28:05 -07:00
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
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
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
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
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
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
606009a0dd
Merge branch 'ahstro-mdnlinks' into staging
...
t push origin staging
:wq
2015-09-09 14:06:55 -07:00
Quincy Larson
5db725d82c
fix additional spacing issues
2015-09-09 14:06:16 -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