Commit Graph

9036 Commits

Author SHA1 Message Date
94bc4d310e fix(csp): add optimizely for csp errors in production
This commit fixes the issues with optimizely scripts and bring the
file in sync with the staging.
2016-12-06 12:09:25 +00:00
687050e7f2 Merge pull request #11861 from QuincyLarson/feature/add-ugly-sweater
add ugly sweater to shop
2016-11-29 10:03:14 -08:00
a36e287d9f update image 2016-11-29 11:49:11 -06:00
c481c989d2 add ugly sweater to shop 2016-11-29 10:10:06 -06:00
292885fdc9 Merge pull request #11715 from chiptus/fix/backup-master-text-break-test-output
added word-wrap less rule to .test-output
2016-11-24 22:44:11 +00:00
dcdd116220 added word-wrap less rule to .test-output 2016-11-19 13:49:39 +05:30
1b5caf1378 Merge pull request #11599 from Manish-Giri/fix/remove-rules-from-projects
Remove rules from projects
2016-11-11 02:35:07 +05:30
670d40510a Remove rules from projects 2016-11-09 15:23:01 -05:00
1813a8514f add name-calling to the code of conduct (#11419)
* add name-calling to the code of conduct

* make unwanted attention clause more general
2016-10-28 13:07:45 +01:00
cc21cc9cf5 Merge pull request #11254 from QuincyLarson/fix/remove-ghost-from-shop
remove ghost shirt from shop
2016-10-17 20:31:45 -07:00
1241f5a8fc remove ghost shirt from shop 2016-10-17 19:55:12 -07:00
dae4306c31 Merge pull request #11213 from QuincyLarson/fix/new-forum-introduction-thread
Add new forum thread link for self-introductions
2016-10-14 17:55:10 -07:00
05d50be74f update campsite directions 2016-10-14 17:29:26 -07:00
4798ab5a09 another minor fix to the link 2016-10-14 16:56:47 -07:00
7a0e060c2e update challenges 2016-10-14 16:51:39 -07:00
8238cf9524 Merge pull request #11170 from Em-Ant/feature/twitch-passthrough
Add twitch api pass-through links
2016-10-13 15:17:13 -07:00
36f3fc4ec0 Merge pull request #11182 from QuincyLarson/fix/fix-welcome-page
fix welcome page
2016-10-12 17:01:23 -07:00
47edc01ae0 fix welcome page 2016-10-12 16:51:10 -07:00
ed893ef5bd Merge pull request #11181 from QuincyLarson/feature/halloween-tshirt
add halloween shirt to shop
2016-10-12 16:21:17 -07:00
957d7b7aa0 add halloween shirt to shop 2016-10-12 16:13:02 -07:00
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