Commit Graph

983 Commits (07d54a455c0db519c6e67a3ada61d4c2e494273c)

Author SHA1 Message Date
Quincy Larson d02ad70913 Merge pull request #3205 from FreeCodeCamp/feature/ctrl-enter-submit
add ctrl enter press to submit on modal
2015-09-09 20:40:02 -07:00
Berkeley Martinez 40f53fc7c8 Merge pull request #3216 from QuincyLarson/unauthenticated-buttons
Help, Pair and Bug buttons for unauthenticated campers
2015-09-09 20:38:36 -07:00
Berkeley Martinez 7ab36aa785 Merge pull request #3207 from QuincyLarson/fb-share
Fb share button on map
2015-09-09 20:28:05 -07:00
Berkeley Martinez 5490557592 Merge pull request #3041 from QuincyLarson/meta
Update meta tags and copy
2015-09-09 20:20:32 -07:00
Quincy Larson 08907b8ddb improve signin page copy and move twitter to bottom of list 2015-09-09 19:55:23 -07:00
Quincy Larson c70fe77952 Merge branch 'staging' into unauthenticated-buttons
Conflicts:
	server/views/coursewares/showVideo.jade
	server/views/coursewares/showZiplineOrBasejump.jade
2015-09-09 19:54:13 -07:00
Quincy Larson ee9a2d681f make help, pair, bug buttons accessible to unauthenticated campers 2015-09-09 19:51:24 -07:00
Berkeley Martinez d3e77f1282 add ctrl enter press to submit on modal
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 19:33:01 -07:00
Berkeley Martinez a5f30414ab Merge pull request #3206 from QuincyLarson/more-info
remove unnecessary elipses from more info buttons
2015-09-09 18:59:56 -07:00
Quincy Larson 4d427f8318 simplify modal animations and close #2792 2015-09-09 18:55:20 -07:00
Quincy Larson 0eeb6891f7 Merge branch 'staging' into fb-share 2015-09-09 13:47:54 -07:00
Quincy Larson 501bd51e8b remove unnecessary elipses from more info buttons 2015-09-09 13:38:18 -07:00
Quincy Larson 2896cee8f5 simplify fb-share call to action and minimize sizze 2015-09-09 00:10:36 -07:00
Quincy Larson cfba4edb29 add further code to be QAd after sleeping 2015-09-08 23:48:11 -07:00
Quincy Larson c4c9068950 start refactoring account view into show view 2015-09-08 22:52:32 -07:00
Berkeley Martinez b2d04ec7c5 remove save to user on return individual user 2015-09-08 22:41:03 -07:00
Berkeley Martinez 9cc862e9a6 add learn button functionality
learn button looks for current challenge in localStorage
if not present sends user to map
2015-09-08 22:31:20 -07:00
Berkeley Martinez 184ba1fa37 add challengeId to localStorage
remove unneeded current challenge route
2015-09-08 22:18:25 -07:00
Quincy Larson f0a4924671 start refactoring next challenge logic 2015-09-08 21:45:53 -07:00
Quincy Larson 1e82165ed2 add learn button back in and fix redirect loop associated with it 2015-09-08 21:15:18 -07:00
Berkeley Martinez f42b671e17 Merge pull request #3119 from bugron/bugron-bring_br_back
Removes unnecessary 'negative-15' class
2015-09-08 07:25:17 -07:00
bugron 8fd99e3350 removes unnecessary class 2015-09-08 16:30:44 +04:00
Quincy Larson 5502aba817 further revisions to simplify bug modal 2015-09-07 08:18:44 -07:00
Quincy Larson e7e6bbb174 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-09-07 07:56:25 -07:00
Quincy Larson e49bcece7d Merge branch 'bugron-bug_btn_enhancement_merged' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-bug_btn_enhancement_merged 2015-09-07 07:25:14 -07:00
Quincy Larson 73ef8b9d2b fix a view bug 2015-09-06 03:12:59 -07:00
bugron 46a83b42a1 removes the checkbox at all 2015-09-06 11:40:06 +04:00
Quincy Larson 4c22d061df start working on fb-share 2015-09-04 18:36:28 -07:00
Quincy Larson 79a396b9c8 Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging
Conflicts:
	server/views/coursewares/showHTML.jade
2015-09-04 14:26:56 -07:00
Timothy Cyrus f8a5d0d7ba Update showHTML.jade
Fix Styling issue with Submit Button based on showJS.jade and showBonfire.jade
2015-09-04 14:11:52 -04:00
Quincy Larson 57e1fbf781 update copy in views 2015-09-03 18:35:42 -07:00
Quincy Larson 30aafd4185 update meta and other references to new short tagline 2015-09-02 17:42:18 -07:00
Quincy Larson 4b6cb490b7 update meta tags 2015-09-02 17:37:23 -07:00
Ammar Dodin fcaf10ca9d Updated README.md
The author of this file typed "this files" where I believe he meant to type "these".
2015-09-02 00:38:15 -07:00
bugron 887722d5c8 checkbox is now checked by default 2015-09-01 17:13:16 +04:00
bugron 8fdacb7e34 This commit extends 'Bug' button's functionality 2015-09-01 07:18:44 +04:00
jameskopacz 70b769cc6a Updated text to "Submit and go to next challenge" 2015-08-30 23:49:21 -05:00
jameskopacz c036e00f53 Updated challenge submit button text from "Submit" to "Go to my next challenge" 2015-08-30 23:17:22 -05:00
Berkeley Martinez 150676fa6e Merge pull request #2870 from QuincyLarson/add-quotes
Add quotes
2015-08-30 19:37:10 -07:00
Florian Beijers a3b54e3e63 added a space in the sr-only span for challenge map so it doesn't run together and fixed a typo on the getting started page 2015-08-30 12:43:27 +02:00
Quincy Larson 8392dcf156 Merge branch 'staging' into add-quotes 2015-08-29 22:32:44 -07:00
Quincy Larson 23c1e71823 update quotes 2015-08-29 22:31:46 -07:00
benmcmahon100 71b6e21e77 Added the accessibility fix and added the hack to fix the challenge complete modal 2015-08-30 00:31:07 +01:00
Berkeley Martinez 702dbeceab change Run code button to Run tests
Changes run button copy

