Commit Graph

15660 Commits

Author SHA1 Message Date
40be7fc024 Merge pull request #8237 from BerkeleyTrue/feature/remove-oauth-creation
Remove oauth creation
2016-05-03 11:41:25 +05:30
7b8dc2e77e Add friendly error message on auth create attemp 2016-05-02 23:03:44 -07:00
ebc6514f37 Merge pull request #8413 from raisedadead/fix/email-update-logic
Refactor Email Update URL Change
2016-05-02 22:38:48 -07:00
caa49aea20 Refactor Email Update URL Change 2016-05-03 10:59:52 +05:30
8166bfbcd8 Remove o-auth account creation
Accounts can only be created with Github or email
2016-05-02 21:26:47 -07:00
428cf8135e user-identity 2016-05-02 21:26:47 -07:00
2224b8dec1 Merge pull request #8411 from BerkeleyTrue/fix/csrf-camperbot
Remove csrf from api calls
2016-05-02 21:24:28 -07:00
cda2fe768b Remove csrf from api calls 2016-05-02 21:11:49 -07:00
3ae67f6fa9 Add csrf protection 2016-05-02 17:22:56 -07:00
e65d55a3f7 Change update email endpoint 2016-05-02 17:22:46 -07:00
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
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
606051c87e Merge pull request #8394 from theflametrooper/fix/datatypes
Changed Data Types to Title Case
2016-05-02 21:27:19 +05:30
82ee04cf07 Merge pull request #8394 from theflametrooper/fix/datatypes
Changed Data Types to Title Case
2016-05-02 21:27:19 +05:30
ab6f6439c7 Changed Data Types to Title Case 2016-05-02 15:40:59 +01:00
7b9521b940 Changed Data Types to Title Case 2016-05-02 15:40:59 +01:00
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
e71f33cfc0 Show cheater message directly on user page 2016-05-02 11:46:20 +12:00
65600cb370 Modals now close map, wiki, and chat asides when they are displayed
Changed aside tags to select by class or id
2016-05-01 13:30:40 -05:00
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
484c05b301 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
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
2a8c5a5dd9 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
179c65b461 Constrain Style HTML Body test need semicolon 2016-04-30 18:10:29 -07:00
e168af56d4 Constrain Style HTML Body test need semicolon 2016-04-30 18:10:29 -07:00
725819a5f8 Fix wording ambiguity for Personal Portfolio (#8345)
Fix wording ambiguity for Personal Portfolio
2016-05-01 04:11:58 +05:30
bead3fd4ea Fix wording ambiguity for Personal Portfolio (#8345)
Fix wording ambiguity for Personal Portfolio
2016-05-01 04:11:58 +05:30
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
339e77ca8e 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
e295fc61e6 Merge pull request #8361 from ttotev/fix/remove-duplicate
Remove duplicate object key
2016-05-01 03:58:05 +05:30
03336fce75 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
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
122b40efbd 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
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
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
fd365a0829 Merge pull request #8203 from evannudd/fix/remove_message_quote
Fix/remove message quote
2016-04-30 23:02:05 +05:30
f60213389f Merge pull request #8203 from evannudd/fix/remove_message_quote
Fix/remove message quote
2016-04-30 23:02:05 +05:30
887a13fbca Fix incorrect facts on the description of Challenge: Fill in the Blank with Placeholder Text 2016-04-30 00:13:25 -04:30
40d604e0aa Fix incorrect facts on the description of Challenge: Fill in the Blank with Placeholder Text 2016-04-30 00:13:25 -04:30
981a451d82 chore(package): update helmet to version 2.0.0
https://greenkeeper.io/
2016-04-29 11:27:51 -07:00
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
bc4b9a9a41 Add test case for front-end challenge. 2016-04-28 19:45:18 -07:00
fed3327bcf Add test case for front-end challenge. 2016-04-28 19:45:18 -07:00
d40139a10e Update basic-bonfires.json 2016-04-27 21:53:20 -04:00
68788a3786 Update basic-bonfires.json 2016-04-27 21:53:20 -04:00
585f6399ed Removed the quotation marks from the message and fixed the merge squash 2016-04-27 13:58:10 -04:00
6b42ec11fe Removed the quotation marks from the message and fixed the merge squash 2016-04-27 13:58:10 -04:00
c3cb9e39be Remove trailing whitespace from about.js 2016-04-26 23:22:45 -07:00
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
a6927a3a52 Remove duplicate object key 2016-04-23 22:38:20 -07:00