Commit Graph

1272 Commits (a3ab32f339614cae5b9e020e3dff216ff546215a)

Author SHA1 Message Date
Nathan Leniz dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +09:00
Mike 380e301a9a Flip windows and mac gitter links 2015-02-22 08:05:32 -07:00
Nathan Leniz ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
Nathan Leniz 3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09:00
Nathan Leniz b5a449cb1c Cross off completed bonfires in list of all bonfires in modal 2015-02-22 17:36:43 +09:00
Nathan Leniz 90caed3369 More UX improvements 2015-02-22 16:46:55 +09:00
Nathan Leniz a197e99b1e Starting bonfires view partial, ajax call works, need to work into view 2015-02-22 16:27:38 +09:00
Nathan Leniz 8a5e3d9a9a Merge branch 'ux-improvements' of https://github.com/freecodecamp/freecodecamp into ux-improvements 2015-02-22 14:58:50 +09:00
Nathan Leniz 89eb361ec3 Merge master 2015-02-22 14:58:45 +09:00
Michael Q Larson 53bbe90290 find a son format that works with d3 2015-02-21 21:45:25 -08:00
Michael Q Larson e0c82156a7 refactor layout.jade to have universal head, and customize together.js 2015-02-21 14:49:24 -08:00
Michael Q Larson e5cfa147fa attempt to use togetherjs 2015-02-21 14:22:46 -08:00
Michael Q Larson 04cd57b919 Revert "add together.js"
This reverts commit a41c37ec03.
2015-02-21 01:53:13 -08:00
Michael Q Larson dfc44651e2 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	app.js
2015-02-21 01:20:17 -08:00
Michael Q Larson a41c37ec03 add together.js 2015-02-21 01:17:54 -08:00
Michael Q Larson 74f6fc6763 continue work trying to get d3 to work 2015-02-20 23:55:19 -08:00
Michael Q Larson 80485a9ad6 one in 100 page loads will show dinosaur in the free code camp graphic 2015-02-20 22:32:39 -08:00
Nathan Leniz 9a8fd73d53 Merge branch 'master' into ramda-fire 2015-02-21 14:47:55 +09:00
Nathan Leniz c852aef1be Ramda upgrade 2015-02-21 11:38:03 +09:00
Michael Q Larson 2e8c6461e6 Start work on D3 cal-heatmap 2015-02-19 17:18:44 -08:00
Michael Q Larson 85f6c6eb4d make both score and picture redirect to portfolio, make chat and forum links redirect universally regardless of completion of challenges, simplify accounts page 2015-02-19 16:33:08 -08:00
Michael Q Larson d93e0fb56a uncomment twitter login - it works again 2015-02-19 13:33:08 -08:00
Michael Q Larson 749954542f refactor learn-to-code view to look more visual and have fewer components 2015-02-18 22:58:10 -08:00
Michael Q Larson 884ff62bcc make the footer look better on desktop with more descript links and make the go to next challenge button the CTA button style and added the difficulty label to the flames in bonfire 2015-02-18 21:20:44 -08:00
Michael Q Larson 9d60f9e0c5 add Angelica to counselors 2015-02-18 17:30:29 -08:00
Michael Q Larson c766ad3766 remove twitter login option until we can fix it 2015-02-18 13:18:53 -08:00
Michael Q Larson 4ef8e7eda4 reverse the attempts to allow cross site scripts and just use relative paths for now 2015-02-17 15:35:16 -08:00
Michael Q Larson 09e9dcefe0 attempt to configure mimetype for ajax calls 2015-02-17 14:52:46 -08:00
Michael Q Larson ca9658bf16 update API routes 2015-02-17 14:14:25 -08:00
Michael Q Larson 0d3ee3c2b4 add screen hero installation view 2015-02-17 14:10:15 -08:00
Michael Q Larson 449589827c add ajax for github calls 2015-02-17 13:31:59 -08:00
Michael Q Larson bc57bbdc37 add trello ajax partial 2015-02-17 13:06:46 -08:00
Michael Q Larson 8e209d6bca start refactoring the learn-to-code view to use ajax 2015-02-16 23:35:02 -08:00
Michael Q Larson 44ea0039f6 fix a button link issue 2015-02-16 18:31:40 -08:00
Michael Q Larson d279ac6d1b add announcements and make the github api calls more robust 2015-02-16 17:48:42 -08:00
Michael Q Larson 762ee8aa26 fix about view to render data from github 2015-02-16 01:21:40 -08:00
Michael Q Larson 9dd1558f1c update the about page and make it the root 2015-02-15 23:59:03 -08:00
Nathan Leniz 92136dcd1f Fixing dependency injection for account view as well as defining a challengeName to suppress errors 2015-02-14 22:52:44 -05:00
Nathan Leniz e3c9e42fce showJS view now shows errors in a pretty format (kinda) 2015-02-14 18:43:45 -05:00
Nathan Leniz 9ac19023d9 Show tests on html view 2015-02-14 18:31:32 -05:00
Nathan Leniz 693b8fbb33 Forward progress, need to resolve script loading timing 2015-02-14 17:28:07 -05:00
Michael Q Larson fb971ab080 start adding test output to coursewares 2015-02-14 14:09:26 -08:00
Michael Q Larson 255d2654ea fix an indentation issue in showHTML 2015-02-14 12:52:04 -08:00
Michael Q Larson a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz efa4b2d9bc Factor all challenges button out of showvideo 2015-02-13 21:07:56 -05:00
Nathan Leniz b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Nathan Leniz 0eededde36 merge master into coderbye 2015-02-13 16:56:09 -05:00
Michael Q Larson bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08:00
Nathan Leniz a0427b3e18 Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function 2015-02-13 12:14:12 -05:00
Nathan Leniz 995ca3d376 Refactor moment scripts to only be included in live-pair-programming view instead of being required in layout-wide 2015-02-13 00:24:57 -05:00
Jason Rueckert 54b5870fc9 Merge pull request #91 from phlacin/automaticDating-livepair
Added Moment.js library and time logic to next Live session
2015-02-12 20:44:27 -08:00
phlacin 2d447f0bb0 added automatic time logic to live-pair-programming page 2015-02-12 20:31:11 -08:00
Michael Q Larson f8f0c3454a subtle completed challenge button for courseware and add completionMessage to coursewares 2015-02-12 16:48:35 -08:00
Michael Q Larson 23a0c33c81 add screen reader only copy 2015-02-11 22:31:57 -08:00
Michael Q Larson 5f4fe74b16 attempt to make footer more accessible 2015-02-10 16:26:59 -08:00
Michael Q Larson dd0c202024 Revert "move navbar below content to improve screen reading experience"
This reverts commit b8ef6f3fb2.
2015-02-10 15:24:14 -08:00
Michael Q Larson c07a75e4ba add several more coursewares 2015-02-10 12:46:34 -08:00
Michael Q Larson b8ef6f3fb2 move navbar below content to improve screen reading experience 2015-02-09 11:22:53 -08:00
Nathan Leniz 9808db4f30 Fixing undefined challengeName on info pages 2015-02-08 14:24:42 -05:00
Nathan Leniz 4fa6c9c65d iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code 2015-02-08 01:12:40 -05:00
Michael Q Larson 180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
Michael Q Larson 07c5757538 Code cleanup 2015-02-07 20:43:39 -08:00
Michael Q Larson 4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
Michael Q Larson 319b537e5b add a hotkey for advancing to the next challenge 2015-02-06 15:18:02 -08:00
Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
2015-02-06 14:39:16 -05:00
Nathan Leniz dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
Michael Q Larson 6333f3fa7d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-05 13:56:53 -08:00
Michael Q Larson bccc37f55d add more compliments and remove image validation from the profile image field 2015-02-05 13:56:44 -08:00
Nathan Leniz 51e8cd410e Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-05 10:02:24 -05:00
Nathan Leniz 995ba0b9ed Fixed accessibility issue whereby completion button for bonfires was set to be hidden to screenreaders 2015-02-05 10:01:55 -05:00
Nathan Leniz c22a38972b Cleaning up generator pages 2015-02-04 23:59:05 -05:00
Michael Q Larson 98286e19d1 fix formatting of modals and make them less likely to accidentally wrap the compliment text 2015-02-04 19:00:40 -08:00
Nathan Leniz 7344a74c01 Configuring the modal 2015-02-04 21:35:20 -05:00
Nathan Leniz d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz 9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
Nathan Leniz 70d704d975 Correctly display modal on challenge completion 2015-02-04 20:41:02 -05:00
Nathan Leniz 161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Michael Q Larson 829ace0365 fix a strange edge case on public portfolio pages 2015-02-04 16:42:54 -08:00
Michael Q Larson 1f36c26264 minor changes to landing page 2015-02-04 16:11:48 -08:00
Michael Q Larson 62abc4b3ee update nonprofit project text and add footer back into landing page 2015-02-04 15:26:13 -08:00
Michael Q Larson f2ad94d7c6 add h1 text to bonfire, challenge and account views 2015-02-04 13:04:51 -08:00
Michael Q Larson 62bd350a29 expand landing page copy and update the faq parital 2015-02-04 12:52:19 -08:00
Nathan Leniz e55a85a18c Media queries everywhere to size iframe correctly 2015-02-04 02:29:38 -05:00
Nathan Leniz 3abac70998 Absolute positioning of iphone frame and rendering view 2015-02-04 01:50:14 -05:00
Nathan Leniz c1b995b465 Bonfire Analytics 2015-02-03 18:37:56 -05:00
Michael Q Larson 5ce1eb18db get cdns working in courseware 2015-02-02 23:47:47 -08:00
Michael Q Larson f1000c3189 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	views/layout.jade
2015-02-02 23:32:46 -08:00
Michael Q Larson 6464241b2e fix a bug that was preventing html from rendering in courseware 2015-02-02 23:31:43 -08:00
Nathan Leniz 6c48e1170e Coursewares framework for codemirror, not working 2015-02-03 02:17:36 -05:00
Quincy Larson f7e136e3d3 Merge pull request #70 from FreeCodeCamp/ga-bonfire
Ga bonfire
2015-02-02 23:04:54 -08:00
Nathan Leniz c3926423af Adding analytics to bonfire 2015-02-03 01:57:35 -05:00
Nathan Leniz e1a08d433c Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-03 01:00:24 -05:00
Nathan Leniz 43234825cf Removing needless CDN call, optimizing account view for slow page loads 2015-02-03 01:00:12 -05:00
Nathan Leniz 3f8c0c5c41 Change layout to grab ionicons css framework from local files 2015-02-02 20:53:48 -05:00
Michael Q Larson 36bcc5fea7 update the favicons and add recommended items to public folder 2015-02-02 16:23:24 -08:00
Michael Q Larson 9944f1b685 start adding new favicons and make the seed task run with each push to heroku 2015-02-02 15:27:12 -08:00
Michael Q Larson f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -08:00
Michael Q Larson 0ee291878a remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js 2015-02-01 22:39:59 -08:00
Michael Q Larson afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Michael Q Larson c85c2689e6 add Patrick Ly to our team 2015-02-01 10:25:04 -08:00
Michael Q Larson 258515014a edit profile button if logged in and looking at own profile, and update a CDN 2015-01-31 17:32:43 -08:00
Michael Q Larson 4c8c346a77 Revert "first commit with working iframe pulling data from code editor"
This reverts commit d7d4727c0f.
2015-01-31 16:56:23 -08:00
Michael Q Larson 0a49890517 Merge branch 'master' into angular-images
Conflicts:
	controllers/user.js
	views/account/account.jade