closes #2846
2015-08-29 09:30:47 -07:00
Berkeley Martinez 16b33ee90a fix some linting issues 2015-08-29 01:48:01 -07:00
Berkeley Martinez f0b953eb66 fix typo js challenges view 2015-08-29 01:05:07 -07:00
Berkeley Martinez 0dfa11ca99 remove all manifest files from tracking
add readme explaining empty directory
2015-08-28 16:39:14 -07:00
Berkeley Martinez 6c48395868 separate main manifest generation from sub manifests
in dev mode always pull manifest on each request
add manifest build to gulp build task
add react bundle to manifest generation
2015-08-28 15:56:58 -07:00
Berkeley Martinez 376b58cc15 combine sandbox into commonFramework
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
Berkeley Martinez 306c441ae7 add revisioning to js/css files to break caching
This moves the location of javascript files, commonFramework,
iFrameScript, sandbox, plugin, and all the less files.
On gulp or gulp build these files are moved and revisioned.
Places where they are references in jade/html are now removed and
replaced with the use of a helper function `rev`. This function will
take the required file and return a string referencing the revisioned
file. This should alleviate the need for hard refreshing and will break
caches when files change, so fixes for firefox caching issue as well.

NOTE: @benmcmahon @quincylarson, This means files will need to be build
on the server in production before doing a server restart/reload
In production: 'npm run build' To build and revision js/css files

`gulp` and `gulp build` will used in development

npm install also needs to be run in production on initial deploy
2015-08-26 23:30:33 -07:00
Berkeley Martinez 39f636ae91 add loader to challenge submit 2015-08-26 15:17:38 -07:00
benmcmahon100 7c3f650521 Bump up cFW version number to ensure eveyone is on te latest version 2015-08-26 22:37:54 +01:00
Berkeley Martinez 2c9ed16b7a fix only submit on user click 2015-08-26 13:09:38 -07:00
benmcmahon100 306551848c Update cFW version no 2015-08-26 20:45:50 +01:00
benmcmahon100 a63d6bd00b Fixed my stupid mistake that almost killed the server again 2015-08-26 20:22:29 +01:00
benmcmahon100 695ad48778 Fixed version number 2015-08-26 12:26:01 +01:00
benmcmahon100 9f9f151a6f Re add init run 2015-08-26 12:24:44 +01:00
Berkeley Martinez cb2bc3c0bd Merge pull request #2705 from QuincyLarson/alt-text
Alt text
2015-08-25 22:30:44 -07:00
benmcmahon100 8cdd49e7f1 Fix caching issue with frameworks 2015-08-26 01:13:17 +01:00
Quincy Larson 07f66b61f4 update the completed all challenges message 2015-08-25 15:51:47 -07:00
Berkeley Martinez 851af506b5 Merge pull request #2691 from QuincyLarson/alt-text
Add more alt text to onboarding page.
2015-08-25 15:21:44 -07:00
Berkeley Martinez 14d1d1db02 fix left panel jitter jump 2015-08-25 14:49:19 -07:00
benmcmahon100 b1b07a5b9e Fixed major Fudge up with challenges without functions 2015-08-25 22:25:00 +01:00
Quincy Larson 56b18f313b update get-started alt text 2015-08-25 14:23:47 -07:00
Ben McMahon c913e9bbf7 Merge pull request #2679 from FreeCodeCamp/staging
update framework to remove merge conflicts
2015-08-25 19:41:29 +01:00
benmcmahon100 14cc6a7cef Final touch up to the framework before merge 2015-08-25 19:28:13 +01:00
Quincy Larson 50f1705cbc start updating alt text 2015-08-25 08:59:42 -07:00
Quincy Larson bc1393edac Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into calculator 2015-08-24 19:19:58 -07:00
Quincy Larson a94c919374 update cost calculator 2015-08-24 19:19:47 -07:00
Ben McMahon 86d7c2f35a Merge pull request #2646 from QuincyLarson/linking 2015-08-25 02:00:04 +01:00
Quincy Larson fd440916a8 add descriptive message to failed account linking attempt 2015-08-24 17:52:12 -07:00
Berkeley Martinez 15c49ec520 remove unused challenge utils 2015-08-24 16:19:06 -07:00
Berkeley Martinez 67681d41f6 Merge pull request #2487 from bugron/bugron-news_more_btn_fix
Fixes info buttons' text in Camper News search results
2015-08-24 11:12:12 -07:00
Berkeley Martinez 4ff9d2ffe1 Merge pull request #2578 from issyl0/fix_github_capitalization
Consistently capitalize GitHub in the account settings text
2015-08-24 11:04:24 -07:00
Berkeley Martinez d5118f489f Merge pull request #2619 from bugron/bugron-lisenting_typo
Fixes a typo in source code
2015-08-24 10:57:03 -07:00
Arsen Melikyan 49e3e20555 Fixes a typo in source code 2015-08-24 11:57:14 +04:00
benmcmahon100 1477f56f97 Merge of the frameworks: the desolation of the views 2015-08-23 22:26:02 +01:00
benmcmahon100 ede956e1d6 Merge of the frameworks: an unexpected merge 2015-08-23 21:59:29 +01:00
Isabell Long d85eded058 Consistently capitalize GitHub in the account settings text
- Also remove the capital D from Delete in the confirmation line—it's
  not the start of a sentence.
