Commit Graph

1220 Commits (d07419a0cf45d5bcee6def9f856a324d4808f349)

Author SHA1 Message Date
Mrugesh Mohapatra 2d6f06d24d Merge pull request #8644 from nishant-tomer/fix/update-code-of-conduct-repository-file
Updated the Code of Conduct per the Wiki
2016-05-16 19:47:40 +05:30
Mrugesh Mohapatra 0a9e354937 Merge pull request #8640 from alayek/fix/production-start-typo
Add missing 'connect' in the production-start.js error handler
2016-05-16 10:49:20 +05:30
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
alayek 52a66d6408 Add missing 'connect' in the production-start.js error handler 2016-05-15 16:43:41 +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
Berkeley Martinez 04b874de45 Fix email validations 2016-05-12 16:16:36 -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
Logan Tegman c015cb5ec5 Inject csrf token into react app 2016-05-09 10:13:02 -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
Logan Tegman d540e9e4ca Switch react lecture component to youtube 2016-05-04 10:30:47 -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
Logan Tegman 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
Logan Tegman 1ea2c2a20a helmet.csp -> helmet.contentSecurityPolicy
Also updated frameguard
2016-05-03 11:32:38 -07:00
Mrugesh Mohapatra b02ddc135d
Update paths to minimize re-directs 2016-05-03 15:06:20 +00:00
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
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 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
George Stepanek e71f33cfc0 Show cheater message directly on user page 2016-05-02 11:46:20 +12: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
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 b7f2e194fb fix trailing comma issue 2016-04-19 09:35:04 -07:00
Quincy Larson 9d9ff8edf5 Update views to use youtube instead of Vimeo 2016-04-19 00:24:03 -07:00
Quincy Larson f1b5bffdd8 Update CSP to remove vimeo and add youtube 2016-04-19 00:23:27 -07:00
Quincy Larson cc560a9cf4 Merge pull request #8126 from BerkeleyTrue/feature/move-to-ses
Move from Mandril to Amazon SES
2016-04-15 22:26:10 -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
Mrugesh Mohapatra a918b7b84e Merge pull request #6774 from QuincyLarson/feature/placeholder-video-challenges
Add new video challenge stubs
2016-04-16 02:33:32 +05:30
Aniruddh Agarwal 09bf747cfc
Change ESLint quote-props rule to as-needed
Also fixes all files flagged by the rule
2016-04-16 00:31:13 +08:00
Aniruddh Agarwal 33faa3bada
Remove quotes from object keys 2016-04-15 23:06:03 +08:00
Aniruddh Agarwal dc24c42f54
Unsub from all FCC emails regardless of unsub link 2016-04-15 21:38:03 +08: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 f4eb0b46c8 Merge pull request #8111 from awesomeaniruddh/fix/wiki-trailing-slash
Add trailing slash to wiki iframe src if omitted
2016-04-14 21:54:26 -07:00
Berkeley Martinez b5462a03b9 Filter out isComingSoon videos 2016-04-14 21:19:37 -07:00
Berkeley Martinez dcccb1bc5c Fix move from Mandril to Amazon SES
closes #7240
2016-04-14 21:05:16 -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
Berkeley Martinez 17915e7ecf Revert "Fix give-brownie-points/about API DB queries" 2016-04-14 17:07:40 -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 d53a2eec86 BillBoard now Flyer. Changes to API and view logic
Fix to replace of null error. Changed Flyer to flyer
2016-04-13 23:10:34 +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
Ben McMahon 326bfae750 Merge pull request #8079 from QuincyLarson/feature/nonprofit-playlist
add completed challenge count back in and link to nonprofit playlist
2016-04-13 00:19:42 +01:00
Quincy Larson a40642b963 add completed challenge count back in and link to nonprofit playlist 2016-04-12 16:10:44 -07:00
Berkeley Martinez f14a142555 Fix loopback event emitter max listeners warning 2016-04-11 16:27:58 -07:00
Quincy Larson 4637ac1c7d Merge pull request #8006 from FreeCodeCamp/fix/brownie-points
Fix give-brownie-points/about API DB queries
2016-04-11 16:08:50 -07:00
Berkeley Martinez 7f24986c58 Fix give-brownie-points/about API DB queries
This should speed up these api calls significantly
2016-04-11 15:46:22 -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
Quincy Larson d0c12be85e Merge pull request #7962 from FreeCodeCamp/fix/sitemap
Fix sitemap
2016-04-08 14:58:25 -07:00
Berkeley Martinez 95fd287f8b Fix typo in claim certificate api 2016-04-08 14:24:21 -07:00
Berkeley Martinez bbc76b1b73 Fix regression in challenge map migration 2016-04-07 16:38:39 -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 0d0f4253ec Remove console.logs 2016-04-07 09:39:52 -07:00
Berkeley Martinez 513d55b23d Add caching to news
Deprecate story creation
2016-04-06 23:06:19 -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 7737bfedc1 Fix points query 2016-04-06 21:11:07 -07:00
Berkeley Martinez 40eff8d5cc Fix lint issues 2016-04-06 21:11:07 -07:00
Berkeley Martinez fa37dc865d Reduce initial user query load
Refactor passport to own file
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 b322d6610f fix failing test 2016-04-06 14:10:24 -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 cfdb2d17b4 Add commas to certs earned on about page 2016-04-05 21:41:27 -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
Berkeley Martinez 49b9c7cc0c Fix floor logic 2016-04-05 11:21:08 -07:00
Berkeley Martinez adfb21aaf9 remove extra parenthesis 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