Commit Graph

9099 Commits

Author SHA1 Message Date
28e7c71a39 Update CONTRIBUTING.md
Update the CONTRIBUTING.md to clearer wording about issue no.s in PR description.
2016-05-05 17:25:41 +05:30
f6bb20fae2 Merge pull request #8464 from FreeCodeCamp/staging
Release staging
2016-05-04 15:54:44 -07:00
a63fba8c9c Merge pull request #8196 from QuincyLarson/fix/vimeo-to-youtube
Transition Videos from Vimeo to Youtube
2016-05-04 15:42:15 -07:00
16a8b588a8 Merge pull request #8416 from BerkeleyTrue/feature/notify-on-completion
feature: notify camper by email on completion
2016-05-04 15:10:00 -07:00
42b8254ed2 Merge pull request #8427 from raisedadead/fix/refactor-signin-redirects
Update paths to minimize re-directs
2016-05-04 14:56:01 -07:00
753fba73f5 feature: notify camper by email on completion 2016-05-04 14:49:57 -07:00
d540e9e4ca Switch react lecture component to youtube 2016-05-04 10:30:47 -07:00
add491f3be Merge pull request #8450 from NicholasAsimov/fix/typo-data-visualization-directed-graph
Fix typo in "Show Relationships with a Force Directed Graph"
2016-05-04 17:58:52 +05:30
9aa45a3d56 Merge pull request #8424 from ltegman/fix/algorithm-block-ordering
Fix algorithm challenge block ordering
2016-05-04 17:57:22 +05:30
915bd740d6 fix typo on Show Relationships with a Force Directed Graph 2016-05-04 13:37:52 +03:00
12e3de6cf0 Merge pull request #8359 from FreeCodeCamp/greenkeeper-react-15.0.2
Update react to version 15.0.2 🚀
2016-05-03 22:25:25 -07:00
ab24218f83 Merge pull request #8441 from FreeCodeCamp/QuincyLarson-patch-1
Swap link to Twitch for more relevant YouTube channel
2016-05-04 10:45:43 +05:30
3e258a7868 Remove thundercats and oldActions, update react-dom 2016-05-03 22:12:59 -07:00
4a95aa2011 Swap link to Twitch for more relevant Git channel 2016-05-03 20:30:37 -07:00
74129df5e5 chore(package): update react to version 15.0.2
https://greenkeeper.io/
2016-05-03 13:23:28 -07:00
c97e90c4d0 Merge pull request #8357 from FreeCodeCamp/greenkeeper-redux-form-5.2.3
Update redux-form to version 5.2.3 🚀
2016-05-03 13:23:13 -07:00
00f501cf51 Updated nonprofit demo link (#8433)
* Updated nonprofit demo link
* Removed 'https:' from updated link
2016-05-03 20:45:08 +01:00
02004e6398 chore(package): update redux-form to version 5.2.3
https://greenkeeper.io/
2016-05-03 11:44:04 -07:00
03963bcdf8 Merge pull request #8356 from FreeCodeCamp/greenkeeper-helmet-2.0.0
Update helmet to version 2.0.0 🚀
2016-05-03 11:43:48 -07:00
1ea2c2a20a helmet.csp -> helmet.contentSecurityPolicy
Also updated frameguard
2016-05-03 11:32:38 -07:00
e14cb69d5b Merge pull request #8405 from theflametrooper/fix/datatypestitlecase
Fixed Capitalization on data types
2016-05-03 10:44:15 -07:00
701c07ac37 Fixed Capitalization on data types
Changed all to lowercase
2016-05-03 18:04:44 +01:00
316c6f278a German Translation of Gear up for Success 2016-05-03 17:48:52 +02:00
b02ddc135d Update paths to minimize re-directs 2016-05-03 15:06:20 +00:00
648d9f93ba Merge pull request #8425 from raisedadead/fix/mdn-link-missing-letters
Fix MDN link in Missing Letters
2016-05-03 07:42:31 -07:00
24de2e6d4e Fix MDN link in Missing Letters 2016-05-03 13:56:27 +00:00
da96e7dafd Fix algorithm challenge block ordering 2016-05-03 06:28:49 -07:00
eebb701e3c Merge pull request #8414 from FreeCodeCamp/staging
Release Staging
2016-05-02 23:19:14 -07:00
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
3e65295e59 Merge pull request #8412 from FreeCodeCamp/staging
Release Staging
2016-05-02 21:30:56 -07:00
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
b01bd1a7de Merge pull request #8407 from FreeCodeCamp/staging
Release staging
2016-05-02 19:50:42 -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
ab6f6439c7 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
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
179c65b461 Constrain Style HTML Body test need semicolon 2016-04-30 18:10:29 -07:00