2015-01-31 16:44:56 -08:00
Michael Q Larson d26a4efea4 improve angular validation on images and trim input so trailing whitespace is ignored on save 2015-01-31 16:41:33 -08:00
Michael Q Larson 613f332bb8 add back in twitch chat that was somehow dropped from view (probably my fault) 2015-01-31 00:12:09 -08:00
Michael Q Larson 4d49875b8e Revert "start process of updating youtube videos on live-pair-programming"
This reverts commit 7b0b12d348.
2015-01-31 00:07:05 -08:00
Michael Q Larson a660e832b8 add welcome mailer for email signups and fix an issue with the angular validations 2015-01-31 00:04:35 -08:00
Michael Q Larson 7b0b12d348 start process of updating youtube videos on live-pair-programming 2015-01-30 23:59:21 -08:00
Michael Q Larson e7da57401e fix the icons after an accidental breaking change on completion modals 2015-01-30 17:42:17 -08:00
Michael Q Larson 027d1a61d4 improve size of landing icons 2015-01-30 14:01:54 -08:00
Michael Q Larson 3b8b195110 update the angular CDN and remove the optimizely cdn which was hanging. Improve angular notifications on email signup page 2015-01-30 13:43:41 -08:00
Michael Q Larson d8d117f52f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-30 13:16:11 -08:00
Michael Q Larson 380a7ce8c9 add ng-cloak to our ng-show alert messages to prevent them from showing while the page is loading 2015-01-30 12:06:21 -08:00
Michael Q Larson e82b45e34c make the account page purely settings and make the photo redirect to the user public profile 2015-01-29 22:01:27 -08:00
Michael Q Larson d7d4727c0f first commit with working iframe pulling data from code editor 2015-01-29 17:01:50 -08:00
Michael Q Larson 0210c19309 add Kamal to counselors and update the about page to include our twitter feed instead of old embedded tweets. Also add @rybar\'s new landing icons 2015-01-29 11:38:07 -08:00
Michael Q Larson 74acf75c0c left align font on bonfire challenges 2015-01-28 21:14:26 -08:00
Michael Q Larson 2f59dd5e5b improve the tweet button functionality for both bonfire and challenges 2015-01-28 21:00:14 -08:00
Michael Q Larson 7aed4c152c Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-27 22:32:00 -08:00
Michael Q Larson e9efc039ec Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	views/resources/live-pair-programming.jade
2015-01-27 22:23:58 -08:00
Nathan Leniz 40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Michael Q Larson 3b0c082b56 update live-pair-programming page
;
2015-01-27 17:17:21 -08:00
Nathan Leniz 3844542651 Refactor routing, minor display tweaks 2015-01-27 20:12:51 -05:00
Michael Q Larson 547b9757b1 set wide layout background to white 2015-01-27 15:05:51 -08:00
Nathan Leniz 504838083e Fixed display issue of difficulty iconography 2015-01-27 03:31:59 -05:00
Nathan Leniz 2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson f8343d4c13 full layout now works. refactor files and routes to have more conventional names and redirects where necessary 2015-01-26 11:38:19 -08:00
Michael Q Larson 48e535b9c5 now have both full width layout and normal layout 2015-01-26 11:02:22 -08:00
Nathan Leniz ead9fe56d1 Fixed bonfire to allow users to enter contractions 2015-01-26 12:30:04 -05:00
Michael Q Larson c20aa1697c generator now publishes directly to a view where you can interact with your new bonfire 2015-01-25 23:10:05 -08:00
Michael Q Larson 3f6ee44248 add the first new bonfire and resequence bonfire form slightly 2015-01-25 21:16:44 -08:00
Nathan Leniz 26c041826b Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more 2015-01-25 23:56:04 -05:00
Michael Q Larson 413d89cf18 minor improvements to the navbar and layout in general 2015-01-25 14:05:56 -08:00
Nathan Leniz 00dfdb2e1e More layout improvements, adding in contextual icons for test success/failure and styling font of test output 2015-01-25 15:22:21 -05:00
Michael Q Larson 17312f43f5 moved components to correct sides of the view and cleaned up pair name entry 2015-01-25 09:41:07 -08:00
Michael Q Larson f593ebbbf2 start widescreen refactor 2015-01-25 09:06:30 -08:00
Michael Q Larson 0e63521ee0 refactor verbs, compliments and phrases into resources controller and require them where necessary. Create tutorial bonfire. Clean up existing bonfires. Fix minor ui issues. 2015-01-24 23:03:25 -08:00
Michael Q Larson a2c2388e75 Merge branch 'bonfire' of https://github.com/FreeCodeCamp/freecodecamp into bonfire 2015-01-24 22:29:29 -08:00
Nathan Leniz 3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00
Michael Q Larson 0ba1ecd30a add @freecodecamp to generated tweet messages 2015-01-24 15:40:11 -08:00
Nathan Leniz 7502dc0689 Allowing user to delete attempted username input from bonfire challenges completion modal 2015-01-24 18:33:00 -05:00
Michael Q Larson 65384b2913 add @ sign and autofocus to twitter form 2015-01-24 15:20:48 -08:00
Michael Q Larson 54c3305281 change bonfire path to playground and update links, and also add a should example test to playground 2015-01-24 14:42:34 -08:00
Michael Q Larson c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Michael Q Larson 1b75a6a7b8 only pad navbar rightmost element if not authenticated 2015-01-24 11:31:56 -08:00
Michael Q Larson e115e6da22 Merge branch 'master' into bonfire 2015-01-24 11:29:43 -08:00
Michael Q Larson 34f106387d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-24 11:28:48 -08:00
Nathan Leniz 4128b3b765 Existing username check now working, error box showing and hiding properly, UI tweaks 2015-01-24 12:51:53 -05:00
Nathan Leniz 022b8daddc Adding in existing username checking, NOT WORKING AT THE MOMENT 2015-01-24 04:14:41 -05:00
Nathan Leniz a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05:00
Nathan Leniz 6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Michael Q Larson d690f976f3 update the complete all the challenges flow and copy 2015-01-23 15:13:36 -08:00
Jason Rueckert 37daf55719 Remove extra spaces in word 2015-01-23 07:45:47 -08:00
Michael Q Larson 1f6cb10a32 fix a jquery exercise regression and make jquery exercises run in firefox 2015-01-23 00:30:34 -08:00
Free Code Camp ff05c9fbca Merge pull request #47 from FreeCodeCamp/bonfire-challenge-framework
Bonfire challenge framework
2015-01-23 00:11:37 -08:00
Michael Q Larson 1a9beef081 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	views/resources/live-pair-programming.jade
2015-01-22 16:53:49 -08:00
Michael Q Larson 95f5581d19 improve the live code view 2015-01-22 16:52:43 -08:00
Jason Rueckert 54470e6c46 added past events 2015-01-22 16:00:26 -08:00
Nathan Leniz e0311210e0 Improving bonfire flow, working on seed.js 2015-01-22 18:44:25 -05:00
Michael Q Larson 129000a986 minor refactor of jquery exercises. Still not working in firefox 2015-01-22 13:32:00 -08:00
Nathan Leniz 5881a14de3 Layout improvements to bonfire challenges view 2015-01-22 15:58:41 -05:00
Nathan Leniz 0e9523ab72 More steps towards integrating the bonfire challenge framework. Importing challnge seed, public tests, private tests, entry point and entry point negator 2015-01-22 15:49:16 -05:00
Michael Q Larson 20cc2aa1b7 remove container from live-pair-programming view so more horizontal real-estate for twitch 2015-01-22 11:29:45 -08:00
Nathan Leniz 378277f0e1 More steps towards building the bonfire challenge interface 2015-01-22 13:20:46 -05:00
Nathan Leniz 094b937148 Incremental steps towards building the bonfire challenge views 2015-01-22 11:59:55 -05:00
Nathan Leniz 74291d2299 More bonfire improvements. Removed redundant console statements, improved test scraping, comment scraping included, better reset behavior 2015-01-21 23:54:59 -05:00
Michael Q Larson 3810b4d9ae Merge branch 'master' into bonfire-improvement
Conflicts:
	views/bonfire/bonfire.jade
