cf45d2b01f
update landing page and stories
2015-10-14 21:42:29 -07:00
7c0d801d63
Add google analytics tracking
2015-10-14 21:26:22 -07:00
3dee03d38b
add more stories and clean up css
2015-10-12 01:22:11 -07:00
51012bd121
remove console.log statement
2015-10-11 17:05:28 -07:00
1627aa522a
Fix form action attribute regex
...
Should ignore whitespace and new lines
2015-10-10 11:44:20 -07:00
91df8cba6f
Merge pull request #3666 from FreeCodeCamp/fix/commit
...
update look of commit
2015-10-08 17:26:07 -07:00
6fafbdf441
improve stories view
2015-10-08 17:05:42 -07:00
113c9a297b
Fix form action attr throwing xss errors
...
This PR fixes codeURI xss errors in chrome due to action
attribute.
2015-10-07 16:16:02 -07:00
cdbd052b35
Merge branch 'staging' into clementine
2015-10-07 01:29:15 -07:00
0f6cdf8be1
Merge pull request #3615 from FreeCodeCamp/feature/commit
...
Add feature Commit
2015-10-07 01:23:24 -07:00
4f26d82f65
add labs and stories
2015-10-07 00:17:18 -07:00
bc6a9c6db2
Add redirect to user page on submit
2015-10-06 19:51:19 -07:00
b1d8814aed
remove angular from views
2015-10-06 16:43:46 -07:00
33e8f35bbf
Fix replace script tags in URL
...
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -07:00
b8dc81214d
Merge branch 'staging' into remove-angular
...
Conflicts:
server/boot/user.js
server/views/account/show.jade
2015-10-06 16:00:59 -07:00
a0885d4481
Merge remote-tracking branch 'origin/staging' into curriculum/JSONAndAJAX
...
:ting with '#' will be ignored, and an empty message aborts
:
aad]
dad
2015-10-06 22:34:20 +01:00
c27e5bf6c4
start adding clementine challenge
2015-10-05 21:57:15 -07:00
8c48626f03
Add certification page
2015-10-05 15:55:50 -07:00
da09a7b650
Brought in line with staging and added spoofigator!
2015-10-05 23:42:30 +01:00
72e0595ca6
add uri code storage
2015-09-30 22:32:31 -07:00
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
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
416a866ec0
add step based challenge to framework
2015-09-30 13:26:06 -07:00
03675ef0a6
finish QAing basic and intermediate bonfires
2015-09-30 01:33:07 -07:00
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
55de772ade
Remove portfolio comment from share
2015-09-28 20:05:22 -07:00
c7d68932ce
Show share button from last completed
2015-09-28 19:47:45 -07:00
1ff55374db
improve facebook sharing copy
2015-09-28 19:04:44 -07:00
91efd5940d
add facebook sharing to map on completed challenges
...
remove twitter share from non-bonfire challenges
2015-09-28 17:35:25 -07:00
7900628d2a
Merge pull request #3525 from FreeCodeCamp/feature/jobs
...
intermediate pull
2015-09-28 17:35:13 -07:00
27f231e72f
refactor tests to show same message when passing and failing
2015-09-27 23:22:06 -07:00
51af4e4b0d
Merge branch 'google-cdns' into remove-angular
...
Conflicts:
server/boot/user.js
server/views/account/show.jade
server/views/account/signin.jade
server/views/coursewares/showBonfire.jade
server/views/coursewares/showZiplineOrBasejump.jade
server/views/partials/scripts.jade
2015-09-23 09:56:01 -07:00
a34bcc2266
fix (hack) override history object with original
2015-09-21 12:54:33 -07:00
e579cbd778
update to react-router 1.0.0-rc1
2015-09-21 12:54:33 -07:00
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
8424fef76f
adds a switch case to highlight bonfires' code in GitHub issues
2015-09-19 15:58:58 +04:00
723b490932
load lato font after dom ready
2015-09-17 09:57:27 -07:00
e63e05c1b6
fix typeof comparison should be to string
2015-09-17 00:18:43 -07:00
1418669757
remove unnecessary doc ready
2015-09-17 00:08:08 -07:00
829257194d
removes the checkbox and improves a condition
2015-09-15 20:27:36 +04:00
6d2c5a4f5f
Merge pull request #3294 from bugron/fix/11-lines
...
fixes 'only 11 lines' issue
2015-09-15 00:35:06 -07:00
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
118c71e57e
fix css issue and use bower instead of files
2015-09-14 14:05:43 -07:00
f837df92ed
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-09-14 00:03:05 -07:00
953df6826b
fix merge conflicts
2015-09-14 00:02:42 -07:00
793f95d877
improves bug search method
2015-09-14 09:47:27 +04:00
615173ef91
fixes 'only 11 lines' issue
2015-09-14 08:37:45 +04:00
957a5329e5
adjust map font size and simplify Facebook share call to action
2015-09-13 20:26:33 -07:00
f846d007b3
change code copy
2015-09-12 19:17:51 -07:00
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
55065a18b9
add es6 Map shim to shims
2015-09-10 16:59:27 -07:00
db80c098e5
add es6 shim file
...
use Object.assign
2015-09-10 16:27:09 -07:00
e24ced0d39
fixes user agent semicolon replacement
2015-09-10 20:32:45 +04:00
2186f36067
fix modal auto-submitting
2015-09-09 21:33:45 -07:00
8ed1cf2fb9
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-09-09 20:41:13 -07:00
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
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
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
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
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
f3f6dad026
fix emmet undefined in non-html challenges
2015-09-09 14:39:01 -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
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
f0a4924671
start refactoring next challenge logic
2015-09-08 21:45:53 -07:00
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
5502aba817
further revisions to simplify bug modal
2015-09-07 08:18:44 -07:00
e7e6bbb174
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-09-07 07:56:25 -07:00
c2468b4946
Tweak @bugron's improvements to our issue submission process
2015-09-07 07:54:29 -07:00
e49bcece7d
Merge branch 'bugron-bug_btn_enhancement_merged' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-bug_btn_enhancement_merged
2015-09-07 07:25:14 -07:00
c043e370d9
Restore emmet.io support
...
close FreeCodeCamp/FreeCodeCamp#2720
2015-09-06 21:34:33 +05:30
46a83b42a1
removes the checkbox at all
2015-09-06 11:40:06 +04:00
1c85bdf8bd
Tweaked how the modal is focused
2015-09-04 21:51:34 +01:00
f7d7990c4f
Fixed double click issue
2015-09-04 21:34:07 +01:00
3cb16bfa18
fix codeStorage not saving on keyUp events
...
closes #2894
2015-08-31 22:48:20 -07:00
8fdacb7e34
This commit extends 'Bug' button's functionality
2015-09-01 07:18:44 +04:00
a737466e68
fix remove hack causing looping
2015-08-30 01:54:55 -07:00
71b6e21e77
Added the accessibility fix and added the hack to fix the challenge complete modal
2015-08-30 00:31:07 +01:00
6c48395868
separate main manifest generation from sub manifests
...
in dev mode always pull manifest on each request
add manifest build to gulp build task
add react bundle to manifest generation
2015-08-28 15:56:58 -07:00
376b58cc15
combine sandbox into commonFramework
...
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
551cb987dd
call chai after load in plugin
2015-08-27 12:36:29 -07:00
45c0c710e0
lint sandbox
2015-08-27 11:40:06 -07:00
ce364b472f
lint plugin
2015-08-27 11:35:41 -07:00
ed9e89b51f
super lint commonFramework
2015-08-27 11:23:17 -07:00
384dec42ac
mid finished linting commonFramework
2015-08-27 00:15:13 -07:00
8f54932cab
fix refactor codemirror
2015-08-27 00:02:07 -07:00
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
e36dd9970a
fix rx long stack trace support
2015-08-12 11:47:03 -07:00
38cb4b2873
remove loopback client files
2015-07-25 08:51:41 -07:00
a1a4ac883d
add user stores/actions
...
construct fetchr on every request
2015-07-24 22:27:52 -07:00
fa97111f00
bump thundercats
2015-07-23 16:03:50 -07:00
d0b1d83249
prefetch data and prime stores on client render
2015-07-23 16:03:47 -07:00
de1d931b82
add hikes/map pulls hikes out of db and renders
2015-07-23 16:03:46 -07:00
369bcc070c
various fixed to client rendering
2015-07-23 15:49:02 -07:00
e3acbe01a9
initial entry points up
2015-07-23 15:49:01 -07:00
a5e7009a57
initial react app(WIP)
2015-07-23 15:49:00 -07:00
fea17cad7f
add initial client config for loopback client
2015-07-23 15:48:59 -07:00
a8540bee35
add initial react app
2015-06-17 21:04:28 -07:00
56eb0e4e73
converted all auth functions to use mongoose
2013-11-14 00:15:52 -05:00
fc5563c70c
added sample app for client-server authentication
2013-11-13 17:16:06 -05:00
Quincy Larson
Berkeley Martinez
benmcmahon100
Quincy Larson
Arsen Melikyan
ahstro
Abhisek Pattnaik
Sahat Yalkabov