Commit Graph

8518 Commits (a0672814e4fc2987906b6d495f1c139e4fb3be6e)

Author SHA1 Message Date
Berkeley Martinez a0672814e4 Merge pull request #8925 from raisedadead/feature/send-verify-email
Add quick temporary patch for Authorization error
2016-06-03 00:02:08 -07:00
Berkeley Martinez 17a38ed4ad Merge pull request #8928 from QuincyLarson/fix/email-verify-copy
fix email copy and flash message link copy
2016-06-02 23:47:17 -07:00
Berkeley Martinez 4aaa69a016 Merge pull request #8907 from QuincyLarson/fix/gear-up-challenge-sequence
Update the sequence of gear up challenges and make pledge copy clearer
2016-06-02 23:47:08 -07:00
Mrugesh Mohapatra ec508636b0 Add quick temporary patch for Authorization error 2016-06-03 12:10:07 +05:30
Quincy Larson 7eaa780351 fix email copy and flash message link copy 2016-06-02 23:39:36 -07:00
Mrugesh Mohapatra a2e426d48e Merge pull request #8919 from BerkeleyTrue/feature/send-verify-email
feature(email): add ability to verify current email
2016-06-03 05:24:06 +00:00
Berkeley Martinez e29a2a9716 feature(email): add ability to verify current email 2016-06-02 15:23:49 -07:00
Berkeley Martinez 56844a5e80 Merge branch 'feature/verify-emails' into staging 2016-06-02 13:50:47 -07:00
Berkeley Martinez 942962fa0f Add prod urls to verify emails 2016-06-02 13:49:34 -07:00
Berkeley Martinez 564f4c1180 Update email info copy 2016-06-02 13:48:56 -07:00
Jonathan 6fb8ef1354 Merge pull request #8906 from Ramon-Carroll/fix/portfolio-instruction-wording
Added further clarification to instructions regarding using templates.
2016-06-02 08:23:31 +01:00
Quincy Larson 82644a5531 Update the sequence of gear up challenges and make pledge copy clearer 2016-06-01 22:32:01 -07:00
Ramon Carroll 5fb13fe425 Added further clarification to instructions regarding using templates. 2016-06-01 22:23:05 -05:00
Jonathan 50434718ec Merge pull request #8898 from rustyautoparts/fix/challenge-access-multid-arrs
Clarified description for "Access Multi-Dimensional Arrays with Indexes" challenge
2016-06-01 20:24:51 +01:00
Jonathan 4c7560263f Merge pull request #8899 from pietromenna/fix/contributing.md-wiki-links
Updated CONTRIBUTING.md wiki links
2016-06-01 20:22:02 +01:00
Pietro F. Menna 4a4f71145c Updated CONTRIBUTING.md wiki links
If applied, this commit will update the links from "Other resources" section from CONTRIBUTING.md file with the current wiki links. It will also remove [Contributions Guide - With a demo on fixing a typo] link from "Other resources" section.
2016-06-01 15:15:51 -03:00
Russ Otto c8ce78112c Fixed issue #7015: Access Multi-Dimensional Arrays with Indexes
This commit clarifies the explanation and example for the Basic Javascript challenge "Access Multi-Dimensional Arrays with Indexes." The implemented fix was proposed by @erictleung in https://github.com/FreeCodeCamp/FreeCodeCamp/issues/7015#issuecomment-222345491
2016-06-01 12:24:29 -05:00
Jonathan 1f86c4f9f8 Merge pull request #8893 from malayaleecoder/fix/friendly-data-ranges
Fix Friendly Date Range issue
2016-06-01 16:24:36 +01:00
malayaleecoder 869191a53f Fix Friendly Date Range issue 2016-06-01 15:54:30 +05:30
Mrugesh Mohapatra ff4dfb09da Add email verification and notifications
This commit
- [x] Fixes the flash notice color (Trivial)
- [x] Adds flash message for user with no email.
- [x] Adds checks to see if user's email is verified, and displays corresponding notification.
- [x] Adds email templates.
2016-06-01 08:34:34 +00:00
Logan Tegman bbacbd3d81 Merge pull request #8864 from hangaebal/fix/when-codemirror-return-function-object
Fix Bug when CodeMirror return function object
2016-05-31 21:26:53 -07:00
Logan Tegman 0846d73580 Merge pull request #8250 from wdimac/fix/loop-protect-when-label-offset
Stop inject from mangling label when offset from loop
2016-05-31 21:20:31 -07:00
Mrugesh Mohapatra b932d4262d Merge pull request #8865 from Salt7900/fix/num0_change
Change wording about a number not being positve
2016-05-31 04:07:50 +00:00
Salt7900 66f2019dbe Change wording about a number not being positve 2016-05-30 22:53:07 -05:00
hangaebal 856874a727 Fix Bug when CodeMirror return function object 2016-05-31 11:21:17 +09:00
Eric Leung 0e10970198 Merge pull request #8857 from pranayberry/fix/remainder-challenge
Updated test case for the remainder challenge
2016-05-30 17:01:37 -07:00
Jonathan 9549f572ae Merge pull request #8834 from prideloki/fix/css-for-pledge-cancelling-button
Fix CSS for Pledge cancelling("Maybe later") button
2016-05-31 00:20:14 +01:00
Eric Leung 9282ab5d3a Merge pull request #8691 from nishant-tomer/fix/tests-challenge-record-collection
add one more test to Record Collection
2016-05-30 16:11:48 -07:00
Pranay Berry 1de8664451 Updated test case 2016-05-31 01:59:22 +05:30
Mrugesh Mohapatra a98cf03173 Merge pull request #8374 from vcooley/fix/close-aside-on-modal-in
Modals now close map, wiki, and chat asides when they are displayed
2016-05-30 15:27:44 +00:00
Mrugesh Mohapatra e8ed4c34d5 Merge pull request #8810 from atjonathan/feature/wikimodelfixedheader
Added fixed header to wiki aside
2016-05-30 15:18:46 +00:00
Logan Tegman 430c499380 Merge pull request #8842 from nadalfederer/fix/jslingo.json
fix grammar in this lecture
2016-05-29 21:07:15 -07:00
Eric Leung d7afbd3212 Merge pull request #8848 from dakshshah96/fix/confusing-error-message
Fix test in Accessing Obj Properties with Vars
2016-05-29 13:26:00 -07:00
Daksh Shah 93b2b1b541 Fix test in Accessing Obj Properties with Vars 2016-05-29 12:47:11 +03:00
Vladimir a52e22dfb6 fix grammar in this lecture 2016-05-29 00:23:05 +03:00
Logan Tegman d3f95d4917 Merge pull request #8840 from bugron/fix/dont-auto-toggle-questionview
Do not auto toggle to Question view when video ends
2016-05-28 11:54:45 -07:00
Arsen Melikyan a0b1e3c59b
Do not auto toggle to Question view when video ends 2016-05-28 20:18:19 +04:00
Thanakom Sangnetra 9fe18ba4e1 update client/less/main.less
- add btn-default hover background color
2016-05-28 16:26:48 +07:00
Akira Laine dce9614e42 Merge pull request #8830 from DealPete/fix/period
add period to "Escaping Literal Quotes in Strings".
2016-05-28 18:56:00 +11:00
DealPete 650f214c4f add period to "Escaping Literal Quotes in Strings". 2016-05-27 22:57:25 -02:30
Logan Tegman 56903828e3 Merge pull request #8824 from tlerias/fix/remove-pledge
Send CSRF Value in Remove Pledge Form Submit
2016-05-27 17:26:50 -07:00
Tara Lerias b951f8a035 Send CSRF Value in Remove Pledge Form Submit 2016-05-27 12:32:31 -04:00
Jonathan d9f48e81e3 Added fixed header to wiki aside
* Added title
2016-05-27 17:03:07 +01:00
Jonathan 742efa8790 Merge pull request #8817 from jaydenwindle/fix/filterchallenge-linebreak
Fixed line break issue in filter challenge
2016-05-27 08:19:06 +01:00
Jayden Windle 239e5232a5 fixed line break issue in filter challenge 2016-05-26 20:27:42 -04:00
Jonathan 8fb8820a39 Merge pull request #8803 from estherfang09/fix/8792
Changes question in 4 Basic Parts of Computer Basics Hike
2016-05-26 18:27:03 +01:00
unknown 5950517c07 Fixed test on the 4 Basic Parts of a Computer challenge 2016-05-26 13:12:36 -04:00
Mrugesh Mohapatra f51c4890fd Merge pull request #8804 from zaclem01/fix/add-learnyoumongo-fix-instructions
Add instructions for setting up MongoDB on C9.io
2016-05-26 16:01:11 +00:00
Zac Clemans 7f56a4e024 add instructions for setting up MongoDB on C9.io 2016-05-26 10:37:00 -04:00
Mrugesh Mohapatra fa364f65e8 Merge pull request #8777 from atjonathan/fix/labs
Removed /labs from about page
2016-05-26 14:24:23 +00:00