Commit Graph

752 Commits (4fb70a4d9c998075d70223443ee8b4ce54d00ee0)

Author SHA1 Message Date
Quincy Larson 7eaa780351 fix email copy and flash message link copy 2016-06-02 23:39:36 -07:00
Berkeley Martinez e29a2a9716 feature(email): add ability to verify current email 2016-06-02 15:23:49 -07:00
Berkeley Martinez 564f4c1180 Update email info copy 2016-06-02 13:48:56 -07:00
Quincy Larson 82644a5531 Update the sequence of gear up challenges and make pledge copy clearer 2016-06-01 22:32:01 -07:00
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
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
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 7ee3c3d0c6
Removed /labs from about page 2016-05-23 17:23:29 +01:00
Sarbbottam Bandyopadhyay 9365b39cb0 fix(a11y): using button instead of div
label, div, a can be styled to look like a button, but it does not behave as a button semantically
2016-05-19 14:42:27 -07:00
Berkeley Martinez e5c18bed60 Merge pull request #8701 from QuincyLarson/fix/fix-code-of-conduct-formatting-issues
fix some typos and improve our code of conduct
2016-05-18 23:00:19 -07:00
Quincy Larson e1f2d619fb Merge pull request #8690 from theflametrooper/fix/campernews
Removed Camper News completely
2016-05-18 22:59:53 -07:00
Berkeley Martinez 8c788450e5 Merge pull request #8708 from QuincyLarson/fix/navbar-forum-links
fix forum links in navbars
2016-05-18 19:00:55 -07:00
DealPete 70ca86b989 changed Fransisco to Francisco 2016-05-18 22:09:32 -02:30
Quincy Larson 1872b8c775 fix forum links in navbars 2016-05-18 16:45:59 -07:00
Quincy Larson ce34be6451 fix some typos and improve our code of conduct 2016-05-18 11:59:52 -07:00
Berkeley Martinez ee746da65a Merge pull request #8671 from QuincyLarson/fix/remove-tweet-buttons
Remove tweet buttons and /labs
2016-05-18 09:34:07 -07:00
Quincy Larson 366a4adca9 Add forum link to navbar and React nabber 2016-05-18 00:02:44 -07:00
Jonathan 62946689dc
Removed Camper News completely 2016-05-17 18:31:40 +01:00
Quincy Larson e0867ec556 remove additional vestiges of labs and twitter sharing 2016-05-16 16:10:52 -07:00
Quincy Larson 42c97988a2 Minor fixes to shop and about page, remove vestigial links view 2016-05-16 13:08:24 -07:00
Quincy Larson 24751c307c update copy of projects to recommend sharing them on Facebook instead of on Twitter 2016-05-16 12:52:04 -07:00
Quincy Larson e888b18cc0 remove labs view 2016-05-16 12:51:13 -07:00
nishant-tomer 60bc8e360c Update code-of-conduct.jade in the repository on the basis of FreeCodeCamp-Code-Of-Conduct.md in the wiki 2016-05-15 20:52:03 +05:30
Mrugesh Mohapatra d85a484a46 Merge pull request #8606 from hangaebal/fix/certifications-pages-button
Update Certifications Pages Button Text
2016-05-14 22:35:38 +05:30
Eric Leung 71d0885842 Update React/Sass and D3 project release to Summer 2016-05-13 10:57:18 -07:00
hangaebal ed9aede3c2 [Fix] Certifications Pages 2016-05-13 22:06:54 +09:00
Quincy Larson ee2e0e290f Merge branch 'fix/theme-flash' of https://github.com/BerkeleyTrue/FreeCodeCamp into BerkeleyTrue-fix/theme-flash
Conflicts:
	common/models/user.js