2015-01-21 15:42:08 -08:00
Michael Q Larson 6202c03d13 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	controllers/bonfire.js
2015-01-21 15:37:14 -08:00
Michael Q Larson 93e15a6d1f get a better info footer icon 2015-01-21 15:36:07 -08:00
Michael Q Larson 9385b666e3 specify that we're using English in the layout file and state the npm and node version in package.json' 2015-01-21 14:29:16 -08:00
Michael Q Larson 14bd902eec Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-21 14:14:52 -08:00
Michael Q Larson e5a407eacd make Mark Howard's SEO changes, make navbar look better, hide footer on landing page, update meta tags' 2015-01-21 14:12:19 -08:00
Nathan e6930c58c4 Merge pull request #41 from iheartkode/master
Added a title to bonfire for seo
2015-01-21 10:22:46 -05:00
jmcshane 03d635c65f Test evaluation complete, need to hook pre-submit 2015-01-20 23:31:36 -05:00
Michael Q Larson da0180e7eb update twitch.tv link 2015-01-20 20:28:01 -08:00
Michael Q Larson 92a8107fcd add twitch to footer and update the live pair programming page 2015-01-20 20:05:23 -08:00
Michael Q Larson 9e3f5eadc6 update live code 2015-01-20 18:17:25 -08:00
Michael Q Larson 38de94138d update live-pair-programming 2015-01-20 18:14:35 -08:00
Nathan Leniz 7e46af3d42 Major refactor of Bonfire.jade to pull out all JS and put into framework.js, resizing font to 14px and setting to Ubuntu Mono, permanently change layout of bonfire.jade to 2 column responsive 2015-01-20 15:21:11 -05:00
Nathan Leniz bfb711166c further improvement of bonfire view 2015-01-20 03:10:24 -05:00
Nathan Leniz bb87cc4bb3 Pre View configurating 2015-01-20 02:19:39 -05:00
Nathan Leniz cc3fa8e5f7 Configurating Console.log 2015-01-20 00:36:14 -05:00
Michael Q Larson 88d353a3ca add new counselors and add legacy route for about path 2015-01-19 10:31:31 -08:00
Michael Q Larson 0dcce67763 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	public/css/main.less
2015-01-18 16:13:23 -08:00
Nathan Leniz 53e5d06147 Improving bonfire and adding testing 2015-01-18 19:10:03 -05:00
Michael Q Larson f6603aadae work with @brndnb to improve usability of completion modals and write client-side jquery to prevent post if user isn't authenticated, which fixes a javascript error we were experiencing on serverside 2015-01-18 13:36:24 -08:00
iheartkode 1c6f95bdca Added a title to bonfire for seo 2015-01-18 08:30:44 -08:00
Michael Q Larson bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -08:00
Michael Q Larson 7722c20877 Merge branch 'twitter-auth' of https://github.com/FreeCodeCamp/freecodecamp into one-column-challenges
Conflicts:
	app.js
