Commit Graph

9016 Commits

Author SHA1 Message Date
51e7d2a4d5 Add twitch api pass-through links 2016-10-12 15:59:59 +02:00
813edb5dbc update sign in flow (#10873)
* update sign in flow and simplify welcome page slightly
2016-10-01 07:55:29 -04:00
0df0e1ee3f Merge pull request #10975 from genkibit/fix/twitch-challenge-instructions
Fix missing link in updated instructions
2016-09-29 19:29:04 +01:00
6dfed93708 Merge pull request #10974 from QuincyLarson/fix/remove-open-data-shirt
remove open data shirt and update sticker pack image
2016-09-29 16:56:57 +01:00
519d3ae40f remove open data shirt and update sticker pack image 2016-09-29 03:00:47 -07:00
0aef56ac51 Fix missing link in updated instructions 2016-09-29 05:54:31 -04:00
55c1ee5e09 Merge pull request #10875 from QuincyLarson/feature/new-stickers-in-shop
update sticker image again
2016-09-23 17:06:56 +01:00
bcdc25b3c8 Merge pull request #10867 from QuincyLarson/feature/new-stickers-in-shop
Add new stickers to shop
2016-09-22 22:29:41 -07:00
234790b59d update sticker image again 2016-09-22 19:29:28 -07:00
8c8419726f add better sticker image 2016-09-22 19:13:44 -07:00
c529d2fd26 add new stickers to shop 2016-09-22 18:00:38 -07:00
25e6d00700 Merge pull request #10798 from genkibit/fix/twitch-challenge-instructions
Update instructions to address API change
2016-09-18 21:13:25 -07:00
f3f3343557 Update instructions to address API change 2016-09-18 15:05:43 -04:00
94cdbc0725 Merge pull request #10682 from QuincyLarson/feature/add-hoodie-to-master-shop
add hoodie to shop
2016-09-10 14:17:28 -07:00
70b3cc767e add hoodie to shop 2016-09-10 12:21:04 -07:00
428ed01bb7 Merge pull request #10400 from FreeCodeCamp/backup/staging
Release staging
2016-08-30 14:15:53 -07:00
035af723c8 Merge pull request #10398 from QuincyLarson/feature/add-all-talk-shirt
add all talk tshirt
2016-08-30 14:08:37 -07:00
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