2015-08-23 13:52:14 +01:00
benmcmahon100 38397fa5f7 Fixed help modal part 3: the modal strikes back 2015-08-22 23:18:10 +01:00
Quincy Larson 73eb6ec2d1 kind of got the modals working - Ben will finish this 2015-08-22 12:10:08 -07:00
Arsen Melikyan 37b4530df2 Fixes info buttons' text in Camper News search results
In Camper News search results "more info..." buttons' text changes to "more info.more info...". This commit fixes that.
2015-08-22 17:11:44 +04:00
Quincy Larson ebb84c9e75 more refinement to simplified profile view 2015-08-21 22:53:38 -07:00
Quincy Larson d49b303de3 update look of profile 2015-08-21 22:52:09 -07:00
benmcmahon100 901f1a977d Merge remote-tracking branch 'origin/staging' into staging 2015-08-22 00:59:34 +01:00
benmcmahon100 38a73e392f Deactivated scroll locking 2015-08-22 00:59:21 +01:00
Berkeley Martinez f5a652e046 fix remove console log 2015-08-21 16:09:50 -07:00
Berkeley Martinez 0f3acc629c fix profile linking 2015-08-21 16:09:07 -07:00
Quincy Larson adc50b764d uncomment social linking 2015-08-20 19:52:48 -07:00
Berkeley Martinez d14eb0dbaa fix 401 account/delete if not auth 2015-08-20 09:40:29 -07:00
Berkeley Martinez 16dcc6a39e remove old password reset route 2015-08-20 08:55:26 -07:00
Berkeley Martinez eaca9ef495 refactor challenges
now only queries challenges on start up
use default scheduler for array manipulation
2015-08-20 08:55:25 -07:00
Berkeley Martinez 6d1d8a3e28 fix current streak
always start from today
2015-08-20 08:55:25 -07:00
Berkeley Martinez da61161765 fix longest streak 2015-08-20 08:55:25 -07:00
benmcmahon100 d52a2d8da0 Attempt to sorta fix the scroll locker resetting 2015-08-20 16:48:46 +01:00
Quincy Larson 538e48e237 start updating showZiplineOrBasejump view to function post-angular 2015-08-19 17:56:44 -07:00
Quincy Larson 23b7c4f20f remove difficulty from bonfires to make things look more consistent 2015-08-19 17:56:14 -07:00
Quincy Larson a92db3bbf1 remove angular from universal head 2015-08-19 17:44:18 -07:00
Quincy Larson 1dadc48aea remove angular from user account creation flows 2015-08-19 15:55:40 -07:00
Berkeley Martinez f3410a3a95 remove debug statement 2015-08-19 13:48:04 -07:00
Berkeley Martinez 03b837cf51 fix break current stream 2015-08-19 13:46:26 -07:00
benmcmahon100 f4eecc9127 Merge pull request #1993 from kurzninja/patch-4
Potentially missing ;
2015-08-19 21:30:09 +01:00
Berkeley Martinez 576315abdc fix current streak,
longest streak still broken
2015-08-19 13:05:53 -07:00
Berkeley Martinez 6a11b30bc2 serve static assets before sessions 2015-08-19 11:28:44 -07:00
Quincy Larson 04c9d376f7 remove server maintenance warnings 2015-08-18 23:48:31 -07:00
Berkeley Martinez 679d1383a5 up timeout 2015-08-18 23:14:27 -07:00
Berkeley Martinez bc84a25ff9 add message on emergency maintenance 2015-08-18 23:07:06 -07:00
Berkeley Martinez 01a45e0635 fix cannot find challengeId of undefined 2015-08-18 20:02:39 -07:00
Berkeley Martinez 0128829d11 fix cannot read property id of user durring upvote
post to upvote without auth returns 401
2015-08-18 19:48:42 -07:00
Berkeley Martinez 8c803281f6 fix cannot read property match of undefined 2015-08-18 19:23:43 -07:00
Berkeley Martinez 0367a19ffc add bower_components to pathsOfNOReturnTo 2015-08-18 16:00:27 -07:00
Berkeley Martinez f59d029336 fix check if url sent with story 2015-08-18 15:56:23 -07:00
Berkeley Martinez 478ed3c522 fix should toString userId's 2015-08-18 15:23:26 -07:00
Quincy Larson 9dcf284825 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-18 15:21:38 -07:00
Quincy Larson b4ae49f915 add challenge type to beginning of challenge in map 2015-08-18 15:21:26 -07:00
Quincy Larson b667a776ea add bonfires back in but now they are only visible to their creators 2015-08-18 14:53:18 -07:00
Berkeley Martinez b2f4e520cb fix account link failure now flashes 2015-08-18 14:48:52 -07:00
Berkeley Martinez d9d44ae509 fix redirect link failures to /account 2015-08-18 14:48:52 -07:00
benmcmahon100 366b9e98a7 Merge remote-tracking branch 'origin/staging' into staging 2015-08-18 19:32:04 +01:00
Quincy Larson 0d0528a743 fix LinkedIn link in footer 2015-08-18 11:22:59 -07:00
benmcmahon100 6de1f49a1f Temp fix for buttons on modals and bonfires exec on load 2015-08-18 19:21:34 +01:00
Berkeley Martinez 112972cfdd fix enables email login 2015-08-18 01:32:37 -07:00
Brett Guillory c5d07b9e05 Potentially missing ;
My browser was throwing an error:
```Uncaught SyntaxError: missing ) after argument list```
That pointed to this line in the console as far as I could tell.
If this is a fix, w00t. If not, ignore this.
2015-08-17 22:05:16 -05:00
Berkeley Martinez 495aac8233 remove part of note about email signin 2015-08-17 19:21:57 -07:00
patlanders 973c9e67c2 Change "opps!" to "Oops!" in error-handlers.js 2015-08-17 13:20:15 -04:00
benmcmahon100 fe102bdf51 fix #1840 2015-08-17 14:04:12 +01:00
Ionut Costica c39189eab0 Fix for Issue #1828 2015-08-17 15:04:53 +03:00
Quincy Larson 07dd58d65b update copy and remove bug warnings 2015-08-16 23:43:57 -07:00
Quincy Larson 2634569e60 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 19:34:44 -07:00
Quincy Larson 21cbbc2233 Update warning messages 2015-08-16 19:34:23 -07:00
benmcmahon100 3be62c5374 Fixed the script issues 2015-08-17 00:04:20 +01:00
Berkeley Martinez a228e61353 hot fix test for function first 2015-08-16 15:27:06 -07:00
Quincy Larson a0c9906e69 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 14:20:19 -07:00
Berkeley Martinez f475a4e1ad fix map, should not mutate challenges 2015-08-16 14:20:00 -07:00
Quincy Larson dfc557f9e6 move refactor all non-jquery JS to load last 2015-08-16 13:49:43 -07:00
Quincy Larson de10e77645 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 11:02:33 -07:00
Quincy Larson 454e59939e add wiki to tops of pages 2015-08-16 11:02:22 -07:00
Berkeley Martinez de7eb3d440 fix email password reset 2015-08-16 09:54:59 -07:00
Quincy Larson 98df14bf86 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 08:03:48 -07:00
Quincy Larson b05d9338f4 update csp 2015-08-16 08:03:34 -07:00
Berkeley Martinez b828a1e825 fix google should be oauth2 2015-08-16 06:51:47 -07:00
Quincy Larson d14514f661 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 06:07:49 -07:00
Quincy Larson 58d86ce2dc hide linking buttons 2015-08-16 06:07:38 -07:00
Berkeley Martinez 7d22c2a073 fix should check completed challenge old _id 2015-08-16 05:52:25 -07:00
Quincy Larson edb58f6890 add authentication back in 2015-08-16 05:47:13 -07:00
Quincy Larson 63d506c14f remove beta warning 2015-08-16 04:06:01 -07:00
Quincy Larson 23003e8724 add new congratulatory quotes 2015-08-16 04:05:49 -07:00
Quincy Larson e3404c6564 minor improvements and bug fixes to stories 2015-08-15 14:13:21 -07:00
Berkeley Martinez bcdda9c62a fix unexpected syntax error on map 2015-08-14 18:25:34 -07:00
Berkeley Martinez 42303dc6aa fix progressBar not showing
reduce function needs initial seed