2015-01-17 17:46:12 -08:00
Michael Q Larson a9d52c82c0 improve footer and add navbar link to bonfire 2015-01-17 17:30:10 -08:00
Michael Q Larson be2e224f93 Merge branch 'footer' into one-column-challenges
Conflicts:
	public/css/main.less
2015-01-17 17:05:52 -08:00
Michael Q Larson c3a114c45a Simplify challenge view and make bolder modals. Remove duplicate bootstrap.js inclusion that was causing glitches. 2015-01-17 16:36:10 -08:00
Michael Q Larson 0c935623b7 Fix hamburger menu weirdness 2015-01-17 16:09:35 -08:00
webdev c90d062f7b Enables twitter users to immediately log in to FCC without having to reauthorize the app 2015-01-17 17:44:06 -05:00
Michael Q Larson 7727368f34 turned the challenges list into a modal 2015-01-17 14:41:30 -08:00
Michael Q Larson 044f89b8cc add footer 2015-01-17 14:16:29 -08:00
Michael Q Larson 279df2995c change about path to learn-to-code for SEO purposes and remove learn-to-code view and controller action 2015-01-17 11:27:27 -08:00
webdev c39e2672fc Basic bonfire functionality completed 2015-01-16 21:55:01 -05:00
webdev adac5f6352 Work on bonfire and make better .jshintrc files 2015-01-16 18:58:27 -05:00
Michael Q Larson 456f7063de minor copy tweak 2015-01-15 22:59:54 -08:00
Michael Q Larson 08f4383f62 clean up whitespace on the landing page and add new camp counselors to about page 2015-01-15 22:25:04 -08:00
Quincy Larson ffa03e57df Merge pull request #30 from FreeCodeCamp/landing
New, simple landing page based on feedback from @cloudchloe
2015-01-15 21:42:40 -08:00
Michael Q Larson 2493f159dd minor improvements to landing page 2015-01-15 21:39:01 -08:00
Michael Q Larson a3f3463546 add links below youtube videos to get around youtube embed issue 2015-01-15 19:05:31 -08:00
Michael Q Larson a95da3307c update simplified landing page 2015-01-15 19:04:24 -08:00
Michael Q Larson 8d9c0c0605 improve landing page 2015-01-15 17:21:12 -08:00
Michael Q Larson 6c28577dac fix the angular validation Jade that was mangled by my IDE the first time 2015-01-15 15:45:24 -08:00
Michael Q Larson 52ea2f0689 Revert "fix the lack of url validation in the portfolio section"
This reverts commit af63d84a9d.
2015-01-15 15:41:50 -08:00
Michael Q Larson af63d84a9d fix the lack of url validation in the portfolio section 2015-01-15 15:16:35 -08:00
Michael Q Larson ce3210d8dd make link to nonprofit Trello board more explicit in stats partial 2015-01-14 13:28:50 -08:00
Michael Q Larson 13faedc86e Add email functionality to done-with-first-100-hours page and refactor nonprofit link to be on same controller in same view folder 2015-01-14 13:28:20 -08:00
Michael Q Larson 89357f3d13 add twitch channel to live pair programming page 2015-01-14 13:26:36 -08:00
Michael Q Larson 16e8ab1f40 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-14 12:04:37 -08:00
Nathan 327f45f664 Update faq.jade
Fix spelling error (perservere to persevere)
2015-01-14 10:35:02 -05:00
Michael Q Larson 19c39f9fee update live pair programming 2015-01-13 18:37:17 -08:00
Michael Q Larson b43e4094fe change live code video 2015-01-13 18:26:30 -08:00
Michael Q Larson da9d2bd6d3 live code 2015-01-13 18:13:56 -08:00
Michael Q Larson 42f7d3875c update live coding page 2015-01-13 17:26:16 -08:00
Michael Q Larson 9d3cf9f13f finish angularizing forms 2015-01-13 14:43:57 -08:00
Michael Q Larson d328842bda only partially working 2015-01-13 12:50:00 -08:00
Michael Q Larson 8fa5f6b094 fix contact form 2015-01-13 12:08:46 -08:00
Michael Q Larson b858fdbe6a update link for live pair programming 2015-01-13 10:31:16 -08:00
Free Code Camp f55b341380 Merge pull request #21 from brndnb/patch-2
Edit wording of jquery exercises
2015-01-12 22:12:42 -08:00
Michael Q Larson 26c3f265ad update the reset password functionality and make the password reset form consistent with other such forms 2015-01-12 22:02:33 -08:00
Michael Q Larson 3afd05ad85 Merge branch 'passreset' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-12 21:36:38 -08:00
terakilobyte 5765c18def Re-enabling password reset for email signups 2015-01-13 00:35:11 -05:00
Michael Q Larson 4bdc3d34ad Add blogger API to FCC and list 5 most recent blog posts on about page 2015-01-12 21:28:58 -08:00
Michael Q Larson a29408bacb fix Jade typo in portfolio pages 2015-01-12 19:12:17 -08:00
Michael Q Larson b8f8a3bc9f fix link to public profile from account page 2015-01-12 11:35:17 -08:00
Branden Byers d2ef354f60 Edit wording of jquery exercises
Removed 'the' from some of the questions for consistency. The rule applied: either use "the <target> element" or only "<target>" when not following with "element." Alternatively, instead of removing "the," you could instead add "element" to the end of each reference to a target. But as it was, the wording was inconsistent.

