Commit Graph

10760 Commits

Author SHA1 Message Date
7bda4580fe Merge pull request #15997 from Aayush-N/fix/server-readme-grammar
Corrected README grammar
2017-10-20 21:47:43 +05:30
2f15900401 Corrected server README grammar 2017-10-20 20:16:53 +05:30
0874376815 Merge pull request #15751 from DusanSacha/feature/add-basis-js-challenge-return-undefined
feat(seed): Add new Basis JS Challenge Return Undefined
2017-10-20 19:58:31 +05:30
bae640b323 Merge pull request #15996 from Dawsmonkee/patch-1
Changed grammar
2017-10-20 19:06:35 +05:30
593dbd42aa Changed grammar
Removed comma and put in appropriate and instead.
2017-10-20 09:15:40 +01:00
a30409859d fix(instructions): fix spacing and correct example code for max heap and binary search tree problems 2017-10-19 01:37:01 -04:00
4ab129683b Merge pull request #15923 from ResamVi/feature/jquery-introduction
Add introduction to jQuery challenge section
2017-10-17 14:24:56 -05:00
5214371ef1 fix(seed-update): browser console, fCC Console, functionality of both (#15660) 2017-10-17 13:41:46 -04:00
19ebed94a5 feat(seed): Add introduction to jQuery challenge section
Additions
2017-10-17 19:21:58 +02:00
c5ad62e514 Merge pull request #15969 from felixonmars/fix/a-typo
Fix a typo in server/boot/challenge.js
2017-10-17 09:49:37 -07:00
b575dd1122 Fix a typo in server/boot/challenge.js 2017-10-18 00:23:14 +08:00
06971a752e Merge pull request #15954 from no-stack-dub-sack/fix/syntax-highlighting
fix(editor): restore syntax highlighting for light theme
2017-10-14 09:46:21 -07:00
f868862c0f fix(editor): restore syntax highlighting for light theme 2017-10-13 20:26:51 -04:00
d90be5bd6d Merge pull request #15940 from prateekgoel/feature/update-contributing.md
Add conventional commits note to contributing.md
2017-10-10 19:15:40 -05:00
ac304bc902 feat: Add conventional commits note to contributing.md
fix(documentation): Changes post review

fix(documentation): Change case for heading

fix(documentation): Change case for heading
2017-10-08 10:02:57 +05:30
cc2a8d0d16 feat(challenge): Added mLab tutorial
Closes #14912
2017-10-07 01:57:00 -03:00
4120a69ac7 fix(.github): Update pull request template (#15934)
The pull request template is not catching the `closes` keywords correctly since a recent update by GitHub, moving it to a new line and rewording will be a work around.
2017-10-06 23:06:27 +02:00
0fa83742cd feat: Added 1st batch of Rosetta code problems. (#15877) 2017-10-05 19:26:26 -05:00
7618c3ee4f Merge pull request #15930 from Spidy88/fix/setup-docs
fix(setup): Include MailHog setup instructions
2017-10-04 11:26:14 +05:30
136171c4d1 fix(setup): Include MailHog setup instructions
With the changes to passwordless account creation, contributors are
unable to create an account locally. MailHog spins up a local SMPT
server that can catch all outgoing emails, allowing contributors to
successfully create accounts and see any other emails generated locally.

Closes #15838
2017-10-03 22:14:19 -07:00
d13ce469e6 Merge pull request #15891 from raisedadead/fix/passwordless-auth
fix(auth): update the passwordless-auth missed changes
2017-10-03 14:02:59 -07:00
18e57382e7 Merge pull request #15890 from raisedadead/bug/update-sign-up-page
fix(sign-up): Update page for clear onboarding path
2017-10-03 13:51:21 -07:00
08754f2d4e fix(challenges): Fix vague tests for "Convert JSON Data to HTML" challenge 2017-10-02 14:15:17 +02:00
509613f5d7 Merge pull request #15889 from ltegman/fix/navbar-props
fix(Navbar): stop using removed onClose prop of react-bootstraop Navbar
2017-09-25 21:15:59 -07:00
774302eaa5 Merge pull request #15508 from dhcodes/fix/static-about
update about links
2017-09-25 21:03:44 -07:00
e88af5c0e8 fix(challenges): Improve Word Blanks on staging (#15901) 2017-09-21 13:11:31 -05:00
6e3f28e770 fix(sign-up): Update page for clear onboarding path
Closes #10407
2017-09-17 16:14:46 +05:30
d77e9fd411 fix(user): Remove remote method on user create 2017-09-17 15:27:45 +05:30
5e86b25a69 fix(auth): Remove reset password endpoint 2017-09-17 14:54:48 +05:30
e0c4e53be3 fix(Navbar): stop using removed onClose prop of react-bootstraop Navbar 2017-09-16 19:12:30 -07:00
63a147257b fix(main): static page links and constantStrings 2017-09-16 17:16:48 -05:00
4c016216b9 Merge pull request #15794 from Bouzmine/fix/dot-notation
Change "dot operator" to "dot notation"
2017-09-15 21:19:25 -05:00
06611c129a refactor(challenges): Change dot operator to notation 2017-09-15 19:54:49 -04:00
0b969e5d3e feat(seed): Added more assertion for problem twenty four (#15850) 2017-09-11 21:39:28 -05:00
42008876f8 feat(seed): Added more assertion for Project Euler problem twe (#15874) 2017-09-11 17:57:40 -05:00
f0124b9dfb fix(challenges): Improve wording of description (#15873)
changed the description of the challenge to make campers understand the
task better

Closes #14306
2017-09-11 17:55:58 -05:00
e296006141 Merge branch 'staging' of https://github.com/freeCodeCamp/freeCodeCamp into staging 2017-09-11 17:46:31 -05:00
a3fffb3bcf Merge branch 'ZacharyKearns-fix/settings-page' into staging 2017-09-11 17:44:44 -05:00
fdb430f2b5 Merge pull request #15866 from QuincyLarson/fix/fix-math-seed-files
fix(seed): Remove redundant seed files from math directory
2017-09-11 15:44:14 -07:00
564e76b2bf fix(merge): Fix merge conflicts 2017-09-11 17:43:18 -05:00
b944d60620 fix(challenges): Add helmetjs intro (#15865)
Closes #12634
2017-09-11 16:09:32 -05:00
3206d8c549 fix(map): Change styling of map in night mode (#15780)
Previously the map had white background color and white color, making it
impossible to see the text. I changed the colors to the standard
night-mode color variables. I also deleted a css class that was not
doing anything.

Closes #15702
2017-09-11 09:53:16 +02:00
9fccba67ec Merge pull request #15872 from Vaidic/fix/updateTestCase4
fix(seed): Fixed assert regex
2017-09-10 21:37:34 -05:00
e7957219cd fix(seed): Fixed assert regex
Closes #13999
2017-09-10 19:43:57 +05:30
cf389e7126 fix(seed): Remove redundant seed files from math directory 2017-09-09 10:52:12 -05:00
1ca4e56773 chore(package-lock): Update 2017-09-08 10:58:19 -07:00
58b883f06c fix(server/certs): Fix email and refactor 2017-09-08 10:52:40 -07:00
a051d4d443 feat(server.certs): Remove team email 2017-09-08 10:48:08 -07:00
251131aceb Merge branch 'ogzcoder/feat/track-user-submit' into staging 2017-09-08 00:17:41 -07:00
56e3d3a986 refactor(server/challenge): Make code dry 2017-09-08 00:16:02 -07:00