Commit Graph

8285 Commits (40be7fc0248f599a6c5bfcae3e7217edb2e1136d)

Author SHA1 Message Date
Mrugesh Mohapatra 40be7fc024 Merge pull request #8237 from BerkeleyTrue/feature/remove-oauth-creation
Remove oauth creation
2016-05-03 11:41:25 +05:30
Berkeley Martinez 7b8dc2e77e Add friendly error message on auth create attemp 2016-05-02 23:03:44 -07:00
Berkeley Martinez ebc6514f37 Merge pull request #8413 from raisedadead/fix/email-update-logic
Refactor Email Update URL Change
2016-05-02 22:38:48 -07:00
Mrugesh Mohapatra caa49aea20
Refactor Email Update URL Change 2016-05-03 10:59:52 +05:30
Berkeley Martinez 8166bfbcd8 Remove o-auth account creation
Accounts can only be created with Github or email
2016-05-02 21:26:47 -07:00
Berkeley Martinez 428cf8135e user-identity 2016-05-02 21:26:47 -07:00
Quincy Larson 2224b8dec1 Merge pull request #8411 from BerkeleyTrue/fix/csrf-camperbot
Remove csrf from api calls
2016-05-02 21:24:28 -07:00
Berkeley Martinez cda2fe768b Remove csrf from api calls 2016-05-02 21:11:49 -07:00
Berkeley Martinez 3ae67f6fa9 Add csrf protection 2016-05-02 17:22:56 -07:00
Berkeley Martinez e65d55a3f7 Change update email endpoint 2016-05-02 17:22:46 -07:00
Berkeley Martinez 5830d69613 Merge branch 'feature/email-update-logic' of https://github.com/raisedadead/FreeCodeCamp into raisedadead-feature/email-update-logic 2016-05-02 13:19:54 -07:00
Mrugesh Mohapatra 3d55b9bb8b
Add Update Email View
This commit:

- Displays the user's email that we have on records
- Adds a button in the settings to update email
- Adds a form view to update the email
- Fixes CSS for the Email icons and the email form
                         ~ Credits to @hallaathrad

- Linting fixes and updated with Berkeley's Comments

- Streamline checks and fix scope

- Add AJAX Calls

- Add flash messages