closes #1753
2015-08-14 18:24:14 -07:00
Quincy Larson ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
Berkeley Martinez acf48aa403 show jobs in dev
remove old jobs stuff
2015-08-13 15:41:30 -07:00
Quincy Larson 0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
benmcmahon100 5905e19e1b Merge remote-tracking branch 'origin/OOPF' into OOPF 2015-08-13 12:57:14 +01:00
Quincy Larson 40b43370eb update twitch page title thanks to @1hella for spotting this 2015-08-13 01:20:45 -07:00
Quincy Larson c50b9c5afa Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 00:57:42 -07:00
Quincy Larson 1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Berkeley Martinez 0262d1b676 fix github link
link callback uri should have some path as auth callback uri
2015-08-12 21:44:55 -07:00
Quincy Larson bf2db5ff62 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson 99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Berkeley Martinez 7eaccffd15 remove hikes from map
closes #1682
2015-08-12 20:39:40 -07:00
Berkeley Martinez cd9dcc6953 hide react routes 2015-08-12 20:32:27 -07:00
Quincy Larson 315b78fb69 update copy on onboarding 2015-08-12 20:27:46 -07:00
Berkeley Martinez 4b0a9bef0a fix social auth scheme
closes #1734
2015-08-12 20:10:12 -07:00
Berkeley Martinez eb07cbfea6 fix override user identity login to reformat provider 2015-08-12 20:10:12 -07:00
Berkeley Martinez fc29c1fd9b linking accounts now works.
bug, need to change how loopback generates provider string.
2015-08-12 20:10:11 -07:00
Berkeley Martinez a4e220e2bc Move auth functions to central location 2015-08-12 20:10:11 -07:00
Quincy Larson 8cdc545f71 minor ux improvement to onboarding 2015-08-12 18:25:43 -07:00
benmcmahon100 7910f0ae2c Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display 2015-08-13 01:20:12 +01:00
Berkeley Martinez ca01115674 fix next challenge unknown bug
closes #1725
2015-08-12 11:47:03 -07:00
Berkeley Martinez 0fcf3bcf42 fix challenge completion should give brownie points
closes #1665
2015-08-11 14:17:08 -07:00
Berkeley Martinez 6fd19738ce refactor and lint home router 2015-08-11 13:22:16 -07:00
Berkeley Martinez 2256f3ef6e fix add github link to passport 2015-08-10 23:38:10 -07:00
Berkeley Martinez 5f21db457d fix challenge ordering
Now challenges are ordered on map first by top order value of json file
second by index of array
2015-08-10 23:29:32 -07:00
Quincy Larson 43e3dc8914 Finish onboarding page 2015-08-10 21:55:13 -07:00
Berkeley Martinez 341d931833 fix streak show days 2015-08-10 21:01:37 -07:00
Quincy Larson 7bfe61731b give a user a brownie point when they start 2015-08-10 20:55:01 -07:00
Quincy Larson 853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
Quincy Larson d67c049d5b make onboarding page the default homepage for authenticated users 2015-08-10 17:40:13 -07:00
Quincy Larson a44622af82 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
Quincy Larson f8665324ad simplify user account and profile system for github locking 2015-08-10 15:37:49 -07:00
Quincy Larson add87ae801 start simplifying account page 2015-08-10 15:10:38 -07:00
Quincy Larson d7e824ebbe done adding static images 2015-08-10 00:44:37 -07:00
Quincy Larson d56ecd1979 add a bunch of new images to onboarding 2015-08-10 00:42:33 -07:00
Berkeley Martinez 1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Quincy Larson 13f08bf037 Merge branch 'staging' into onboarding 2015-08-09 22:00:26 -07:00
Quincy Larson f3028b0e6a continue work on get-started 2015-08-09 21:59:49 -07:00
Quincy Larson 4ed041c0db update curriculum structure again 2015-08-09 21:26:26 -07:00
Quincy Larson e0bd8c6dd2 remove pair programming Bonfire warm up challenge 2015-08-09 17:03:49 -07:00
Quincy Larson 0994dbaabe finalize copy on get-started 2015-08-08 22:46:21 -07:00
Quincy Larson 5fb1df0d55 start onboarding page 2015-08-08 16:13:23 -07:00
Berkeley Martinez 554c6ce228 Merge branch 'title' of https://github.com/ahstro/freecodecamp into ahstro-title 2015-08-07 18:41:05 -07:00
Berkeley Martinez 013d983c2e add github refresh button 2015-08-07 18:29:56 -07:00
Berkeley Martinez 611098ba09 if user is github cool navbar links to account show page 2015-08-07 18:26:18 -07:00
Berkeley Martinez 83397b7e1b add picture on github signin/up 2015-08-07 18:10:32 -07:00
ahstro e7c8589d08 Everything is horrible 2015-08-08 02:38:16 +02:00
Berkeley Martinez 71a02ed8b7 update all instances of progressTimestamp to check for objects 2015-08-07 13:32:30 -07:00
Berkeley Martinez 8d293c9fc6 fix order of user/pairedWith in withLatestFrom operator in challenges 2015-08-06 15:51:36 -07:00
Berkeley Martinez 783d7cf1ec fix string non-alphanumeric non-whitespace chars before regex 2015-08-06 15:37:07 -07:00
Berkeley Martinez 222d841e4f on oauth signin only set profile/username if using github 2015-08-06 00:19:03 -07:00
Berkeley Martinez 0ce81bbabb fix email sign should not require username 2015-08-05 19:29:17 -07:00
Berkeley Martinez a838a4097d fix clicking on image or points always takes you to /account 2015-08-05 19:12:54 -07:00
Berkeley Martinez 07e9bbf00a add link to github waypoint to non github cool campers 2015-08-05 13:54:48 -07:00
Berkeley Martinez 0def1b3ba8 readd challenges 2015-08-05 13:21:53 -07:00
Berkeley Martinez f167238c74 remove public accounts if user is not github cool or grandfathered 2015-08-05 13:01:48 -07:00
Berkeley Martinez 504239050c remove old license information
repo is now under copyright to FCC
find license in root directory
2015-08-05 13:01:48 -07:00
Quincy Larson 3c4142c92c fix profile update button 2015-08-04 18:43:40 -07:00
Quincy Larson 3551cefb3d simplify account.jade view for github integration 2015-08-04 18:29:05 -07:00
Quincy Larson 989cb87c00 add redirect for now vanished field guide articles 2015-08-04 18:00:01 -07:00
Quincy Larson 5f2ec0aeae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp i:wq
nto staging
2015-08-04 15:10:15 -07:00
Quincy Larson 7246945b42 remove bonfires from campers' public portfolios 2015-08-04 15:09:20 -07:00
Berkeley Martinez e01876f3ab disable username updating when camper is githubCool 2015-08-04 15:03:33 -07:00
Quincy Larson 73f0dcf732 make wiki open in new tab 2015-08-04 14:58:24 -07:00
Quincy Larson 041abd1065 fix beta warning 2015-08-04 14:58:04 -07:00
Quincy Larson c573caf2e2 remove website links from user model and account view 2015-08-04 14:57:34 -07:00
Quincy Larson df786eaf2b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-04 14:40:56 -07:00
Quincy Larson 0682857236 remove learn link from navbar 2015-08-04 14:40:47 -07:00
Berkeley Martinez 2dc9934da2 add user.isGithubCool check
if user signs up with github, they become GithubCool.
2015-08-04 13:41:10 -07:00
Berkeley Martinez c8488c8419 reremove extra middlewares from server file 2015-08-04 06:28:10 -07:00
benmcmahon100 fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Berkeley Martinez a1a64435d6 readding twitter auth
twitter auth is the only oauth that works in local dev
2015-08-04 01:47:27 -07:00
Berkeley Martinez 43d74c2f48 add beta warning banner 2015-08-04 01:34:26 -07:00
Berkeley Martinez efa73c93ee remove twitter auth 2015-08-04 01:34:26 -07:00
Berkeley Martinez f01a66c5c7 use (LMP)loopback middleware phases
bump loopback-component-passport which uses LMP
move custom middlewares to middlewares directory
2015-08-04 01:34:26 -07:00
Berkeley Martinez a920e16cb9 fix completedWith.toLowerCase bug 2015-08-03 16:35:22 -07:00
Berkeley Martinez 7ca1d7cfde remove facebook/google/linkedin auth from linking 2015-08-03 12:53:23 -07:00
Berkeley Martinez bf1c2ace00 disable facebook/google/linked auth for testing 2015-08-03 12:38:20 -07:00
Berkeley Martinez c5af46b33f remove beta flash 2015-08-03 08:31:02 -07:00
Berkeley Martinez 55731aa52d fix beta warning title
closes #1452
2015-08-02 07:07:03 -07:00
Berkeley Martinez 88092f9ed6 Merge pull request #1255 from ahstro/lumenteun-1235
Profile pictures in 'Camper News' now link to profiles.
2015-08-01 16:51:56 -07:00
Berkeley Martinez 1b948ed4af Merge pull request #1302 from tanis2000/tanis2000-1273
Fixes #1273 (URL validation when submitting news)
2015-08-01 16:37:01 -07:00
Berkeley Martinez 32ce40b815 add beta site warning 2015-08-01 16:11:05 -07:00
benmcmahon100 0a34dcf6c3 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:25:49 +01:00
benmcmahon100 c075eb0116 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:24:16 +01:00
benmcmahon100 f60bfd5da1 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:22:02 +01:00
benmcmahon100 aef867cc69 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:20:19 +01:00
benmcmahon100 abfab7389b Added the scrolling editor 2015-08-01 19:55:40 +01:00
Berkeley Martinez 8270cb4103 add github auth 2015-08-01 08:39:13 -07:00
Quincy Larson 7b85031a8a fix issue with nonprofit show views not loading 2015-07-31 22:06:07 -07:00
Quincy Larson feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Quincy Larson fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
Quincy Larson 439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
Berkeley Martinez 13f2f349dc remove bonfire/comments models
remove comments from user router
2015-07-31 20:22:08 -07:00
Berkeley Martinez 646fa1cbac remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
Berkeley Martinez ee8776feb3 removes comments
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
Quincy Larson 3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
Berkeley Martinez 6454f37079 fix upvoting story no longer gives you brownie points
closes #1008
2015-07-31 14:31:12 -07:00
Quincy Larson 2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
Berkeley Martinez c82b2e3ae6 set and render page title
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
Quincy Larson 5fd95c584c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson fd3374fca7 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
Berkeley Martinez 1b9608f225 fix nonprofits totalSavings errors 2015-07-26 19:15:19 -07:00
Berkeley Martinez dbe50a5dfa add beta.freecodecamp.com to csp script source 2015-07-25 15:44:40 -07:00
Berkeley Martinez 41274fad2d jobs store fetching 2015-07-25 15:42:03 -07:00
Berkeley Martinez 6306580d84 add note about indexof call throwing 2015-07-25 13:35:01 -07:00
Berkeley Martinez c0eda90eb1 make production future ready
This commit does the following:

Production start should use the following command `npm run
start-producion` this first runs bower install and builds the front end
app(react). Then it will use the `pm2Start` script. This script will set
up the pm2 daemons to run loopback in cluster mode. This script also use
`production-start` script instead of the regular `server` script.

The reasons are two fold: to ensure `server` is run in es7 mode, and to
wait for handshake from DB or kill itself if no DB can be found within a
certain amount of time.
2015-07-24 22:27:52 -07:00
Berkeley Martinez a1a4ac883d add user stores/actions
construct fetchr on every request
2015-07-24 22:27:52 -07:00
Quincy Larson 37d5efed4e Merge branch 'staging' into js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
Berkeley Martinez 6de5ad682e Get rid of uncompletedChallenges on user object 2015-07-23 16:03:52 -07:00
Berkeley Martinez 5f52498dc1 lint user file 2015-07-23 16:03:51 -07:00
Berkeley Martinez e22cd5da23 correct answer hits server 2015-07-23 16:03:51 -07:00
Berkeley Martinez bf64beed5d Hide body overflow 2015-07-23 16:03:50 -07:00
Berkeley Martinez 04a5a081b3 fix mixing forward slash on transistionTo 2015-07-23 16:03:48 -07:00
Berkeley Martinez 5ba0dc1fec hikes/:dashedName renders questions 2015-07-23 16:03:47 -07:00
Berkeley Martinez 5e02896269 update loading hike directly loads lecture 2015-07-23 16:03:47 -07:00
Berkeley Martinez d0b1d83249 prefetch data and prime stores on client render 2015-07-23 16:03:47 -07:00
Berkeley Martinez f4f2d68551 add state namespace 2015-07-23 16:03:47 -07:00
Berkeley Martinez 02e4c66726 add hike service sort by difficulty 2015-07-23 16:03:47 -07:00
Berkeley Martinez de1d931b82 add hikes/map pulls hikes out of db and renders 2015-07-23 16:03:46 -07:00
Quincy Larson 83654fb86a finish adding the nodeschool challenges 2015-07-23 16:03:46 -07:00
Berkeley Martinez eb3f993b3b update split field guide view into categories 2015-07-23 15:50:47 -07:00
Quincy Larson 60f2bdc685 more minor updates 2015-07-23 15:50:47 -07:00
Berkeley Martinez 8b0b5dd6ce split field guides into separate categories 2015-07-23 15:50:47 -07:00
Berkeley Martinez 799f4736d7 fix always call onNext
use defaultIfEmpty to prevent filtering from collapsing observable
pipeline early
2015-07-23 15:49:04 -07:00
Quincy Larson e04c11c2e7 mid-task commit for Berkeley to take over 2015-07-23 15:49:04 -07:00
Berkeley Martinez 94ed227aeb add video css 2015-07-23 15:49:03 -07:00
Berkeley Martinez ac35b4bf73 fix some typo's 2015-07-23 15:49:03 -07:00
Berkeley Martinez 6eca181f6f add vimeo to connect sources 2015-07-23 15:49:02 -07:00
Berkeley Martinez c1b0035d17 add bundle to react jade template 2015-07-23 15:49:02 -07:00
Berkeley Martinez ef7e0c67ee fix not found calls next 2015-07-23 15:49:01 -07:00
Berkeley Martinez 4c8a8a4875 change mobile to hikes 2015-07-23 15:49:01 -07:00
Berkeley Martinez bb37583c90 fix should be getChildRoutes
fix fromNodeCallback returns array of values from callback
fix remove require.ensure - needs to be tested
2015-07-23 15:49:01 -07:00
Berkeley Martinez 2b80cdbbdc fix create Router from loopback 2015-07-23 15:49:01 -07:00
Berkeley Martinez e3acbe01a9 initial entry points up 2015-07-23 15:49:01 -07:00
Berkeley Martinez fb244aa165 remove server/server dir
accidently added to tracking
2015-07-23 15:49:00 -07:00
Berkeley Martinez 570d55193e add entry for use with plain node or node-debug start
i.e. `node-debug server/debug-entry`
2015-07-23 15:49:00 -07:00
Berkeley Martinez c33c6c9a8f introduce es6 and babel to whole app 2015-07-23 15:49:00 -07:00
Berkeley Martinez a0278c114d add express state extentions to app 2015-07-23 15:49:00 -07:00
Berkeley Martinez a5e7009a57 initial react app(WIP) 2015-07-23 15:49:00 -07:00
Berkeley Martinez 05c6dcdf0f add render$ ($ for stream) method to express res 2015-07-23 15:48:59 -07:00
Valerio Santinelli d80fe7ff43 Fixes URL validation using the standard validator package. 2015-07-15 12:41:09 +02:00
Valerio Santinelli 9343806cd7 Fixed password reset. The check on the expiration date was incorrect. 2015-07-15 12:28:13 +02:00
LumenTeun e05cc3fbb9 Profile pictures in 'Camper News' now link to profiles. #1235 2015-07-11 01:12:17 +02:00
Quincy Larson 8072a4b7f2 fix modal closing a on showJS view 2015-07-10 10:12:53 -07:00
Quincy Larson 41f5325ab6 update landing page 2015-07-07 10:45:56 -07:00
Quincy Larson db324186da update showjs view 2015-07-05 17:15:54 -07:00
Quincy Larson 612de6911e update quotes 2015-07-04 23:52:29 -07:00
Quincy Larson c2a9a1ca62 add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson 0301d3bc61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-02 13:59:22 -07:00
Quincy Larson 4fb3b3e7cc add more cities and move the bootcamp calculator to field guide entries (still untested). 2015-07-02 13:59:13 -07:00
Quincy Larson 10f53bdd49 Merge pull request #1161 from LumenTeun/grammar
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
benmcmahon100 71ea26ab96 Implemented scroll-locker 2015-07-02 21:32:20 +01:00
benmcmahon100 8bed9fa7d7 Implemented scroll-locker 2015-07-02 21:31:59 +01:00
benmcmahon100 0a59bd5cfb Implemented scroll-locker 2015-07-02 21:31:28 +01:00
Berkeley Martinez 580e2e3ebd add redirect for https 2015-07-01 14:35:15 -07:00
LumenTeun 75948c4bc1 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Quincy Larson d9fe6dcef1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
Quincy Larson 3bac247627 remove stack trace from production 2015-06-26 01:30:51 -07:00
Quincy Larson 7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -07:00
Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
Berkeley Martinez 8570f9b5e7 fix story upvote should happen at end of stream 2015-06-26 00:35:13 -07:00
Berkeley Martinez 9818186afc fix should redirect to /news when no story is found 2015-06-26 00:16:18 -07:00
Berkeley Martinez 310bf7f6fb fix navbar should point to /news not /stories 2015-06-25 23:43:02 -07:00
Berkeley Martinez 549434bdbf fix should be /news for show views 2015-06-25 23:39:38 -07:00
Quincy Larson 6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez 82c96ec0ba bump main.js version 2015-06-25 23:20:16 -07:00
Berkeley Martinez 9c2768591d fix check for user existence 2015-06-25 23:01:04 -07:00
Quincy Larson e9450b9321 start building sponsor views 2015-06-25 15:15:41 -07:00
Berkeley Martinez 13590a1331 refactor rxify stories
fixes many bugs
2015-06-25 15:03:46 -07:00
Quincy Larson 750a454298 update bootcamp json 2015-06-24 09:37:03 -07:00
Berkeley Martinez 1f28f877cf fix remove mongoose specific function 2015-06-24 08:25:34 -07:00
Quincy Larson 4871b58904 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-24 07:21:22 -07:00
Berkeley Martinez c0c15cf875 fix define story 2015-06-24 07:16:09 -07:00
Quincy Larson 4d620c5796 comment out feature map modal and camper news notification 2015-06-24 07:06:40 -07:00
Berkeley Martinez 0b1e9ba279 fix mismatch property in challenge controller 2015-06-23 16:45:35 -07:00
Berkeley Martinez 31eb81bf2f fix many queries in story 2015-06-23 16:28:16 -07:00
Berkeley Martinez fb04a022ae refactor rxify fieldguides 2015-06-23 16:22:07 -07:00
Berkeley Martinez 1dda8e2f87 refactor Rxify nonprofits router 2015-06-22 19:23:07 -07:00
Berkeley Martinez d624cf3640 factor out (un)dasherize into utils 2015-06-22 17:24:55 -07:00
Berkeley Martinez 10a5c3c928 fix send 200 to non users on post to challenges
fix remove random 'yo' debug
2015-06-22 16:43:31 -07:00
Quincy Larson 6972f64697 fix minor issue with controller 2015-06-21 22:46:37 -07:00
Quincy Larson a428404600 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-21 21:01:26 -07:00
Berkeley Martinez 7df91e6310 add total time to start to logs during waitFordb 2015-06-21 19:11:42 -07:00
Berkeley Martinez 5e8ed616d5 add wait for db in development before listening for connections 2015-06-21 18:37:29 -07:00
Berkeley Martinez 4804d868c4 wrap server.listen in if module
prevents server from starting durring testing/scripting
2015-06-21 18:10:17 -07:00
Quincy Larson ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez 629262dd0d fix /chat should go to gitterim 2015-06-20 23:15:10 -07:00
Berkeley Martinez 8f445b58f2 fix chat links go to Gitter Room 2015-06-20 23:11:33 -07:00
Berkeley Martinez 742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
Berkeley Martinez 0623ace259 fix sitemap query's
make rx mapping async
2015-06-20 21:21:36 -07:00
Berkeley Martinez f17c442018 fix should be story not store 2015-06-20 20:54:39 -07:00
Berkeley Martinez 9fb3c0bff7 fix use secrets.db instead of process.env.MONGOHQ in datasource.local.js
this should eliminate timeout issue.
I'd bet my bottom dollar.
2015-06-20 20:43:36 -07:00
Berkeley Martinez 049233c0a1 fix add server/utils/rx to commit 2015-06-20 19:55:22 -07:00
Berkeley Martinez 03ea412b4a major challenges refactor
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
Berkeley Martinez 4d2b0844ae fix use regex to find challenges 2015-06-20 19:54:08 -07:00
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson 5212173c61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Berkeley Martinez 43ae70465b refactor returnIndividualBonfires 2015-06-20 11:43:12 -07:00
Berkeley Martinez 50a0ad3595 fix use gt not $gt
closes #1022
2015-06-20 00:36:28 -07:00
Quincy Larson 883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -07:00
Quincy Larson 6078b54393 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00
Quincy Larson d5ea05e448 Merge branch 'Lemony-Andrew-master' into staging
Conflicts:
	server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