Also removed extra "from."
2015-01-12 13:29:41 -06:00
Michael Q Larson 9d8f6e3623 make social links in portfolio open in new tab 2015-01-12 10:36:19 -08:00
Michael Q Larson fc00ef3f29 restyle portfolio and make all portfolio paths off of root and hide angular form until loaded 2015-01-11 22:19:56 -08:00
Michael Q Larson ca1f9068b8 still tweaking linting 2015-01-11 00:07:41 -08:00
Michael Q Larson d8929ac72d make bonfire view consistent with other challenge views and make codemirror height larger and result code mirror pane read only with no cursor 2015-01-10 22:59:24 -08:00
terakilobyte 27da93f5c2 Smoke rises 2015-01-11 00:45:22 -05:00
terakilobyte 785ed3916c The smoke rises 2015-01-10 15:21:03 -05:00
terakilobyte 3f18d22df7 Trying the form the the correct express route 2015-01-10 00:19:58 -05:00
terakilobyte acd41de952 Fixed display issues with forgot password view 2015-01-10 00:05:42 -05:00
Michael Q Larson 114f6598b9 finish up angularizing forms 2015-01-09 20:30:29 -08:00
Michael Q Larson e1ed00419f fix uniqueness and ability to detect original value 2015-01-09 20:03:24 -08:00
terakilobyte c90c61720e Tidying up 2015-01-09 22:07:20 -05:00
terakilobyte b4395e2b59 Cleaning up, enforcing username constraints to match profile page settings. Added uniqueness to profile username. 2015-01-09 22:05:45 -05:00
terakilobyte 11bc776ffb Email signup for angularized, user.js controller modified so that username can be stored upon signup 2015-01-09 21:33:50 -05:00
Michael Q Larson 02eb3b5914 committing what I have for Nathan to continue 2015-01-09 18:09:49 -08:00
Michael Q Larson 3e7da5ae98 start angularizing sign up form 2015-01-09 17:52:19 -08:00
Michael Q Larson 4e91e94463 fix firefox CDN issue and ensure twitter handle, email and username are lowercase 2015-01-09 15:10:34 -08:00
Michael Q Larson 372610e992 github auth still not working properly so pulling it again 2015-01-09 14:07:38 -08:00
Michael Q Larson d533e07edd debug auth in production 2015-01-09 14:02:21 -08:00
Free Code Camp a272d6fd4f Merge pull request #10 from brndnb/patch-1
Update Branden's Team Member Bio
2015-01-09 10:58:45 -08:00
Michael Q Larson f23aaa6277 fix the font awesome-specific buttons 2015-01-09 08:47:49 -08:00
Michael Q Larson 5fc6fb6e49 fix broken image resulting from change in ionic icons 2015-01-09 08:33:01 -08:00
Michael Q Larson 201df19afe fix login page button regression 2015-01-09 08:28:46 -08:00
Branden Byers 36380c5a67 Update Branden's Team Member Bio
I know I entered massage therapist as most recent job on the initial form,
but that was two years ago. Plus, afterwards, I realized that writing a book for
a publisher counts as most recent job (I forget about freelance stuff sometimes)!
Also removed part about Hypercard because I figure most code campers
won't know what I was referring to.
2015-01-09 09:54:50 -06:00
Michael Q Larson a23a79d8c6 hide public profile button if no username 2015-01-09 07:53:29 -08:00
Michael Q Larson f8e9fd5d95 fix image ratio note 2015-01-08 23:39:02 -08:00
Michael Q Larson 8c9a533758 fix a couple minor issues with the user controller serving the public profile views 2015-01-08 23:33:17 -08:00
Michael Q Larson 0ce9f103f0 improve look of profile page 2015-01-08 23:27:14 -08:00
Michael Q Larson 9ab523d3f3 Merge branch 'master' into profiles 2015-01-08 22:33:17 -08:00
Michael Q Larson 063f1f3bb2 finish initial public profiles 2015-01-08 22:31:15 -08:00
Michael Q Larson bfe75a180d improve the profile layout and start building the public profile view 2015-01-08 18:39:16 -08:00
Michael Q Larson 0ec2e0a759 finished validation on the form fields 2015-01-08 14:56:44 -08:00
Michael Q Larson f9337c57ea update profile edit view 2015-01-07 16:10:40 -08:00
Michael Q Larson 2240381a06 update Michael's description' 2015-01-07 13:30:27 -08:00
terakilobyte 22ed592134 Finishing up profile 2015-01-07 16:23:25 -05:00
Michael Q Larson 74b9965627 update pair programming page 2015-01-07 11:55:14 -08:00
Michael Q Larson 3f83f56acc simplify stats page to reduce queries 2015-01-07 10:50:48 -08:00
Michael Q Larson 91638ade81 update about page and move stats into partial that is also displayed on about page. Fix Trello API issue on stats page 2015-01-06 23:08:54 -08:00
Michael Q Larson 574cb3d957 update live-pair-programming.jade 2015-01-06 16:25:55 -08:00
Michael Q Larson 9350fff6d5 minor fix to challenges and jquery-exercises answer 2015-01-06 12:01:52 -08:00
terakilobyte 7e34ea340d More angular validation 2015-01-06 10:28:57 -05:00
terakilobyte 3490ff197d Finish proof of concept of angular forms, added validation 2015-01-06 02:27:08 -05:00
terakilobyte 9c26fbec2d Angular validation 2015-01-06 01:09:17 -05:00
terakilobyte 41a1bc37c3 Hooking up Angular to Profile.jade 2015-01-06 00:52:30 -05:00
Michael Q Larson be22449d25 continue work on angular form 2015-01-05 20:09:23 -08:00
Michael Q Larson 7a47df4e74 start using angular on form 2015-01-05 19:01:58 -08:00
Michael Q Larson 41abdae46f further progress on the form and add angular inline 2015-01-05 17:29:37 -08:00
Michael Q Larson db9622a2e5 public profile accessible and start updating form 2015-01-05 16:38:56 -08:00
Michael Q Larson ba037abe53 remove github again because it was immediately buggy in production 2015-01-04 12:29:21 -08:00
Michael Q Larson f243367774 Remove noisy logs, add new camp counselors and add github auth back in 2015-01-04 12:26:45 -08:00
Michael Q Larson ba800ee54b Fix spacing between elements on landing page and interior - specificially alter the top padding on the body globally 2015-01-04 12:18:55 -08:00
Michael Q Larson 62e07db09a fix a typo in the challenges, add a note about the navigation links to the chat room and forchallenges, and revert the jumbotrons to falling after the navbar instead of being tucked under it - @rybar recommended this but it really bugs me. We can discuss further later 2015-01-01 23:45:39 -08:00
Michael Q Larson ee54333e43 remove github auth for now because it's buggy 2015-01-01 13:43:26 -08:00
Michael Q Larson 2fcc95a9ee fix challenges link when not authenticated 2014-12-31 17:38:36 -08:00
Michael Q Larson 71d4e10a28 add latest live pair video 2014-12-30 23:29:08 -08:00
Michael Q Larson a00070e5c5 fix a strange bug caused by an apparent clash in variables introduced this morning by my menu refactor 2014-12-30 22:03:03 -08:00
Michael Q Larson 1dda38eaaa Update challenges to remove SQL challenges. Make minor improvements to challenges.son 2014-12-30 22:02:19 -08:00
Quincy Larson 8c2832732d Merge pull request #5 from FreeCodeCamp/menu
Updated navbar to have clearer links to internal content and better mobile hamburger usability
2014-12-30 20:48:08 -08:00
Michael Q Larson d70bea506a update the navigation to have publicly available menu items 2014-12-30 20:26:12 -08:00
Michael Q Larson 8a9905becf this works, but does not work until I restart the server for some reason 2014-12-30 16:26:25 -08:00
Michael Q Larson ca75b1323c Fix navbar logic and remove redundant footer links 2014-12-30 14:54:19 -08:00
Michael Q Larson dc9296146e navbar is fully responsive and does not wrap 2014-12-30 13:15:22 -08:00
Michael Q Larson 4ede5662b9 got navbar button looking right 2014-12-30 12:38:45 -08:00
Michael Q Larson c8d2be67c7 navbar looks right and hamburger works 2014-12-30 11:40:37 -08:00
Michael Q Larson cb7ff19564 navbar looks right at full width 2014-12-30 10:45:19 -08:00
Michael Q Larson 3b7c34d442 update live-pair-programming view and whitelist youtube 2014-12-29 22:56:53 -08:00
Michael Q Larson 049e2d0a8e start working on redoing navbar and mobile footer 2014-12-29 22:40:27 -08:00
Michael Q Larson 7042680645 update paths to compressed images and update copy on stats page 2014-12-28 11:37:19 -08:00
Michael Q Larson f4cd3a2475 attempt to add cannonical url 2014-12-27 00:08:36 -08:00
Michael Q Larson db2ad0db21 make github ribbon disappear on mobile 2014-12-27 00:05:26 -08:00
Michael Q Larson d18379e617 move github ribon below navbar 2014-12-26 22:11:09 -08:00
Michael Q Larson 9174525cc9 update video link 2014-12-26 19:16:19 -08:00
Michael Q Larson 74b77ff58c add open source ribon to landing page 2014-12-26 19:06:18 -08:00
Michael Q Larson 3033f079fc make meta tag updates based on Mark Howard recommendations 2014-12-26 18:20:06 -08:00
Michael Q Larson d43d76a3df adjust meta description for twitter 2014-12-26 17:49:56 -08:00
Michael Q Larson a40cd6fcc2 remove redundant meta tag 2014-12-26 13:52:59 -08:00
Michael Q Larson ebc33ccef1 attempt to fix twitter_card 2014-12-26 13:46:14 -08:00
Michael Q Larson 16ec131799 make tweet action open in new tab and add image for twitter card 2014-12-26 12:33:27 -08:00
Michael Q Larson eb29b6e5f4 fix bad link on stats page 2014-12-26 00:13:58 -08:00
Michael Q Larson a5fa27466c Clean up views, remove API controller views, add the gmail-shortcuts, control-shortcuts and deploy-a-website static views. Move all resource controller views to a resources view folder and update routes 2014-12-26 00:05:00 -08:00
Michael Q Larson 986d6020fa add CTA buttons to anonymous challenge completion modal and selectively hide and show elements on the show view 2014-12-24 14:34:52 -08:00
Michael Q Larson b26ff474fd fix profile delete account button 2014-12-24 13:40:42 -08:00
Michael Q Larson d39804053c finished with profile page for now 2014-12-24 00:07:20 -08:00
Michael Q Larson 6906de7146 update jquery exercises 2014-12-23 23:23:37 -08:00
Michael Q Larson fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
Michael Q Larson 3ac4ecdd08 add twitter social functionality 2014-12-23 12:16:23 -08:00
Michael Q Larson a032be6a0b fix finished challenges button 2014-12-23 11:20:31 -08:00
Michael Q Larson ca6652a791 refactor views to remove hardcoded challenge data 2014-12-23 08:22:50 -08:00
Michael Q Larson 3eb09ab637 start reworking challenge views 2014-12-22 21:07:50 -08:00
Michael Q Larson 7a5224b876 reverse change to challenge checkoff 2014-12-22 16:56:09 -08:00
Michael Q Larson dafae0b06c make show views work without authenticated user 2014-12-22 15:42:39 -08:00
Michael Q Larson b7ec61c4c3 probably fix crashing sites 2014-12-22 14:57:07 -08:00
Michael Q Larson ffddd86022 Merge branch 'master' into helmet
Conflicts:
	controllers/resources.js
	package.json
	views/partials/meta.jade
