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
dca179c2c5
Merge branch 'staging' into converge-bonfires
...
Conflicts:
seed/challenges/basic-bonfires.json
seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -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
31f9b7d707
Merge pull request #3530 from FreeCodeCamp/map-share
...
add facebook sharing to map on completed challenges
2015-09-28 20:08:06 -07:00
Berkeley Martinez
55de772ade
Remove portfolio comment from share
2015-09-28 20:05:22 -07:00
Berkeley Martinez
c7d68932ce
Show share button from last completed
2015-09-28 19:47:45 -07:00
Quincy Larson
1ff55374db
improve facebook sharing copy
2015-09-28 19:04:44 -07:00
Quincy Larson
91efd5940d
add facebook sharing to map on completed challenges
...
remove twitter share from non-bonfire challenges
2015-09-28 17:35:25 -07:00
Quincy Larson
7900628d2a
Merge pull request #3525 from FreeCodeCamp/feature/jobs
...
intermediate pull
2015-09-28 17:35:13 -07:00
Quincy Larson
27f231e72f
refactor tests to show same message when passing and failing
2015-09-27 23:22:06 -07:00
Berkeley Martinez
a34bcc2266
fix (hack) override history object with original
2015-09-21 12:54:33 -07:00
Berkeley Martinez
e579cbd778
update to react-router 1.0.0-rc1
2015-09-21 12:54:33 -07:00
Berkeley Martinez
39fdd637d5
fix load fonts through css
...
attempt to cache font files and load after dom init
resulted in a visible jitter when fonts transitioned.
2015-09-21 12:16:10 -07:00
Berkeley Martinez
723b490932
load lato font after dom ready
2015-09-17 09:57:27 -07:00
Berkeley Martinez
e63e05c1b6
fix typeof comparison should be to string
2015-09-17 00:18:43 -07:00
Berkeley Martinez
1418669757
remove unnecessary doc ready
2015-09-17 00:08:08 -07:00
Arsen Melikyan
829257194d
removes the checkbox and improves a condition
2015-09-15 20:27:36 +04:00
Berkeley Martinez
6d2c5a4f5f
Merge pull request #3294 from bugron/fix/11-lines
...
fixes 'only 11 lines' issue
2015-09-15 00:35:06 -07:00
Berkeley Martinez
f659141746
Merge pull request #3292 from FreeCodeCamp/improve-map
...
adjust map font size and simplify Facebook share call to action
2015-09-14 14:15:50 -07:00
Quincy Larson
118c71e57e
fix css issue and use bower instead of files
2015-09-14 14:05:43 -07:00
Quincy Larson
f837df92ed
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-09-14 00:03:05 -07:00
Quincy Larson
953df6826b
fix merge conflicts
2015-09-14 00:02:42 -07:00
bugron
793f95d877
improves bug search method
2015-09-14 09:47:27 +04:00
bugron
615173ef91
fixes 'only 11 lines' issue
2015-09-14 08:37:45 +04:00
Quincy Larson
957a5329e5
adjust map font size and simplify Facebook share call to action
2015-09-13 20:26:33 -07:00
Berkeley Martinez
f846d007b3
change code copy
2015-09-12 19:17:51 -07:00
ahstro
7f6bcaa704
Include code in issue + issue body improvements
...
This creates an auto-checked checkbox next to the 'Create my GitHub
issue'-button that, when checked, includes the camper's code in the body
sent to GitHub when creating a new issue.
Also includes some general improvements to how the way the issue
creation is handled and how the output looks.
2015-09-13 01:54:26 +02:00
Berkeley Martinez
55065a18b9
add es6 Map shim to shims
2015-09-10 16:59:27 -07:00
Berkeley Martinez
db80c098e5
add es6 shim file
...
use Object.assign
2015-09-10 16:27:09 -07:00
bugron
e24ced0d39
fixes user agent semicolon replacement
2015-09-10 20:32: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
Quincy Larson
5502aba817
further revisions to simplify bug modal
2015-09-07 08:18:44 -07:00
Quincy Larson
e7e6bbb174
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-09-07 07:56:25 -07:00
Quincy Larson
c2468b4946
Tweak @bugron's improvements to our issue submission process
2015-09-07 07:54:29 -07:00