Commit Graph

400 Commits (7aeceaf97ec8fd8648eb2a036fbbedd74aecfe47)

Author SHA1 Message Date
Berkeley Martinez 019a28a5cc Fix remove semi-colon guard
Users should be instructed to always use semi-colons
2016-01-09 18:16:10 -08:00
Berkeley Martinez 8e930fbe8a Add toasts to react app 2016-01-07 15:04:32 -08:00
Berkeley Martinez 4e5da23844 Add error handling
In the near future these will be handled by a toast.
2016-01-05 12:34:50 -08:00
Berkeley Martinez ea574d721e Make document titles work 2016-01-04 14:27:22 -08:00
Berkeley Martinez 80d36cc3cd Get router history working with flux 2016-01-04 14:27:22 -08:00
Berkeley Martinez acb05e3a71 Question now semi functional 2016-01-04 14:27:22 -08:00
Berkeley Martinez cec243b032 [add] Upgrade ThunderCats react 2016-01-04 14:27:22 -08:00
Akshay Arora 1ba950edd8 Fixed grammar and put a full stop.
In the preview there is no line break, thus full stop is necessary for readability.
2016-01-04 12:16:26 +05:30
Berkeley Martinez a762bd474b Merge pull request #5783 from SaintPeter/fix/head-tail-joins
Fix issues where bad user code hits the tail
2016-01-03 16:35:45 -08:00
Dieter Daems dba9654a09 Fix linting errors 2016-01-03 05:48:23 +01:00
SaintPeter 6d8fe315e6 Fix issues where bad user code hits the tail 2016-01-02 14:13:43 -08:00
Rex Schrader a4c75a90f6 Merge pull request #5378 from geoff616/fix/loop-disable-error-message
More descriptive error message for disabling loop protection
2016-01-02 09:47:46 -08:00
Geoff Wright 18901149d9 changing loop error message to close issue 5345 2016-01-02 10:53:26 -05:00
Dieter Daems f955674430 Fixes: Reset does not clear localstorage item
- Updates the addresbar URI
2016-01-02 02:05:38 +01:00
Berkeley Martinez 0c42368cae Merge pull request #5545 from FreeCodeCamp/new/basic-javascript-revamp
Basic Javascript Revamp
2015-12-30 08:58:41 -08:00
SaintPeter ec01155c0d Change display for blockquote and h4 lines 2015-12-28 09:38:46 -08:00
SaintPeter b8e7d2b403 New challenge specific CSS 2015-12-28 09:38:44 -08:00
evaristoc c681c2e858 ga completion event modif 2015-12-23 23:31:48 +01:00
Logan Tegman 2a5c382697 Merge pull request #5316 from josh3336/fix/mobile-map-list
Fixes issue with map line numbering breaking into differnet lines
2015-12-16 10:56:02 -08:00
joshua pagano 254a3511cc Fixes issue with map line numbering breaking into differnet lines
[Fixes #5309]
2015-12-15 22:53:55 -08:00
Berkeley Martinez 154ae0e489 Fix challenge ga time completion 2015-12-13 01:06:33 -08:00
Quincy Larson 6d911a70cd Merge pull request #5119 from FreeCodeCamp/fix/commit-directory
Add new cert goals to commit
2015-12-11 18:46:48 -06:00
Quincy Larson 473a77e0a2 update copy and improve look of commit and its directory 2015-12-10 00:01:09 -06:00
Logan Tegman 0dbf56e23a Merge pull request #5117 from FreeCodeCamp/landing-change
Update landing icons and copy to reflect React and D3
2015-12-09 14:38:50 -08:00
Quincy Larson 3b320c8852 improve look of commit views 2015-12-09 15:39:36 -06:00
Quincy Larson 747dbfe750 update landing icons 2015-12-09 14:13:18 -06:00
Berkeley Martinez 579c569d15 Fix remove bonfire save endpoint
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
Rex Schrader 6b7a314205 Merge pull request #5076 from FreeCodeCamp/update-ziplines
Update ZIpline and Basejump code review instructions, remove gist export
2015-12-08 16:13:58 -08:00
JelenaBarinova 96375bb643 Challenge numbering in Map fixed to work properly on IE. 2015-12-08 11:46:35 -08:00
Quincy Larson 9409945ee7 Merge branch 'staging' into update-ziplines
Conflicts:
	client/commonFramework/bindings.js
2015-12-08 01:17:03 -06:00
Logan Tegman c23367f62b Merge pull request #5038 from bugron/fix/common-improvements
Some common code improvements
2015-12-07 06:48:47 -08:00
Quincy Larson 92928b552b update user stories and sharing instructions for basejumps and ziplines 2015-12-07 00:51:37 -06:00
Arsen Melikyan 029cd52e80 Some common code improvements 2015-12-06 13:26:02 +04:00
Berkeley Martinez 415a39ea17 Make code-uri more robust 2015-12-05 14:53:33 -08:00
Quincy Larson 615f553fd2 fix editor height 2015-12-04 21:47:30 -06:00
Berkeley Martinez 3462ba791e Fix camper news submit 2015-12-04 19:23:06 -08:00
Quincy Larson 676ef0e253 finish qa-ing removal of angular 2015-12-04 19:21:19 -06:00
Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Berkeley Martinez 0b42712a1f Fix moving of query behind hash 2015-12-03 17:37:00 -08:00
Berkeley Martinez b7530253aa Also disable output and tests 2015-12-03 15:09:52 -08:00
Berkeley Martinez 81028fceac Add ability to disable user code on page load
Adding `run=disabled` to the uri will disable the
page from running user code.

This is useful for pages that have frozen to to infinite loops
or untrusted links that may be malicious
2015-12-03 14:57:19 -08:00
Berkeley Martinez ebfee3ed0a Load jquery from a script tag in iframe 2015-12-03 12:13:25 -08:00
Berkeley Martinez 096fba0de7 Add loop protection on keyup update 2015-12-02 14:56:06 -08:00
Berkeley Martinez 8ec4720345 Patch test text for non conforming tests 2015-12-02 13:04:50 -08:00
Berkeley Martinez b8d0d78f81 Add delays so firefox can catch up 2015-12-02 11:50:53 -08:00
Berkeley Martinez 0dfb317a38 Remove console.log 2015-12-02 11:50:53 -08:00
Berkeley Martinez 8cad219082 Patch assert messages without `message: ` format 2015-12-02 11:50:53 -08:00
Berkeley Martinez 636824aba3 Display infinite loops to user
Also exits early if infinite loop
2015-12-02 11:50:53 -08:00
Berkeley Martinez f904f91f97 Actually use loopProtect 2015-12-02 11:50:53 -08:00
Berkeley Martinez 3a299daa37 Add loop-protect
Remove webworkers
2015-12-02 11:50:52 -08:00
Berkeley Martinez 1235077354 Fix don't need to pull jquery from cdn anymore 2015-12-02 11:26:16 -08:00
Arsen Melikyan d81ad77955 Fix test message position 2015-12-01 22:53:05 +04:00
Logan Tegman 9fb63b954d Merge pull request #4851 from bugron/fix/gist-sharing
Fix gist sharing and some other issues
2015-12-01 09:21:11 -08:00
Logan Tegman cb56c34af4 Merge pull request #4852 from bugron/fix/codemirror-line-height
Fix CodeMirror class line-height property value
2015-12-01 09:06:51 -08:00
Berkeley Martinez 426526355c Fix initial load error 2015-12-01 08:01:51 -08:00
Berkeley Martinez aa0297c2f2 Fix editor.getValue not returning the correct code 2015-12-01 08:01:11 -08:00
Arsen Melikyan a661b05f86 Fix CodeMirror class line-height property value 2015-12-01 14:54:51 +04:00
Arsen Melikyan 2a81a2e887 Fix not working gist sharing 2015-12-01 14:20:45 +04:00
Arsen Melikyan b5ce9ca6fc Remove a hash symbol from split method 2015-12-01 14:14:12 +04:00
Arsen Melikyan 3b140bc813 Fix issue search query 2015-12-01 14:11:45 +04:00
Berkeley Martinez 574709159d Fix use the document as the proxy for jquery
We proxy the jquery object. This lets us use the jQuery that FCC
uses in the iframe.

Since jQuery sets the context, the main document object or DOM, at script
load, we need to create a proxy with the context of the iframe,
the document object of the iframe.

This was originally set to the body element. But not all challenges
require a body element.
2015-11-30 21:48:28 -08:00
Arsen Melikyan 1543d2b745 Fix challengeTypes object incorrect key names 2015-11-30 18:59:29 +04:00
Berkeley Martinez 0275351490 Increase updatePreview delay 2015-11-29 16:28:32 -08:00
Berkeley Martinez 28e4252a00 Fix errors breaking pipe 2015-11-29 16:28:32 -08:00
Berkeley Martinez 7592131e08 Tell jquery not to execute when getting script 2015-11-29 16:28:32 -08:00
Berkeley Martinez da67e77fad Fix error logic and output display 2015-11-29 16:28:32 -08:00
Berkeley Martinez 04db6744b9 Fix code output logic
Fix codemirror url paths
2015-11-29 16:28:32 -08:00
Berkeley Martinez 8c261180d3 Fix incorrect logic 2015-11-29 16:28:32 -08:00
Berkeley Martinez 2610573871 Bind to keyup events if editor is present 2015-11-29 16:28:32 -08:00
Berkeley Martinez ce37991c50 Remove console.logs 2015-11-29 16:28:32 -08:00
Berkeley Martinez eec7fff909 Fix jQuery challenges 2015-11-29 16:28:32 -08:00
Berkeley Martinez 159b202940 Update preview on keystroke
Also removes need to check for unfinished html comments
2015-11-29 16:28:32 -08:00
Berkeley Martinez e8d9e31a47 Fix bad ctrl enter logic 2015-11-29 16:28:32 -08:00
Berkeley Martinez f9bdc32474 Fix editor in iFrame should be the code
This should be changed
2015-11-29 16:28:32 -08:00
Berkeley Martinez 6638412cc3 Preview tests now run correctly
Pulling jQuery from the parent frame
2015-11-29 16:28:32 -08:00
Berkeley Martinez 5a785dbad7 Load iFrame on page load 2015-11-29 16:28:32 -08:00
Berkeley Martinez 6f98f62dd9 Add delay to initial execute 2015-11-29 16:28:32 -08:00
Berkeley Martinez d2be64cfb5 Add err handling to test run 2015-11-29 16:28:32 -08:00
Berkeley Martinez 83ad2e14eb Save to localStorage/uri on editor key debounce 2015-11-29 16:28:32 -08:00
Berkeley Martinez fe659b20f4 Submit show completion 2015-11-29 16:28:32 -08:00
Berkeley Martinez 7593dc4e1b Properly display tests 2015-11-29 16:28:32 -08:00
Berkeley Martinez 74fa49cd75 Reset and execute update display and storage 2015-11-29 16:27:14 -08:00
Berkeley Martinez 4bdf1b2854 Add gulp build of commonFramework 2015-11-29 16:27:14 -08:00
Berkeley Martinez 29f90505b7 More refactoring 2015-11-29 16:27:14 -08:00
Berkeley Martinez 748f7ab93f Progress towards refactoring 2015-11-29 16:21:04 -08:00
Berkeley Martinez 87fa38182e bundle vendor files 2015-11-29 16:20:17 -08:00
Matthias Kern d872829f06 Fix the sliding in/out issues closes #4721 2015-11-27 13:32:18 +02:00
Berkeley Martinez 82dc1cf3b5 Merge pull request #4579 from ltegman/fix/update-react-bootstrap
Update to react-bootstrap 0.28.1 and widen react nav
2015-11-20 10:57:51 -08:00
Quincy Larson 66d384c4c9 Improve look of links page 2015-11-20 01:25:49 -06:00
Logan Tegman 3a9745974c Update to react-bootstrap 0.28.1 and widen react nav
+ Moved away from deprecated navbar components and props
+ Removed mixin from NavItem
+ Updated stylesheet so the `.container` react-bootstrap adds doesn't impact nav positioning
2015-11-19 23:09:30 -08:00
Quincy Larson 9d08c1702e update navbar, remove footer, create links page 2015-11-19 22:46:36 -08:00
SaintPeter 86e4165c4c Step Challenge - Prev from end, x/y step display 2015-11-16 21:57:35 -08:00
Quincy Larson debfb07ab8 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-11-13 17:15:23 -08:00
Quincy Larson 0695860434 improve styling of completed challenges table 2015-11-13 17:08:51 -08:00
Quincy Larson 61ffb55a3d Merge branch 'staging' into fix/update-labs
Conflicts:
	common/app/routes/Jobs/components/Jobs.jsx
2015-11-12 16:38:30 -08:00
Quincy Larson 3dcc77278b add testimonial to jobs and remove twitter button 2015-11-12 16:36:08 -08:00
Berkeley Martinez 9ca11ebed2 Hotfix ignore bonfireExecute on basejump challenges 2015-11-08 20:12:56 -08:00
Berkeley Martinez 8fe3a075bf Hotfix fix basejump-zipline completion 2015-11-08 20:05:12 -08:00
Logan Tegman 2667b574bf Fixes small bugs
+ With MDNLinks and bonfireExecute being run on step challenges.
+ Return when common isn't loaded in reBindModals instead of throwing.
2015-11-07 13:00:44 -08:00
Berkeley Martinez 2ed6143c68 Add type safety to arrayToNewLineString 2015-11-06 17:53:06 -08:00
Berkeley Martinez a57d288aa7 Rename arrayToNewLineString
because naming things is hard
2015-11-06 17:51:04 -08:00
Berkeley Martinez 328e75812a Fix lint issues with gist saving 2015-11-06 17:48:17 -08:00
Berkeley Martinez 5dbfbfcf57 Add head/tail to challenge spec.
Lint EVERYTHING!
2015-11-06 17:32:01 -08:00
Logan Tegman 5b4eafe751 Merge pull request #3995 from bugron/feature/save-bonfire-solution-as-github-gist
Save bonfire's solution as a GitHub gist
2015-11-06 17:21:01 -08:00
Berkeley Martinez 696c038a26 Merge pull request #4168 from ltegman/fix/code-editor-spamming-browser-history-4167
Fix Code Editor Changes Creating Duplicate History Entries
2015-11-05 17:28:13 -08:00
Berkeley Martinez 325e121d4e Merge branch 'feature/find-posted-news-by-username' of https://github.com/bugron/FreeCodeCamp into bugron-feature/find-posted-news-by-username 2015-11-05 16:46:29 -08:00
Berkeley Martinez 8f3c3e3972 Fix most lint issues 2015-11-04 12:37:25 -08:00
Logan Tegman c38841c5af Fix Code Editor Changes Creating Duplicate History Entries
Closes #4167
2015-11-04 11:04:54 -08:00
Arsen Melikyan 8a5e12f6f3 find users news by typing their usernames in search box and fix FF CSS issue 2015-11-04 22:28:13 +04:00
Arsen Melikyan bf40338719 improve gist's title 2015-11-04 15:49:08 +04:00
Arsen Melikyan 59bd917a2c save bonfire solution as a gist and fix search issue button query string 2015-11-04 15:48:20 +04:00
Berkeley Martinez a8b61f566d Merge pull request #4156 from FreeCodeCamp/testimonial-update
Testimonial update and landing page improvement
2015-11-03 22:15:18 -08:00
Logan Tegman 9bc6048a8d Merge pull request #4122 from junhaoyap/feature/command-key
The cmd and ctrl button now both trigger events
2015-11-03 21:26:09 -08:00
junhaoyap 64ab919613 Make cmd and ctrl both trigger events 2015-11-03 20:59:07 -08:00
Quincy Larson 559822485d update landing page 2015-11-03 17:37:58 -08:00
Quincy Larson d77d78a3b2 Merge branch 'staging' into feature/jobs
Conflicts:
	seed/jobs.json
2015-11-02 00:07:16 -08:00
Berkeley Martinez e04e70493a Merge pull request #3873 from ankitaggarwal011/fix/removeComments-method-improvement
Temporary fix for bugs due to removeComments method
2015-11-01 22:13:17 -08:00
Berkeley Martinez 254e0cdbf3 Merge pull request #3984 from ltegman/fix/ctrl-enter-works-when-not-logged-in-3900
Fix Ctrl-Enter doesn't work when not logged in.
2015-11-01 17:27:55 -08:00
Berkeley Martinez f7530701ca Change step challenge button layout 2015-10-31 22:48:42 -07:00
Berkeley Martinez 7532094abc Merge branch 'feature/add-back-button-to-step-challenges' of https://github.com/bugron/FreeCodeCamp into bugron-feature/add-back-button-to-step-challenges 2015-10-31 22:22:39 -07:00
Arsen Melikyan ab83f6d5fa adds back button for step challenges 2015-10-31 17:24:05 +04:00
Quincy Larson 03f189b260 add reddit add and update landing map stats 2015-10-30 23:39:11 -07:00
Berkeley Martinez 9637c8739a Fix bold font issues 2015-10-30 15:43:50 -07:00
Berkeley Martinez 809b74307c Remove navbar active color 2015-10-30 12:41:00 -07:00
Berkeley Martinez 83e82bd967 Fix issue with transitioning between routes 2015-10-29 17:10:30 -07:00
Berkeley Martinez d633f74ff9 Change goToPayPal flow 2015-10-29 17:10:30 -07:00
Berkeley Martinez 24927748e0 Move highlighting around 2015-10-29 17:10:28 -07:00
Berkeley Martinez cc736cda4e Add certs/isRemote flags to job form and model 2015-10-29 17:10:28 -07:00
Berkeley Martinez 0c6a9bbd71 Add more copy on show job 2015-10-29 17:10:27 -07:00
Berkeley Martinez 0a7f31a1d1 Add twitter follower button to board 2015-10-29 17:10:27 -07:00
Berkeley Martinez 2b6a84c1f5 Fix lint errors. Add more copy 2015-10-29 17:10:27 -07:00
Berkeley Martinez 6512170e9b Add styling to preview jobs
Add cursor pointer
2015-10-29 17:10:26 -07:00
Berkeley Martinez a65384e698 Make list an actual list instead of accordion 2015-10-29 17:10:26 -07:00
Berkeley Martinez da26f19cde Adds paypal button and completes the number of views 2015-10-29 17:10:26 -07:00
Logan Tegman 7fd5174fe0 Fix Ctrl-Enter doesn't work when not logged in.
Closes #3900

First time contributing real code, so please let me know any critiques or style changes I should make.
2015-10-29 00:13:20 -07:00
Ben McMahon 3883483d8d Merge pull request #3595 from FreeCodeCamp/curriculum/JSONAndAJAX
Curriculum/json and ajax for QA and copy check
2015-10-26 00:47:30 +00:00
Ankit Aggarwal 8157c6e20c Temporary fix to bugs due to removeComments method-closes #3763 2015-10-24 12:45:30 +05:30
Quincy Larson e7c6e626e0 merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
Berkeley Martinez 756efcd9fb Fix linting in JavaScript editor 2015-10-23 15:38:51 -07:00
hugoender c9621aac2b Change .fa class style text-decoration property to none 2015-10-18 21:48:21 -04:00
Ankit Aggarwal dea4bf3973 Fix for create-my-github-issue button not working 2015-10-18 02:18:26 +05:30
Berkeley Martinez 12eeef2f41 Add chat room titles 2015-10-16 16:10:45 -07:00
Berkeley Martinez fc97bc8266 Add help button toggle 2015-10-16 15:24:35 -07:00
Berkeley Martinez 465a3e399c Add identifiers to chat embed divs 2015-10-16 14:00:02 -07:00
Berkeley Martinez 35219cdce3 Add main chat window on nav bar chat click 2015-10-16 11:57:33 -07:00
Berkeley Martinez a0182957e7 Add chat to challenges! 2015-10-16 10:37:35 -07:00
Berkeley Martinez c578a68ec8 Merge pull request #3360 from bugron/fix/highlight-bonfire_code_in-GitHub_issues
Adds a switch case to highlight bonfires' code in GitHub issues
2015-10-15 18:37:08 -07:00
Quincy Larson c552b6d05b Merge pull request #3748 from FreeCodeCamp/feature/add-ga-social-tracking
Add google analytics tracking
2015-10-14 21:57:44 -07:00
Quincy Larson cf45d2b01f update landing page and stories 2015-10-14 21:42:29 -07:00
Berkeley Martinez 7c0d801d63 Add google analytics tracking 2015-10-14 21:26:22 -07:00
Quincy Larson 3dee03d38b add more stories and clean up css 2015-10-12 01:22:11 -07:00
Quincy Larson 51012bd121 remove console.log statement 2015-10-11 17:05:28 -07:00
Berkeley Martinez 1627aa522a Fix form action attribute regex
Should ignore whitespace and new lines
2015-10-10 11:44:20 -07:00
Berkeley Martinez 91df8cba6f Merge pull request #3666 from FreeCodeCamp/fix/commit
update look of commit
2015-10-08 17:26:07 -07:00
Quincy Larson 6fafbdf441 improve stories view 2015-10-08 17:05:42 -07:00
Berkeley Martinez 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
Quincy Larson cdbd052b35 Merge branch 'staging' into clementine 2015-10-07 01:29:15 -07:00
Berkeley Martinez 0f6cdf8be1 Merge pull request #3615 from FreeCodeCamp/feature/commit
Add feature Commit
2015-10-07 01:23:24 -07:00
Quincy Larson 4f26d82f65 add labs and stories 2015-10-07 00:17:18 -07:00
Berkeley Martinez bc6a9c6db2 Add redirect to user page on submit 2015-10-06 19:51:19 -07:00
Quincy Larson b1d8814aed remove angular from views 2015-10-06 16:43:46 -07:00
Berkeley Martinez 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
Quincy Larson 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
benmcmahon100 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
Quincy Larson c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
Berkeley Martinez 8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
benmcmahon100 da09a7b650 Brought in line with staging and added spoofigator! 2015-10-05 23:42:30 +01:00
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
Quincy Larson 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
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
Arsen Melikyan 8424fef76f adds a switch case to highlight bonfires' code in GitHub issues 2015-09-19 15:58:58 +04: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