Commit Graph

4075 Commits

Author SHA1 Message Date
ca26efa4fb Merge branch 'Sazumo-1248' of https://github.com/Sazumo/freecodecamp into Sazumo-Sazumo-1248 2015-08-01 16:12:08 -07:00
32ce40b815 add beta site warning 2015-08-01 16:11:05 -07:00
e8380cac28 Merge pull request #1303 from akkatracker/patch-1
Add full stop where needed.
2015-08-01 13:31:17 -07:00
02dabaf851 Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 20:46:42 +01:00
dc0f72292a Remove the backslash escaping from JavaScript challenge output (e.g. \") 2015-08-01 20:45:07 +01:00
4ace7e9d12 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 12:36:55 -07:00
21cc71ab24 add help room to chat room challenge, thanks to SaintPeter's suggestion 2015-08-01 12:36:42 -07:00
8ded4558cf add back path join in gulpfile
DO NOT REMOVE
2015-08-01 12:28:31 -07:00
0a34dcf6c3 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:25:49 +01:00
c075eb0116 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:24:16 +01:00
f60bfd5da1 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:22:02 +01:00
aef867cc69 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:20:19 +01:00
a5b1d23a3c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 12:16:14 -07:00
44007c9643 implement ckylee additional test to everything be true bonfire #1397 2015-08-01 12:14:25 -07:00
608071df08 added a width to make the scrolling editor look nice 2015-08-01 20:01:47 +01:00
87565c9efb Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 19:56:45 +01:00
abfab7389b Added the scrolling editor 2015-08-01 19:55:40 +01:00
cc890d017a Merge pull request #1399 from biellls/patch-1
Change order of subarrays to cover all cases
2015-08-01 11:53:47 -07:00
960ea1be1d Merge branch 'tcyrus-staging' into stagingt push origin staging: 2015-08-01 11:46:32 -07:00
2b9c89eccc fixed tcyrus broken pull request and also extend its methodology to another challenge 2015-08-01 11:45:59 -07:00
8ba28e5150 Merge branch 'staging' into tcyrus-staging 2015-08-01 11:35:22 -07:00
ed38295fea Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 11:35:04 -07:00
5209758583 urgent fix 2015-08-01 19:34:20 +01:00
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
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
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
fd0307ffcf Added extra regex moving on to fix scroller without those new images 2015-08-01 19:13:37 +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
1e2011a354 fix some issues and finalize jquery challenges for today 2015-08-01 08:25:56 -07:00
f6564884a2 All done without extra regex 2015-08-01 16:11:57 +01:00
8f47390b79 Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 16:10:58 +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
7b85031a8a fix issue with nonprofit show views not loading 2015-07-31 22:06:07 -07:00
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -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
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
3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07: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
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