Commit Graph

26074 Commits

Author SHA1 Message Date
942e26fed5 Merge branch 'staging' of https://github.com/tcyrus/freecodecamp into tcyrus-staging 2015-08-01 11:30:22 -07:00
61a8a54682 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 11:29:54 -07:00
bb375b2a10 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 11:29:54 -07:00
5937ceaec7 Merge pull request #1432 from SaintPeter/sorted_union_bonfire
Added additional tests to Sorted Union Bonfire
2015-08-01 11:27:45 -07:00
d0a43508cc Merge pull request #1432 from SaintPeter/sorted_union_bonfire
Added additional tests to Sorted Union Bonfire
2015-08-01 11:27:45 -07:00
13bb5df68d Added extra regex moving on to fix scroller without those new images 2015-08-01 19:14:30 +01:00
061d567836 Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 19:14:07 +01:00
4e7c681d90 Added extra regex moving on to fix scroller without those new images 2015-08-01 19:13:37 +01:00
fd0307ffcf Added extra regex moving on to fix scroller without those new images 2015-08-01 19:13:37 +01:00
fdd16820ef Added extra regex moving on to fix scroller without those new images 2015-08-01 19:12:44 +01:00
7443236912 Added extra regex moving on to fix scroller without those new images 2015-08-01 19:12:44 +01:00
8270cb4103 add github auth 2015-08-01 08:39:13 -07:00
596f8f660a Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 08:26:07 -07:00
8bc67b3adf Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 08:26:07 -07:00
1e2011a354 fix some issues and finalize jquery challenges for today 2015-08-01 08:25:56 -07:00
b6a8725994 fix some issues and finalize jquery challenges for today 2015-08-01 08:25:56 -07:00
d4fc4cc8c3 All done without extra regex 2015-08-01 16:11:57 +01:00
f6564884a2 All done without extra regex 2015-08-01 16:11:57 +01:00
0f4d8b5c65 Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 16:10:58 +01:00
8f47390b79 Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 16:10:58 +01:00
8225ce3cdb All done without the extra regex 2015-08-01 16:10:21 +01:00
9370561579 All done without the extra regex 2015-08-01 16:10:21 +01:00
57592545d9 add two more jquery challenges 2015-08-01 07:11:11 -07:00
af6209f729 add two more jquery challenges 2015-08-01 07:11:11 -07:00
7b85031a8a fix issue with nonprofit show views not loading 2015-07-31 22:06:07 -07:00
d49cf387db remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
2c81ad568b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
7b890aca68 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
0c2e45acc3 fix path for windows machines 2015-07-31 20:31:42 -07:00
13f2f349dc remove bonfire/comments models
remove comments from user router
2015-07-31 20:22:08 -07:00
1606fcb24a remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
646fa1cbac remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
ee8776feb3 removes comments
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
99304b3a04 Added additional tests to Sorted Union Bonfire 2015-07-31 18:04:06 -07:00
69c96496ec Added additional tests to Sorted Union Bonfire 2015-07-31 18:04:06 -07:00
3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
e9ca550aa3 Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-08-01 00:47:39 +01:00
d52525f1f4 Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-08-01 00:47:39 +01:00
0e08bb8039 fix issue with codemirror framework and script tag rendering 2015-07-31 16:38:12 -07:00
ae38aab8cc fix issue with codemirror framework and script tag rendering 2015-07-31 16:38:12 -07:00
2833e96091 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 14:38:43 -07:00
43aa3cccba fix html view instruction column 2015-07-31 14:36:00 -07:00
2ccd6e3ee3 fix html view instruction column 2015-07-31 14:36:00 -07:00
6454f37079 fix upvoting story no longer gives you brownie points
closes #1008
2015-07-31 14:31:12 -07:00
e7f522a611 fix giveBrowniePoints error messages 2015-07-31 13:45:45 -07:00
fd06b81088 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 13:38:17 -07:00
a0230609f5 fix resultant javascript error on certain pages 2015-07-31 13:38:04 -07:00