2014-12-22 11:49:51 -08:00
Michael Q Larson c06b8683c9 remove github auth again until I can figure out the issue 2014-12-22 10:22:04 -08:00
Michael Q Larson 14174ee453 conditional logic showing links to forum and chatroom 2014-12-21 17:52:17 -08:00
Michael Q Larson 46f217f548 update navigation to include links to chatroom and forum. 2014-12-21 15:43:07 -08:00
Michael Q Larson 860171d5a5 update meta files and make landing page look better with Retina 2014-12-20 22:15:50 -08:00
Michael Q Larson a7dc7d4c5a minor improvements to hamburger 2014-12-17 23:59:28 -08:00
Michael Q Larson bb64f5f2b5 minor updates to nonprofit page 2014-12-17 10:22:59 -08:00
Michael Q Larson 2c9fe6ea5a update link 2014-12-16 18:36:00 -08:00
Michael Q Larson c302c73ec1 update live-pair 2014-12-16 17:59:57 -08:00
Michael Q Larson 6aac48951e update the challenges.json with more comprehensive CS101 descriptions and add line breaks for long urls and add some additional tweets 2014-12-16 16:38:33 -08:00
Michael Q Larson 5497987506 Merge branch 'master' into challenges
Conflicts:
	app.js
2014-12-16 10:45:59 -08:00
Michael Q Larson 7dc1b2fc9b update profile page 2014-12-16 10:45:00 -08:00
Michael Q Larson 059fe5f39b update to automatically redirect based on highest completed challenge hash value 2014-12-16 10:31:19 -08:00
Michael Q Larson c8944884f1 make some changes to copy 2014-12-15 22:11:13 -08:00
Michael Q Larson 91c829ac19 revise to have both screen hero and team viewer pair programming sections 2014-12-15 21:10:13 -08:00
Michael Q Larson ab1845cd03 update challenge.json 2014-12-15 20:14:31 -08:00
Michael Q Larson 80582b70bd make more updates to challenges and view 2014-12-15 14:17:20 -08:00
Michael Q Larson b4914fa497 small copy update to pair programming page 2014-12-14 22:26:29 -08:00
Michael Q Larson 666953d127 add the livecode and inbox.js routes and stand in text 2014-12-14 22:24:54 -08:00
Michael Q Larson 782218f020 update partials and data 2014-12-14 22:01:57 -08:00
Michael Q Larson 1d56a2572a tweaked challenges 2014-12-14 09:01:37 -08:00
Michael Q Larson c7a5a51c8d Merge branch 'timestamp' into challenges
Conflicts:
	config/passport.js
	public/css/main.less
