Commit Graph

8921 Commits (94b44059e6ceabd6390149f1854a5f1424781855)

Author SHA1 Message Date
Berkeley Martinez 94b44059e6 Merge pull request #9941 from alanbares/fix/wiki-url-root-forum
Redirect old wiki urls to root of forum
2016-07-28 16:29:21 -07:00
alanbares 88557bfa4b Redirect old wiki urls to root of forum
Remove extra callback
2016-07-28 16:01:00 -07:00
Berkeley Martinez 372c548192 Merge pull request #9932 from QuincyLarson/feature/update-nonprofit-page
Feature/update nonprofit page
2016-07-28 12:17:39 -07:00
Quincy Larson fbfff58f6b update views and CSS to reflect feedback from @berkeleytrue and @raisedadead 2016-07-28 12:10:31 -07:00
Mrugesh Mohapatra efb0c1161b Merge pull request #9919 from bugron/feature/flash-cheater-everywhere
Show flash message on every page when cheater is logged in
2016-07-28 20:43:42 +05:30
Mrugesh Mohapatra 0b09df18d6 Merge pull request #9935 from JelteF/fix/fluid-container-wording
Make clear only one fluid-container is needed
2016-07-28 19:34:06 +05:30
Arsen Melikyan 510ce1fe83
Show flash message on every page when cheater is logged in 2016-07-28 17:32:54 +04:00
Jelte Fennema afebd0e5a2 Make clear only one fluid-container is needed 2016-07-28 14:51:02 +02:00
HKuz 8e163b8960 Fixed issue #9925 in package.json changed connect-mongo: ~1.3.2 to ^1.3.2 (#9928) 2016-07-28 09:37:10 +01:00
Quincy Larson f28e4a95f7 add route to nonprofit resources list 2016-07-28 00:12:32 -07:00
Quincy Larson 96759595be add nonprofit project page 2016-07-27 17:41:31 -07:00
Berkeley Martinez dad3e13b97 Merge pull request #9912 from FreeCodeCamp/greenkeeper-connect-mongo-1.3.2
Update connect-mongo to version 1.3.2 🚀
2016-07-27 13:56:37 -07:00
Berkeley Martinez c1700a9793 Merge pull request #9890 from alanbares/fix/normalize-ga-event-data
Normalize ga event data in shop.jade
2016-07-27 13:55:06 -07:00
Berkeley Martinez 4eb7c65756 Merge pull request #9924 from FreeCodeCamp/fix/readme-wiki-links
Update readme wiki links
2016-07-27 13:23:52 -07:00
Quincy Larson 95b597deeb Update readme wiki links
Since our wiki has moved to the forum, I'm updating these links to redirect there.
2016-07-27 13:11:55 -07:00
alanbares e7a0379490 Normalize ga event data in shop.jade
Normalize ga event data in main.js

Normalize ga event data in bindings.js