2016-05-12 21:28:29 -07:00
Berkeley Martinez e72ad8c513 fix(ui): Fix flash shown to user on page refresh
Store user theme preference on user object.
Must be logged in to use themes
2016-05-12 18:52:03 -07:00
Sarbbottam Bandyopadhyay 833e246f8a fix(a11y): using button instead of div
div can be styled to look like a button, but it does not behave as a button semantically
2016-05-11 10:47:22 -07:00
Berkeley Martinez 9dde4949bf Merge pull request #8489 from raisedadead/fix/sign-in-buttons
Fix Sign in Buttons
2016-05-06 14:14:51 -07:00
Mrugesh Mohapatra 090c5b8b18
Fix Sign in Buttons 2016-05-07 00:27:49 +05:30
Mrugesh Mohapatra 4f9ea83f5a
Remove notice in deprecated OAuth Methods 2016-05-06 14:37:48 +00:00
Berkeley Martinez 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
Quincy Larson 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
Berkeley Martinez 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
Berkeley Martinez 753fba73f5 feature: notify camper by email on completion 2016-05-04 14:49:57 -07:00
Tam Love 00f501cf51 Updated nonprofit demo link (#8433)
* Updated nonprofit demo link
* Removed 'https:' from updated link
2016-05-03 20:45:08 +01:00
Mrugesh Mohapatra b02ddc135d
Update paths to minimize re-directs 2016-05-03 15:06:20 +00:00
Mrugesh Mohapatra caa49aea20
Refactor Email Update URL Change 2016-05-03 10:59:52 +05:30
Berkeley Martinez e65d55a3f7 Change update email endpoint 2016-05-02 17:22:46 -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
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
Quincy Larson 6c291148d4 improve the ux of the signin page 2016-04-22 12:26:02 -07:00
Mrugesh Mohapatra aeea02d7fc
Update the Sign in and Sign up Pages 2016-04-22 10:17:31 +05:30
Quincy Larson be27deaa4c Merge pull request #8124 from BerkeleyTrue/feature/re-add-announcement
(Re)add announcement/flyer
2016-04-20 14:48:05 -07:00
Quincy Larson 9d9ff8edf5 Update views to use youtube instead of Vimeo 2016-04-19 00:24:03 -07:00
Justin Richardsson 5ab83d3dc9 Merge pull request #8082 from george-stepanek/fix/navbar-control-click-behaviour
Fix the navbar links so control-clicking opens them in a new tab
2016-04-15 20:15:46 -04:00
George Stepanek d00e3628af Fix the navbar links so control-clicking opens them in a new tab 2016-04-16 10:42:25 +12:00
Quincy Larson 079b19f495 change twitch challenge into youtube challenge and update about page removing twitch 2016-04-15 01:12:07 -07:00
Berkeley Martinez 02eb6cad6c Refactor announcement feature 2016-04-14 20:06:42 -07:00
Berkeley Martinez c9fdb581ce Revert "Announcement feature" 2016-04-14 18:13:58 -07:00
Aniruddh Agarwal aea8ee3b45
Add trailing slash to wiki iframe src if omitted 2016-04-14 16:49:52 +08:00
Quincy Larson 66fda23dac Improve style on flash notification and make flyer conditional on logged in user with at least 6 points
Lower case model json file
2016-04-13 23:10:46 +01:00
Quincy Larson 79261f1793 Make the flash message look narrower (and much better) 2016-04-13 23:10:41 +01:00
Quincy Larson 4fa1e2f405 Make flyer show up in various views (but not in all, avoiding the map and wiki view problems) 2016-04-13 23:10:40 +01:00
benmcmahon100 2b2b359514 Bill board feature up and running 2016-04-13 22:58:58 +01:00
benmcmahon100 a27c5ccdd2 Ground work for the bill board announcement feature 2016-04-13 22:58:57 +01:00
Quincy Larson a40642b963 add completed challenge count back in and link to nonprofit playlist 2016-04-12 16:10:44 -07:00
BKinahan e56a7404ad Correct typo in How Nonprofit Projects Work 2016-04-11 18:32:42 +00:00
Justin Richardsson 5fdc961587 Night Mode + CSS Additions (#7929)
* Night Mode and More Hotkeys

* Nightmode CSS adjustments

* Removed Redundant Line

* Wrapped JSON.parse statements in a try catch block
2016-04-08 15:13:41 -07:00
Berkeley Martinez b2462e1b4c Fix sitemap
Add 24 hour cache
Add jobs to sitemap
Possible warning about to many eventemitter listeners
2016-04-07 13:31:58 -07:00
Berkeley Martinez 258597f053 Fix news jade pages
Remove unused pages
2016-04-07 10:12:29 -07:00
Berkeley Martinez 1308d312a4 Add methods to get challengeMap
Update boot/challenge.js to use new methods
Update boot/user.js to use new methods
2016-04-06 21:11:07 -07:00
Berkeley Martinez 9cf4a9cc69 Merge pull request #7943 from QuincyLarson/feature/remove-camper-news
intercept /news with a notice
2016-04-06 14:21:13 -07:00
Quincy Larson fcebd37a01 intercept /news with a notice 2016-04-06 13:49:39 -07:00
Quincy Larson c1a6104618 update shop to have tshirts 2016-04-06 12:28:42 -07:00
Quincy Larson cf420753cc Merge pull request #7921 from FreeCodeCamp/feature/add-stats
Feature add stats to about page
2016-04-05 23:51:29 -07:00
Berkeley Martinez 1a15687327 Change 'campers' to 'earned' 2016-04-05 21:41:45 -07:00
Berkeley Martinez 06ea132257 Add timed cache to user count queries 2016-04-05 14:45:09 -07:00
Berkeley Martinez c57f1b6f9a Make cert bold 2016-04-05 11:21:08 -07:00
Berkeley Martinez a71daa07ce Add cert counts 2016-04-05 11:21:08 -07:00
Quincy Larson 2fb922be0f create pledge calculation logic 2016-04-05 11:21:08 -07:00
Quincy Larson b40f9b4880 Update home page to reflect 300,000+ campers 2016-04-04 22:21:57 -07:00
Quincy Larson e98fc9d9ff Remove Google and Facebook links from user profiles and settings page for privacy reasons 2016-04-04 22:21:34 -07:00
Quincy Larson a2466d77b3 fix button colors from issue #7903 2016-04-04 22:03:18 -07:00
Quincy Larson 8fb0516811 Merge pull request #7779 from FreeCodeCamp/fix/wiki-urls
Fix article loading on direct link to wiki
2016-04-04 21:09:21 -07:00
Berkeley Martinez 88edd2c64a Merge pull request #7878 from baguzzzaji/remove-jailed-and-all-references-to-it
Remove jailed and all references to it
2016-04-04 14:26:24 -07:00
Berkeley Martinez 5fcb6b999e Merge pull request #7895 from lipis/feature/update-bootstrap-social
Updated Bootstrap Social and remove plus from Google sign in icon
2016-04-04 14:19:11 -07:00
Panayiotis Lipiridis c17af58aee Renamed Github to GitHub 2016-04-04 22:50:07 +02:00
Panayiotis Lipiridis 7c27952ff6 Updated Bootstrap Social
..and remove plus from Google sign in icon
2016-04-04 22:36:35 +02:00
Bagus Aji Santoso 5bc2602bfd Remove jailed and all references to it 2016-04-04 13:13:06 +07:00
Nick b049d252ef FIX - Remove trailing spaces 2016-04-02 23:52:52 -04:00
Berkeley Martinez ee1c017b0d Sync wiki article urls with main site 2016-04-02 00:56:40 -07:00
Mrugesh Mohapatra cb6a594684 Update label text for projects on User portfolio page 2016-03-28 22:14:18 +05:30
Berkeley Martinez 94a9bcea5a Fix article loading on direct link to wiki 2016-03-25 13:48:42 -07:00
Mrugesh Mohapatra eda7b3e255 Move Sign out and Send Email to User Page
This commit moves the Sign out from Free Code Camp and the
Email us buttons to the User page as they are not related
to the accounts page.

Tested Locally.
2016-03-22 01:15:41 +05:30
benmcmahon100 a65742ad45 Fix wiki's SSL issue
fix wiki view

Fix to the same issue that was effecting the aside wiki
2016-03-17 18:14:26 +00:00
Jacob Bearden fcf866906b fix image protocol 2016-03-16 20:32:12 -06:00
Logan Tegman 97a0f71388 Merge pull request #7158 from QuincyLarson/feature/add-nonprofit-project-description
Add an explanation of how our nonprofit projects work
2016-03-16 12:57:23 -07:00
Quincy Larson 69ee345d5c incorporate feedback 2016-03-16 00:27:19 -07:00
Quincy Larson 2285d18260 refactor show view to have a settings button 2016-03-14 23:59:25 -07:00
Quincy Larson d47aed4850 factor out settings page with email settings 2016-03-14 23:59:24 -07:00
Rex Schrader 296536fd81 Merge pull request #7516 from FreeCodeCamp/fix/update-faq
Update Campsite challenge copy and labs
2016-03-14 21:15:11 -07:00
Quincy Larson 9e93d580f6 Update the FAQ 2016-03-11 23:16:06 -08:00
Quincy Larson 7f85f84e47 Update labs view and add a new project 2016-03-11 23:14:21 -08:00
Alister N. Mada eaa513dc56 Redirect /twitch to Twitch channel 2016-03-06 06:20:34 +07:00
Hallaathrad dabcebd91c scrolling issues be gone 2016-03-03 19:00:47 -05:00
Randy Tolentino a6f2373efd Escaped the `h4` in the `challenge-instructions sentence` block because the `h4` was causing the issue with inconsistent text. 2016-02-26 11:22:16 -06:00
afr114 604fbede86 fix bug 7171 2016-02-25 20:47:54 -08:00