2014-12-13 21:09:11 -08:00
Michael Q Larson f984d335f8 update landing page to remove gitter 2014-12-12 09:40:57 -08:00
Michael Q Larson d38e31d065 update the chromebook raffle page 2014-12-11 23:07:33 -08:00
Michael Q Larson c72dfb32bd add chromebook promo 2014-12-11 21:24:44 -08:00
Michael Q Larson 5de070aca4 more changes recommended by Ryan 2014-12-11 17:59:01 -08:00
Michael Q Larson 5db002570d update colors per Rybar suggestions 2014-12-11 15:36:46 -08:00
Michael Q Larson 8741dd098a code to verify our website for pintrest 2014-12-11 12:06:00 -08:00
Michael Q Larson e05132842b radically simplify the challenge show view and remove the animation 2014-12-10 22:41:37 -08:00
Michael Q Larson b29ba117a3 increase size of advance buttons on challenge page 2014-12-10 22:26:09 -08:00
Michael Q Larson 21738654e9 start working on integrating helmet plugin 2014-12-10 20:44:33 -08:00
Michael Q Larson d5fa19779b Revert "change font weight on landing page and buttons"
This reverts commit eba969af992288133fe898fbb26212474729273b.
2014-12-10 13:28:38 -08:00
Michael Q Larson 38715b9dfc change font weight on landing page and buttons 2014-12-10 13:11:16 -08:00
Michael Q Larson 3c7a2794a2 update Nathan's bio 2014-12-10 09:09:39 -08:00
Michael Q Larson be8f6a2551 get rid of duplicate tweet 2014-12-09 23:28:21 -08:00
Michael Q Larson 9a00e40de7 update Darryl's image 2014-12-09 23:13:38 -08:00
Michael Q Larson 31e310ed85 add randomization to team 2014-12-09 22:50:10 -08:00
Michael Q Larson 6b7ca4fe70 update landing page with we are Free Code Camp content including masonry for twitter embeds 2014-12-09 22:30:18 -08:00
Michael Q Larson 3cde84bc19 remove animation from landing page 2014-12-08 16:03:21 -08:00
Michael Q Larson 5cee844046 update the landing page by adding a new tweet and resequencing FAQ items 2014-12-07 16:51:29 -08:00
Michael Q Larson d42140d06f update endorsements 2014-12-07 16:38:35 -08:00
Michael Q Larson 719b4e6c5f fix the FCC email login process 2014-12-07 16:25:43 -08:00
Michael Q Larson a8d6df3e48 update CTA 2014-12-07 02:35:05 -08:00
Michael Q Larson bedddde945 make the profile page look better 2014-12-05 23:10:02 -08:00
Michael Q Larson 177dc900cf made parallel 'points' infrastructure 2014-12-05 20:44:42 -08:00
Michael Q Larson 5fb1cbf217 update usability 2014-12-05 11:58:39 -08:00
Michael Q Larson 704b4e52a3 Revert "update the landing page and add the firelane easter egg"
This reverts commit 06c4ec540cf77b5d7b693a0725c37a90ca4f0fb0.
2014-12-05 11:49:21 -08:00
Michael Q Larson 0a627695e4 Revert "remove redundant title tag from layout and add meta data to firelane"
This reverts commit 8234665c17e3815fe331009b376abf744a569601.
2014-12-05 11:49:07 -08:00
Michael Q Larson 490a9a3c6e remove redundant title tag from layout and add meta data to firelane 2014-12-05 10:35:59 -08:00
Michael Q Larson 4a0c724711 update the landing page and add the firelane easter egg 2014-12-05 10:31:04 -08:00
Michael Q Larson 91dd9c6c18 update button css 2014-12-04 23:44:13 -08:00
Michael Q Larson 9b4d226aa5 remove github auth again 2014-12-04 14:47:44 -08:00
Michael Q Larson 353cae7b92 add optimizely 2014-12-04 14:19:26 -08:00
Michael Q Larson 07ba7e4fcb continue work on challengeshash 2014-12-04 12:06:17 -08:00
Michael Q Larson 5c54fddaec Merge branch 'master' into timestamp
Conflicts:
	views/partials/challenges.jade