Berkeley Martinez 12b055353e remove challangeMap
move to challenges router
2015-06-19 14:49:10 -07:00
Berkeley Martinez 938568454e move getMDNLinks func to utils 2015-06-19 14:32:17 -07:00
Berkeley Martinez f84ac9ad12 remove forceDomain 2015-06-18 19:56:21 -07:00
Berkeley Martinez 28f346e830 fix should be connectionTimeout not timeout 2015-06-18 19:08:39 -07:00
Berkeley Martinez 81b77ff8ad increase database timeout 2015-06-18 17:52:23 -07:00
Berkeley Martinez 2bf8810d79 add pmx errorhandler in beta spot 2015-06-18 16:19:59 -07:00
terakilobyte 0173804e21 updates helmet policies, makes new startup script 2015-06-18 17:08:21 -04:00
Berkeley Martinez 9c14e5846d add www.freecodecamp.org to trusted list 2015-06-18 13:12:35 -07:00
Berkeley Martinez 81ae7daff1 fix try using oath instead of oauth2 for google 2015-06-18 12:28:16 -07:00
Quincy Larson 0ef399ad92 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/passport-providers.js
2015-06-17 22:06:40 -07:00
Quincy Larson 1a3e227920 updated linkedin permissions 2015-06-17 22:05:37 -07:00
Berkeley Martinez c56c8fb310 fix linkedin/google should be oath2
fix should be authOptions not oAuthOptions
fix should be LINKEDIN_STATE not LINKED_STATE
2015-06-17 21:43:22 -07:00
Berkeley Martinez caacee7959 fix should be env not ENV 2015-06-17 21:13:47 -07:00
Berkeley Martinez bfddc0330f add state attribute to linked oauth
note: a new variable will need to be added to .env 'LINKEDIN_STATE'
which is a random string
2015-06-17 20:59:35 -07:00
Quincy Larson bb6f153858 make server always show stack traces upon error 2015-06-17 20:26:59 -07:00
terakilobyte fbb7d0b065 Remove ssl on node servers 2015-06-17 15:40:44 -04:00
Quincy Larson 0621b8c62b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 13:46:37 -07:00
Quincy Larson 2e1babb12d finalize calculator for release 2015-06-16 13:46:24 -07:00
Quincy Larson 40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
terakilobyte 810bf9a3f7 force https for blob url in _frame.js. Updates helmet to allow more inspectlet domains. 2015-06-16 15:59:22 -04:00
terakilobyte 1607fe0ba5 Updates server listen in production 2015-06-16 15:51:04 -04:00
terakilobyte 7915e8a77e 99 problems, and production only errors are 98 of them 2015-06-16 15:41:59 -04:00
terakilobyte 9e8796a0c4 More tweaking 2015-06-16 15:38:22 -04:00
Quincy Larson 2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
terakilobyte a662187d93 More ssl setup 2015-06-16 15:24:55 -04:00
terakilobyte e782e0310f Remove toString() on certificate reads as per http://stackoverflow.com/questions/20893025/cant-start-nodejs-https-server-v0-10-23 2015-06-16 15:04:20 -04:00
terakilobyte 645c0aac0e Server test 2015-06-16 14:51:40 -04:00
terakilobyte b25dd9416b More https configuration 2015-06-16 14:43:49 -04:00
terakilobyte 7e420217eb More https configuration 2015-06-16 14:43:12 -04:00
terakilobyte 0a8356e50f Configure production to run in https 2015-06-16 14:30:16 -04:00
terakilobyte b0b236821e More inspectlet configuring 2015-06-16 12:30:49 -04:00
terakilobyte 308e539e1e More protocol experimentation 2015-06-16 12:23:49 -04:00
terakilobyte 3546cf4765 Fetch google fonts over https 2015-06-16 12:09:45 -04:00
terakilobyte 97668120ad More work to load google fonts 2015-06-16 12:04:26 -04:00
terakilobyte efb4bd1781 Even more testing 2015-06-16 11:54:58 -04:00
terakilobyte 121dabdf73 More whitelist testing 2015-06-16 11:51:07 -04:00
terakilobyte 53f5f36768 whitelist beta site https://freecodecamp.org 2015-06-16 11:44:25 -04:00
terakilobyte 5b742121d7 Add pmx error handler for loggign to keymetrics 2015-06-16 09:42:55 -04:00
terakilobyte 7f311a1e03 Explicitly add google font servers to whitelist 2015-06-16 09:33:34 -04:00
terakilobyte a621ff3190 Add https to helmet whitelist 2015-06-16 09:18:59 -04:00
Quincy Larson 9bc4f0c25c Merge branch 'master' into staging 2015-06-16 06:08:25 -07:00
Quincy Larson ef9d6fc55b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 06:08:18 -07:00
Quincy Larson 23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
terakilobyte cb76aa1ea0 whitelist nginx server in helmet 2015-06-16 00:14:33 -04:00
Quincy Larson c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
terakilobyte 1cd85eeb8f Debug statement for fieldguide ID 2015-06-15 23:35:29 -04:00
Quincy Larson 6b909d8f59 start refactoring calculator logic 2015-06-15 18:00:13 -07:00
terakilobyte 4fa1f25cc2 Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records. 2015-06-15 20:53:43 -04:00
terakilobyte 42aae365f6 Update current challenge logic 2015-06-15 18:57:45 -04:00
terakilobyte 4092dcecf7 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:50:31 -04:00
terakilobyte c136895064 Rewrite challenge controller to use dashed names, update index.js to include new utility function getDashedNames 2015-06-15 18:50:18 -04:00
Berkeley Martinez b0dc4ffa12 get account should redirect to '/' when no user is logged in 2015-06-15 15:47:56 -07:00
Berkeley Martinez c4d229e62d remove email verification step.
users are marked for future uses
2015-06-15 15:43:12 -07:00
terakilobyte a334b9870c Set up production variables 2015-06-15 18:24:26 -04:00
terakilobyte a82a8fb044 move to dashedName lookup 2015-06-15 14:50:54 -04:00
terakilobyte 40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04:00
Quincy Larson 6c33d4bf78 calculator works 2015-06-14 21:17:48 -07:00
Quincy Larson 0ef39904a9 major improvements to calculator logic 2015-06-14 17:55:23 -07:00
Quincy Larson 2a98e5c851 fix calculator view file location 2015-06-14 01:39:22 -07:00
Quincy Larson 5e3edf5cda Merge branch 'master' into staging 2015-06-14 01:10:51 -07:00
Quincy Larson 43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
Quincy Larson b6fc2551d9 Merge branch 'interview' into staging
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
terakilobyte af75452db5 Remove forcedomain so we can test beta website 2015-06-12 21:09:12 -04:00
terakilobyte 5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
Berkeley Martinez 63937c3a56 fix make usernames required 2015-06-12 13:14:07 -07:00
Quincy Larson 173d46ae01 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/field-guides.json
2015-06-12 12:40:26 -07:00
Berkeley Martinez 0f5f92b937 fix user deletion of credentials
should use a where clause with destroyAll
2015-06-12 11:58:31 -07:00
Berkeley Martinez c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
Berkeley Martinez 5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -07:00
terakilobyte 34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
terakilobyte f7bb14803e Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04:00
terakilobyte 0aa83f1bb9 Remove mongoose style lookup from fieldguide.js. Update user model. 2015-06-11 15:33:38 -04:00
terakilobyte 0b1c23207d Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-11 15:18:45 -04:00
terakilobyte 3115ba6404 update tests 2015-06-11 15:18:37 -04:00
Quincy Larson b3fb1d492d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:39:20 -07:00
Berkeley Martinez fe5cbec117 add pull in user image on signup when available 2015-06-11 11:38:08 -07:00
Quincy Larson 5fb89cb091 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07:00
Berkeley Martinez af902799b1 add acl controls to models 2015-06-10 23:59:42 -07:00
Berkeley Martinez 84f2168769 fix remove stray profile reference
fix findOne queries should have where filter
2015-06-10 17:12:21 -07:00
Berkeley Martinez 9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez bdb7d40548 fix usernames should be saved lowercased 2015-06-10 15:22:57 -07:00
Berkeley Martinez 996c3e7816 fix make email optional 2015-06-10 15:12:48 -07:00
Berkeley Martinez cd38a2d88e fix user local signin 2015-06-09 17:22:14 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
Berkeley Martinez 2e5f250ba8 remove hpp
loopback is protected against hpp attack by default
2015-06-09 16:45:14 -07:00
Berkeley Martinez b34646dd6b remove passport file
remove unneeded comments
2015-06-09 16:45:14 -07:00
Berkeley Martinez 68da1f1c68 optionally add email field if available 2015-06-09 16:43:32 -07:00
terakilobyte 5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04:00
Quincy Larson 61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
Berkeley Martinez 78dac937f7 remove email verification. 2015-06-07 22:07:38 -07:00
terakilobyte 1a27c133c5 Update user account fetching for profile view 2015-06-05 15:57:27 -04:00
terakilobyte 6b6de50ad4 Update story query for loopback. 2015-06-05 15:00:54 -04:00
terakilobyte 21b9405f06 Update links for new api model in views for stories. 2015-06-05 14:58:42 -04:00
terakilobyte 4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04:00
terakilobyte d782ac9520 Update find method in fieldGuide.js 2015-06-05 13:25:28 -04:00
terakilobyte a0b34c8e90 Redirect to home path on unsuccessful query rather than induce infinite redirect loop. 2015-06-05 09:41:53 -04:00
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
Quincy Larson 875d09c29b add hpp to address express vulnerability 2015-06-04 19:30:27 -07:00
Berkeley Martinez 208f4ea18f fix typo in require 2015-06-04 14:32:59 -07:00
Berkeley Martinez 40e8b61fbf Set up datasources properly for production 2015-06-04 14:20:37 -07:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Berkeley Martinez 72fe9c2463 Add cookie secrets to env 2015-06-04 12:42:13 -07:00
Berkeley Martinez 7a2bcc06f7 add passport stuff back
Because Berkeley really needs to wait for his coffee to kick in before
commiting anything...
2015-06-04 12:03:53 -07:00
Berkeley Martinez 66eff31294 Adding passport config stuff 2015-06-04 10:52:12 -07:00
Berkeley Martinez 075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
Berkeley Martinez e349797a4b rename boot utility
remove subrouter use in server.js
2015-06-03 16:56:48 -07:00
Berkeley Martinez 75f9b06e90 fix incorrect model name 2015-06-03 16:48:17 -07:00
Berkeley Martinez 415d46b591 fix add models to model-config 2015-06-03 16:35:22 -07:00
Berkeley Martinez bfd33d8b40 fix use app.use(router) to add sub router 2015-06-03 16:31:42 -07:00
Berkeley Martinez 8165105b29 refactor all boot to export func and use loopback 2015-06-03 16:19:23 -07:00
Berkeley Martinez 65cde59f0d use app instead of server in boot directories 2015-06-03 12:26:11 -07:00
Berkeley Martinez 79cbe13c62 fix seed paths 2015-06-03 12:23:37 -07:00
Berkeley Martinez e7d01424e9 refactor challenge and challengeMap 2015-06-02 19:02:54 -07:00
Berkeley Martinez 956a2b915e initial move to loopback server 2015-06-02 17:27:02 -07:00
Berkeley Martinez 279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00
Quincy Larson f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
2015-06-02 13:44:53 -07:00
Berkeley Martinez 24bca19616 fix order of routes 2015-06-01 17:09:15 -07:00
Berkeley Martinez 7643f1cabe fix FCC running using router syntax 2015-06-01 17:01:54 -07:00
Berkeley Martinez 7bb11e9fbe fix linting errors in server/boot/utilities 2015-06-01 16:48:16 -07:00
Berkeley Martinez d67f7c666d refactor challenge controller to router syntax 2015-06-01 16:45:21 -07:00
Berkeley Martinez 28f0320f18 refactor fieldGuide controller to router 2015-06-01 16:32:54 -07:00
Berkeley Martinez 7c2f171d31 fix all the linting errors in boot 2015-06-01 16:23:53 -07:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00
Sahat Yalkabov 56eb0e4e73 converted all auth functions to use mongoose 2013-11-14 00:15:52 -05:00
Sahat Yalkabov cd1af7e230 moved helper functions to auth.js as well as all passport strategies 2013-11-13 22:11:21 -05:00
Sahat Yalkabov b6e55c1aae Created findOrCreateOauth user function 2013-11-13 19:37:53 -05:00
Sahat Yalkabov 7b86a34a6a Added schema and finduserbyid to the new Users model file 2013-11-13 18:58:03 -05:00
Sahat Yalkabov fc5563c70c added sample app for client-server authentication 2013-11-13 17:16:06 -05:00