Commit Graph

9099 Commits

Author SHA1 Message Date
2ecffef956 add all talk tshirt 2016-08-30 13:00:23 -07:00
3e51e24891 Merge pull request #10266 from dhcodes/fix/disappearing-star
fix star disappearance after completing req challenges
2016-08-22 00:33:27 +05:30
6dda8ceecc fix star disappearance after completing req challenges 2016-08-18 12:41:37 -05:00
23e9e80514 Merge pull request #10257 from FreeCodeCamp/backup/staging
Release staging
2016-08-17 12:37:26 -07:00
d725284bf6 Merge pull request #10256 from QuincyLarson/fix/open-data-shirts-in-shop
add open data shirts to shop
2016-08-17 12:28:00 -07:00
e17d428a98 add open data shirts to shop 2016-08-17 12:15:27 -07:00
1c3fcfd849 Merge pull request #10179 from FreeCodeCamp/backup/staging
Release backup/staging
2016-08-12 13:03:49 -07:00
855dd2eb40 Merge pull request #10144 from raisedadead/feature/add-teespring-campaign
fix(shop): Add GA to Teespring Onesie campaign
2016-08-09 14:11:48 -07:00
bb0e332239 fix(shop): Add GA to Teespring Onesie campaign 2016-08-10 02:22:06 +05:30
ce08d40469 Merge pull request #10140 from raisedadead/feature/add-teespring-campaign
feature(shop): Add teespring onesie campaign
2016-08-09 12:41:52 -07:00
0875e19430 feature(shop): Add teespring onesie campaign 2016-08-09 12:50:18 +00:00
0e04165e98 Merge pull request #9988 from FreeCodeCamp/backup/staging
Release staging
2016-07-29 14:51:30 -07:00
078b844f0a Merge pull request #9960 from raisedadead/fix/pintrest-clone-app
Fix the pintrest clone app
2016-07-29 14:26:08 -07:00
421c4620eb Fix the pintrest clone app 2016-07-29 13:04:56 +05:30
8a25a5f3d3 Merge pull request #9946 from FreeCodeCamp/staging
Release staging
2016-07-28 23:02:30 -07:00
ec16357c83 Merge pull request #9880 from FreeCodeCamp/greenkeeper-react-router-bootstrap-0.23.1
Update react-router-bootstrap to version 0.23.1 🚀
2016-07-28 21:03:57 -07:00
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
88557bfa4b Redirect old wiki urls to root of forum
Remove extra callback
2016-07-28 16:01:00 -07:00
a406d7eb95 Merge pull request #9938 from FreeCodeCamp/staging
Release staging
2016-07-28 12:24:07 -07:00
372c548192 Merge pull request #9932 from QuincyLarson/feature/update-nonprofit-page
Feature/update nonprofit page
2016-07-28 12:17:39 -07:00
fbfff58f6b update views and CSS to reflect feedback from @berkeleytrue and @raisedadead 2016-07-28 12:10:31 -07:00
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
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
510ce1fe83 Show flash message on every page when cheater is logged in 2016-07-28 17:32:54 +04:00
afebd0e5a2 Make clear only one fluid-container is needed 2016-07-28 14:51:02 +02:00
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
f28e4a95f7 add route to nonprofit resources list 2016-07-28 00:12:32 -07:00
96759595be add nonprofit project page 2016-07-27 17:41:31 -07:00
8b158e6757 chore(package): update react-router-bootstrap to version 0.23.1
https://greenkeeper.io/
2016-07-27 13:56:55 -07:00
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
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
4eb7c65756 Merge pull request #9924 from FreeCodeCamp/fix/readme-wiki-links
Update readme wiki links
2016-07-27 13:23:52 -07:00
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
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
2c54990872 Merge pull request #9921 from FreeCodeCamp/staging
Release staging
2016-07-27 11:56:46 -07:00
95ad1867e8 Merge pull request #9920 from QuincyLarson/fix/update-local-groups
Fix local group list link
2016-07-27 11:54:07 -07:00
1929a2602c Fix local group list link 2016-07-27 11:42:10 -07:00
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
4741ac6b51 Changed the Note in manipulating-complex-objects challenge to make it less ambiguous 2016-07-27 10:52:22 -04:00
e808670460 chore(package): update connect-mongo to version 1.3.2
https://greenkeeper.io/
2016-07-27 03:03:15 -07:00
417b22ad5e Merge pull request #9900 from FreeCodeCamp/staging
Release staging
2016-07-26 10:21:45 -07:00
0520a7b3c9 Merge pull request #9893 from oalhait/branch/as-well-fix
Updated output box copy
2016-07-26 18:50:20 +05:30
95887774b7 Updated output box copy 2016-07-26 15:17:31 +03:00
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
91972ab4f3 Merge pull request #9808 from mizujin/translate/pig-latin
French Translation for Pig Latin challenge
2016-07-26 17:14:08 +05:30
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
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
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
df58d94d68 add public/js/frame-runner.js to .gitignore 2016-07-25 23:36:10 +05:30
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