Remove unecessary info in labels
2016-07-27 12:52:40 -07:00
Berkeley Martinez 95ad1867e8 Merge pull request #9920 from QuincyLarson/fix/update-local-groups
Fix local group list link
2016-07-27 11:54:07 -07:00
Quincy Larson 1929a2602c Fix local group list link 2016-07-27 11:42:10 -07:00
That Guy d34f69336a Merge pull request #9916 from agrullon95/fix/Ambiguous-Note
Changed the Note in manipulating-complex-objects challenge to make it less ambiguous
2016-07-27 16:42:05 +01:00
Anthony Grullon 4741ac6b51 Changed the Note in manipulating-complex-objects challenge to make it less ambiguous 2016-07-27 10:52:22 -04:00
greenkeeperio-bot e808670460 chore(package): update connect-mongo to version 1.3.2
https://greenkeeper.io/
2016-07-27 03:03:15 -07:00
Mrugesh Mohapatra 0520a7b3c9 Merge pull request #9893 from oalhait/branch/as-well-fix
Updated output box copy
2016-07-26 18:50:20 +05:30
Omar 95887774b7 Updated output box copy 2016-07-26 15:17:31 +03:00
Mrugesh Mohapatra a0e3f01a0c Merge pull request #9815 from mizujin/translate/fr-javascript
French Translation JavaScript Basics n°1 and n°2
2016-07-26 17:14:21 +05:30
Mrugesh Mohapatra 91972ab4f3 Merge pull request #9808 from mizujin/translate/pig-latin
French Translation for Pig Latin challenge
2016-07-26 17:14:08 +05:30
Mrugesh Mohapatra 9ee1d1beec Merge pull request #9793 from mizujin/translate/html5_css_FR
French Translation for HTML and CSS
2016-07-26 17:13:49 +05:30
Berkeley Martinez b89a5a8443 Merge pull request #9884 from raisedadead/fix/add-frame-runner-to-gitignore
add public/js/frame-runner.js to .gitignore
2016-07-25 11:59:09 -07:00
That Guy 358c620061 Merge pull request #9881 from dhcodes/fix/improved-tests-for-basic-js-arrays
Improve tests on Basic JS array challenges
2016-07-25 19:13:53 +01:00
Mrugesh Mohapatra df58d94d68 add public/js/frame-runner.js to .gitignore 2016-07-25 23:36:10 +05:30
Berkeley Martinez 4394e5c72b Merge pull request #9872 from FreeCodeCamp/snyk-fix-9a4b3f6d
[Snyk Alert] Fix for 4 vulnerable dependency paths
2016-07-25 10:49:23 -07:00
dhcodes 36f1c9aeb6 improve tests on Basic JS array challenges 2016-07-25 09:57:35 -05:00
Arsen Melikyan 761362b0fa Merge pull request #9869 from dhcodes/fix/disappearing-star
Fix disappearing star upon completion of required challenge
2016-07-25 14:05:13 +04:00
Dylan c8c9ae2871 fix disappearing star on completed challenges 2016-07-24 14:36:15 -05:00
snyk-bot 9aed0fa9de fix: package.json & .snyk to reduce vulnerabilities 2016-07-24 17:05:18 +00:00
Arsen Melikyan b83c716f33 Merge pull request #9845 from raisedadead/fix/store-data-in-mongodb
Add breaks to the instructions
2016-07-24 15:39:37 +04:00
Mrugesh Mohapatra 4af3e5e86e Merge pull request #9288 from Bouncey/Fix/Imporove-Accessibility
Fix/Improve Accessibilty Practices
2016-07-23 23:11:56 +05:30
Mrugesh Mohapatra 5be03117db Merge pull request #9840 from LeeWarnock/fix/#9776
fixes issue Add a hat symbol to babel-eslint version
2016-07-23 23:07:12 +05:30
Lee Warnock d7b7fb67a5 fixes issue Add a hat symbol to babel-eslint version 2016-07-23 12:13:11 -05:00
Mrugesh Mohapatra 96fab09223 Merge pull request #9854 from gangachris/feature/enable-editor-comments
Add ability to toggle comments with control+/ or command+/ keymap
2016-07-22 23:40:21 +05:30
gangachris c184609340 Add ability to toggle comments with ctrl/cmd + / keymap
Add ability to comment on editor with ctrl + /

load codemirror commenting plugin
2016-07-22 19:13:07 +03:00
Mrugesh Mohapatra 93b366e1c3 Add breaks to the instructions 2016-07-22 12:00:03 +00:00
Mrugesh Mohapatra baaf50b529 Merge pull request #9647 from Grantlyk/fix/disk-space-error
Modified mongodb.json to resolve "Not enough disk space" error
2016-07-22 16:59:39 +05:30
Mrugesh Mohapatra af06badab8 Merge pull request #9825 from dhcodes/fix/remove-wiki-sidebar
Remove Wiki Sidebar HTML, LESS, JS
2016-07-22 16:55:01 +05:30
Mrugesh Mohapatra 296e4e1807 Merge pull request #9839 from carlosvigil/fix/fix-typo
Cleanup CONTRIBUTING.md
2016-07-22 16:13:03 +05:30
Carlos Vigil 2bea60a02b Cleanup CONTRIBUTING.md
Lint with Remark: correct numbered lists numbers, add spaces to lists,
use headings in single decreasing increments, reformat table for 
readability, correct spelling error, correct emphasis syntax, add 
clarification for npm requirement, and reflow line length for 80 
column limit.
2016-07-21 21:44:27 -04:00
Eric Leung 0541ebcc98 Merge pull request #9836 from BKinahan/fix/confirm-ending-tests
Change two tests on Confirm the Ending
2016-07-21 15:46:41 -07:00
BKinahan d6e5efe13e Change two tests on Confirm the Ending 2016-07-21 19:56:04 +00:00
dhcodes 70769d56a5 remove Wiki sidebar HTML, LESS, JS
remove Wiki sidebar
2016-07-21 09:59:32 -05:00
Stuart ff5a28a0d9 Fix/Improve Accessibilty Practices 2016-07-21 15:03:17 +01:00
Mrugesh Mohapatra c9add5f8d6 Merge pull request #9785 from alanbares/fix/fix-ordered-list-bug
Fix Ordered list test bug
2016-07-21 18:08:08 +05:30