- Update the views & add XHR value
2016-05-02 18:33:37 +00:00
Mrugesh Mohapatra 606051c87e Merge pull request #8394 from theflametrooper/fix/datatypes
Changed Data Types to Title Case
2016-05-02 21:27:19 +05:30
Jonathan ab6f6439c7
Changed Data Types to Title Case 2016-05-02 15:40:59 +01:00
Mrugesh Mohapatra 28143a4c2d Merge pull request #8382 from george-stepanek/feature/mark-cheaters-more-prominently
Mark cheaters more prominently
2016-05-02 19:10:32 +05:30
George Stepanek e71f33cfc0 Show cheater message directly on user page 2016-05-02 11:46:20 +12:00
Jago Kosolosky c8a06f008b Add comment about Jade becoming Pug in English (#8339)
* Add comment about Jade becoming Pug in English

* Update nodejs-and-expressjs.json
2016-05-01 09:13:18 -07:00
Mrugesh Mohapatra aadea755dd Merge pull request #8275 from erictleung/fix/require-semicolon-in-css
Constrain Style HTML Body test need semicolon
2016-05-01 14:10:56 +05:30
Eric Leung 179c65b461 Constrain Style HTML Body test need semicolon 2016-04-30 18:10:29 -07:00
BrianZ1 725819a5f8 Fix wording ambiguity for Personal Portfolio (#8345)
Fix wording ambiguity for Personal Portfolio
2016-05-01 04:11:58 +05:30
Ihudiya Finda Ogburu c7a2d9bb71 Merge pull request #8351 from iogburu/patch-1
* Updated Instructions

Updated Instructions for "Use Responsive Design with Bootstrap Fluid Containers" section in order to inform users who may jump around in the tutorials where they can learn how to build the Cat Photo App.
2016-05-01 04:05:18 +05:30
Mrugesh Mohapatra e295fc61e6 Merge pull request #8361 from ttotev/fix/remove-duplicate
Remove duplicate object key
2016-05-01 03:58:05 +05:30
Mrugesh Mohapatra 357978d995 Merge pull request #8364 from carloselhalabi/fix/misleading-text
Update instructions with correct information for 'lorem ipsum'
2016-05-01 03:48:24 +05:30
Mrugesh Mohapatra 0eea538e37 Merge pull request #8324 from rshafto/fix/mutations
Updated basic-bonfires.json to fix incorrect passing Mutations test case
2016-05-01 03:26:11 +05:30
Mrugesh Mohapatra faf9e9cd24 Merge pull request #8303 from erictleung/fix/remove-trailing-whitespace
Remove trailing whitespace from about.js
2016-04-30 23:03:59 +05:30
Mrugesh Mohapatra f60213389f Merge pull request #8203 from evannudd/fix/remove_message_quote
Fix/remove message quote
2016-04-30 23:02:05 +05:30
Carlos El Halabi 40d604e0aa Fix incorrect facts on the description of Challenge: Fill in the Blank with Placeholder Text 2016-04-30 00:13:25 -04:30
Eric Leung 9a8bc9b80e Merge pull request #8326 from josectello/fix/test_case_front_end_challenge
Add test case for front-end challenge.
2016-04-28 20:37:23 -07:00
Jose Tello fed3327bcf Add test case for front-end challenge. 2016-04-28 19:45:18 -07:00
rshafto 68788a3786 Update basic-bonfires.json 2016-04-27 21:53:20 -04:00
Evan N 6b42ec11fe Removed the quotation marks from the message and fixed the merge squash 2016-04-27 13:58:10 -04:00
Eric Leung c3cb9e39be Remove trailing whitespace from about.js 2016-04-26 23:22:45 -07:00
Quincy Larson 6039d29282 Add count of campers who have earned all three certs to about page (#8288)
* add count of campers who have earned all three certs to about page

* refactor to get tests to pass
2016-04-25 16:57:30 -07:00
Temo Totev a6927a3a52 Remove duplicate object key 2016-04-23 22:38:20 -07:00
Mrugesh Mohapatra 91d1cb528b Merge pull request #8241 from ttymed/feature/codemirror-focus-hotkey
added keybindings for focus on codemirror through Mousetrap
2016-04-24 03:07:25 +05:30
Mrugesh Mohapatra 0579949a37 Merge pull request #7804 from bteng22/fix/tail-appending-to-comments
Prevent tail appending to trailing comments
2016-04-24 02:52:22 +05:30
bteng22 11dcd74f64 adding newline before appending tail to combinedCode to prevent tail from being cut off by trailing comments in code editor
setting initialValue of reduce to newline for arrayToNewLineString to prevent cutting off code if trailing comments in json
2016-04-23 14:05:49 -07:00
ttymed 55ef14b9a6 added keybindings for focus on codemirror through Mousetrap 2016-04-23 07:16:59 +08:00
Quincy Larson 56bb315cc7 Merge branch 'raisedadead-feature/passwordless-login' into staging 2016-04-22 12:28:00 -07:00
Quincy Larson 6c291148d4 improve the ux of the signin page 2016-04-22 12:26:02 -07:00
Quincy Larson e5bf3f8a38 Merge branch 'feature/passwordless-login' of https://github.com/raisedadead/FreeCodeCamp into raisedadead-feature/passwordless-login 2016-04-22 11:55:51 -07:00
Mrugesh Mohapatra 0fa7c02338 Merge pull request #8168 from BKinahan/fix/exact-change-tests
Amend Exact Change tests for format consistency
2016-04-22 17:47:34 +05:30
Mrugesh Mohapatra 73816f7dc0 Merge pull request #8163 from erictleung/fix/update-misleading-mdn-capitalization-link
Update MDN charCodeAt link to be more accurate
2016-04-22 17:42:56 +05:30
Mrugesh Mohapatra 6c06cde9fa Merge pull request #8186 from erictleung/fix/add-code-tags-to-get-json
Add code tags to Get JSON challenge plus linting
2016-04-22 17:21:14 +05:30
Mrugesh Mohapatra 68f96d4b06 Merge pull request #8215 from kkas/fix/bonfire-to-add-unit
Add a unit to bonfire Map the Debris
2016-04-22 17:08:26 +05:30
Mrugesh Mohapatra aeea02d7fc
Update the Sign in and Sign up Pages 2016-04-22 10:17:31 +05:30
Eric Leung 3a234f744f Merge pull request #8219 from sharang-d/fix/add-tests-to-no-repeats-please-challenge
Added test cases for 'no repeats please'
2016-04-21 09:34:51 -07:00
kkas 455bdcd0b2 Add a unit to bonfire Map the Debris 2016-04-21 23:32:24 +09:00
Jonathan 7aeceaf97e Merge pull request #8145 from 5k9m/translate/DE-translation-jquery
German Translation of jQuery Challenges
2016-04-21 14:52:52 +01:00
Mrugesh Mohapatra 39d9cc1fa1 Merge pull request #8223 from DusanSacha/fix/added-hit-to-challenge
Added hint to JS increment challenge
2016-04-21 13:38:34 +05:30