Commit Graph

214 Commits (85510a2fd814dbe8b1f50548e665f6fcbe5dfeb9)

Author SHA1 Message Date
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