2014-12-03 23:31:36 -08:00
Michael Q Larson 29610c425e fix spelling error 2014-12-02 07:53:55 -08:00
Michael Q Larson abcf15074b remove email regex check and restrictions and username for now 2014-12-01 20:49:08 -08:00
Michael Q Larson eea683f7e3 add github back in for testing 2014-12-01 20:26:31 -08:00
Michael Q Larson ff1758677e fix typo on privacy page 2014-12-01 18:36:43 -08:00
Michael Q Larson e6e00a28e9 fix jquery exercises bug 2014-12-01 18:24:13 -08:00
Michael Q Larson dc77df06e3 update answers on jquery exercises 2014-12-01 17:31:42 -08:00
Michael Q Larson 7eadc3b3f0 comment out github until I can get it to work 2014-12-01 13:39:53 -08:00
Michael Q Larson 616033c72f update landing copy 2014-11-30 23:25:02 -08:00
Michael Q Larson 1f57610208 remove redundant chat box 2014-11-30 22:41:02 -08:00
Michael Q Larson a7cb25a3ae add chatroom to landing page kind of happy ending 2014-11-30 21:43:45 -08:00
Michael Q Larson a94e411240 fix privacy link 2014-11-30 20:47:10 -08:00
Michael Q Larson 78ff9612f2 update text size in faq 2014-11-30 20:30:45 -08:00
Michael Q Larson 4ac97bef4d remove scroll lock logic from view 2014-11-30 19:09:08 -08:00
Michael Q Larson c57c90f288 remove gitter for now 2014-11-30 19:07:36 -08:00
Michael Q Larson 73deffd707 improve landing page with Mark Howard 2014-11-30 19:05:06 -08:00
Michael Q Larson ec5fea2eaa start writing validations 2014-11-30 15:25:00 -08:00
Michael Q Larson 1accb225c6 update login view 2014-11-30 15:23:12 -08:00
Michael Q Larson abeebb9991 may have fixed email forms 2014-11-30 00:10:21 -08:00
Michael Q Larson 6a0b6bb315 improve layout of login page 2014-11-29 23:52:30 -08:00
Michael Q Larson 1be9cf03da add facebook back in and attempt to fix the google auth 2014-11-29 23:40:17 -08:00
Michael Q Larson 3fb11302d4 add privacy 2014-11-29 23:01:49 -08:00
Michael Q Larson 21370b83a5 start adding omniauth functionality back in and debugging in production 2014-11-29 22:22:27 -08:00
Michael Q Larson ba0380bfd9 got app to actually run 2014-11-29 21:46:40 -08:00
Michael Q Larson 00c92176cb update the hackathon starter base app 2014-11-29 21:32:59 -08:00