Squashed 'scripts/' changes from f70ba1a..258a95e

258a95e Fix syntax error
811c068 Add process and call checks
26cade1 Remove trailing slash
d70186f Fix the dashes for unicode
ce03ca9 Print list of args
2abf2c5 Add * around the commit message
3df6fc7 Change git ci steps to push
7dd57d8 Change subtree commands
af13a1e Add git ci script
REVERT: f70ba1a Merge commit '6fc8355dfcaff718f4d4da00225fc7e81f02a6c8'
REVERT: 6fc8355 Squashed 'scripts/' changes from f8f5f23..1b0af21
REVERT: 1b0af21 Merge commit '3932270c78d6e684f46ac26cb9207ee2b312070c'
REVERT: 393ede3 Merge branch 'master' of github.com:teamleada/scripts; branch 'master' of github.com:teamleada/teamleada.com
REVERT: 84cf6f8 Merge branch 'master' of github.com:teamleada/scripts
REVERT: 63ff0fa Add content to scripts temp file
REVERT: b5f494e Merge branch 'master' of github.com:teamleada/scripts
REVERT: 46bc4be Subtree 'primary' merged into teamleada.com master
REVERT: 80176c0 Removing primary for now
REVERT: bab2e7a Subtree 'scripts' merged into teamleada.com master
REVERT: 105d583 Remove scripts directory temporarily
REVERT: 52bb11e Add 'app/assets/stylesheets/primary/' from commit '3771981c74727530f6a02cb41343c013be04946c'
REVERT: e895860 Merge commit 'a4c05edd323da373457e9f9e00849c0c8dc1bb6d'
REVERT: 17bbeda Merge commit '683d39b04949981c55629d6e1344246a94df638b'
REVERT: 3771981 Add normalize.scss
REVERT: 1bfdfad Add gitignore
REVERT: 1b0ca4a Add readme
REVERT: dc5475f forgot to add header to time
REVERT: 9d6a243 Fix bug because confirmed_at is nil if unconfirmed
REVERT: 62d8b32 adding timestamp for 'Newest' table
REVERT: 192f5c2 Cardify the company dashboard
REVERT: 84494bb Merge pull request #750 from teamleada/mark-company-feed-design
REVERT: 4b25c80 Display profile photos and notes section for company user cards
REVERT: de6f7a5 Add helper methods to the story classes
REVERT: a924d7f Add story feed item and stories partial
REVERT: 89e8a96 Add story partials to the dashboard for companies
REVERT: e70cee4 Add partial for the story_feed_item
REVERT: 28c9c82 Merge branch 'master' of https://github.com/teamleada/teamleada.com
REVERT: 413ba4b Merge pull request #746 from teamleada/mark-color-change
REVERT: 183bf02 Cardify the admin dashboard
REVERT: 0658be9 Cardify the user projects feedback page
REVERT: 7a6b2ec More styling of the user projects page
REVERT: 9166a95 Move the linkedin integration to the correct spot
REVERT: 06b460d Cardify the user page
REVERT: 142aff3 Make the slide backround white again
REVERT: 29b1d70 Cardify the project show page
REVERT: 47b716d Make the modal viewable again
REVERT: 1b1ff8e Nothing is more than this z-index
REVERT: 909b8ba Cardify the sign in and sign up pages
REVERT: 99b33e0 Cardify the about page
REVERT: d84f27b Forgot a card on the projects page
REVERT: d3ed115 Cardify the employer page
REVERT: e4a9f7e Fix navbar padding and cardify the learn page
REVERT: 2b575c3 Cardify the projects page
REVERT: 50f5ae9 Cardify the ask peter page
REVERT: e48663d Cardify the invite page
REVERT: 92e8651 Add padding unless there's a large header
REVERT: 1189a01 Set background color to white
REVERT: 5032703 Merge pull request #745 from teamleada/mark-fixed-header
REVERT: a98d722 Add background color
REVERT: bc5f77d Fix admin link being ever-so-slightly off
REVERT: 4a0dbfa Fixed navbar with border to make it pop more
REVERT: 84baac7 adding ignore for demo users
REVERT: 57e347f Annotate story models
REVERT: 288dc8f Update changelog for v1.0.6
REVERT: f1d2cb9 Merge pull request #744 from teamleada/mark-user-favorite-story
REVERT: 5e9a6d6 Reverse the order of the feed
REVERT: 564cfdf Expand column to take up full width
REVERT: a7d6196 Correctly render time ago in words using helper
REVERT: e88056e Set company before creation of stories
REVERT: ea78422 Show stories on the company dashboard page
REVERT: 75b2475 Add favorite to stories
REVERT: c93404c Add methods to generate story
REVERT: 94d45d4 Add abstract methods and relationships
REVERT: 6e5c991 Add type to stories
REVERT: bbf4d15 Add user stories
REVERT: e803a6d Merge pull request #738 from teamleada/mark-user-favorite-user
REVERT: 4001c8f no longer check for nil proj in user dashboard
REVERT: a98eb3a removing nils from in_progress_projects in user model
REVERT: 32eae99 Merge pull request #743 from teamleada/tristan_fix_shitty_quiz_ui
REVERT: 4fafea6 if proj is nil, don't show it
REVERT: e9a0d91 btn-leada highlights when hovered
REVERT: 356b5dc removing the unsued css for quiz
REVERT: 91330b4 using leada button instead of janky button
REVERT: f2f44b5 derecated shitty view, prettier quiz colors
REVERT: acd566c white background for loading gif, now unused
REVERT: 92e187f using label instead of ghetto coloring
REVERT: ef9b445 reindent quiz css
REVERT: 4d87716 merge master to quiz_fix
REVERT: f4cbd49 Merge pull request #741 from teamleada/tristan_fix_old_seeds_2
REVERT: cbcbc4f some indent change
REVERT: 2065b8d colorizing the intro for flu_trend
REVERT: ad5d527 finished cleaning flu_trend LESSON
REVERT: 4fa9f9b more fixes to the flu_trend lesson
REVERT: 4ff57be fixing LESSON flu_trend up until build section
REVERT: acec95f fixes + colorize flu_trend (LESSON)
REVERT: 04c8ff7 color + brian's grammar
REVERT: 88d847b saving the users after creating them at seed
REVERT: 5fb67a1 removing guang from seed
REVERT: 0634874 Merge pull request #739 from teamleada/tristan_old_proj_ui_update
REVERT: a1d037f Merge branch 'master' into tristan_old_proj_ui_update
REVERT: b5a4f9e forgot comma in mh eval seed
REVERT: eae2abb adding has_submit to statricks
REVERT: 33fb063 adding has_submit for mightyhive
REVERT: 449e81f adding concluding remark for titanic prep
REVERT: 5db7cae why the fuck does titanic prep not have a conclusion slide...
REVERT: 22359ff almost done with cleaning titanic prep
REVERT: 1dc7428 more fix to Brian's titnaic bootcmap + color add
REVERT: 585ea00 breaking down paragraphs in titanic bootcamp
REVERT: 0fe4da1 fixing Brian's early proj + adding color to titanic bootcamp
REVERT: 41246ea typo in r intro
REVERT: 357e7b7 started fixing titanic bootcamp
REVERT: 250c846 Show company favorites on the dashboard
REVERT: 542e327 Add company favorite users
REVERT: 824f448 adding unicorn config link
REVERT: 5f0a06f command to start unicorn
REVERT: a5efa7f Fix line setting for tooltip
REVERT: 7a2a8c7 Add per page for company users
REVERT: 050badb Add tooltips to favorite and unfavorite
REVERT: bf298b7 starting to add unicorn installation
REVERT: 6a67b24 Change per page for browse view to 20
REVERT: 175b913 Use helpers to set favorited
REVERT: b98546e Add sorting to user_interaction
REVERT: 557e4d5 Add ordered_find_by_ids method to help with selecing users in the correct order
REVERT: 78d14c8 Use UserInteraction to tell if a user has favorited
REVERT: efbe2bb Add additional styles for the overall site
REVERT: d386ae3 Add specific styleheet for company section of the site
REVERT: a2b8a70 Favorite and unfavorite js functions
REVERT: 1c4c82e Add unfavoriting as an ability
REVERT: a4680d5 Add unfavorite method
REVERT: 8e0f780 Fix controller for favoriting
REVERT: ecac09c Annotate user interaction
REVERT: 8cd3b57 Remove user interaction spec
REVERT: 76ab05d Create user interactions table
REVERT: 961a814 Remove user favorite user model
REVERT: b6ed77d Drop user favorite user table
REVERT: a0f38b1 Add link to unfavorite users
REVERT: 378951e Give the ability to favorite usrs
REVERT: 5dcee6b Make the route a post
REVERT: 475ea4f Add favorite button to users index page
REVERT: c57e7d0 Add favorite method to users controller
REVERT: d13883d Add relationships between user favorite users and other objects
REVERT: 0f04657 Remove pending specs
REVERT: 648b5c4 Add model for UserFavoriteUser
REVERT: da14b88 Merge pull request #736 from teamleada/mark-navbar-cleanup
REVERT: bdd7b7c Split user header links into a partial
REVERT: e06ce3c Explicitly split up the header links by role
REVERT: b84b992 Split into a partial for the main link
REVERT: 4ae40a9 Add flash message when switching roles
REVERT: e59fed5 Require development and the user to be signed in to change roles
REVERT: 014cd2a Add company file to the seed file
REVERT: 9bdc399 Finish seed file for companies
REVERT: 423d5d7 Add seed file for companies
REVERT: 6958710 Give development mode recruiters a default company
REVERT: de08e3a Fix spacing
REVERT: 88a562d Fix remember me button on mobile. Fix #714
REVERT: 0c5731d Make logo clickable. Fix #733
REVERT: e7eedae Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: e303df2 Make line thinner in the footer
REVERT: c307ce7 finished the anscombe proj fix
REVERT: b85af16 anscombe proj fix, almost at the end
REVERT: 6b46b32 almost done with fixing anscombe color
REVERT: c7861ed anscombe fix up to correct analysis
REVERT: d51364e started fixing anscombe
REVERT: ffc7112 finalized anscombe's prep
REVERT: 68cdd58 split a line and changed color
REVERT: ae0dd3f almost finalized color for anscombe practice
REVERT: f53db2d fixing indents that were'nt auto fixed
REVERT: a4aaddd fixing indent in anscombe quarter prep
REVERT: b608789 colors up to functions in anscombe quarter
REVERT: a0ca70b updating more color for anscombe prep
REVERT: 2599060 adding color anscombe quarter
REVERT: ec7de51 finished adding color to intro to R
REVERT: 5d811ca almost done adding color to r intro
REVERT: d14de0f halfway to fixing intro R and adding color type
REVERT: fa66191 actually switching to alert over label fro _content texts
REVERT: 5537d64 updated error for content, plus testing alert instead of label
REVERT: fe9606c was doing single = instead of ==
REVERT: b821b83 Merge pull request #731 from teamleada/tristan_slide_ui_update
REVERT: a15dc51 adding more text-label type in content_type
REVERT: 165a1d6 Simplify logic for deadline in days
REVERT: dd2d382 Merge pull request #730 from teamleada/mark-footer
REVERT: d65b24a Add more links to the footer
REVERT: 4ee1f88 Add style to the new footer
REVERT: 0ea6e6d Add content to the new footer
REVERT: e6270bf Add comments for debug bar
REVERT: 2258a27 removing the incorrect price tag
REVERT: cd7fc0f refactoring expired? as suggested by Mark
REVERT: d5b8f68 project index shows the duration of the proj
REVERT: b0f1e30 fixing mark's suggestion, removing comment and use find_by
REVERT: 1fd812c adding expired? to project_status model
REVERT: a62e919 Link now says 'View Expired Project' for unfinished expired proj
REVERT: 90d51db if completed, return true for has time remaining
REVERT: aa415ae if proj is complete, don't show countdown
REVERT: 48946bb removing deadline_in_days from the project Helper
REVERT: 68578fb moving helper into main proj model
REVERT: 2c64b11 using the proper helper in index
REVERT: d4b894e Merge pull request #726 from teamleada/tristan_improve_project_deadline
REVERT: 773baf8 fix typo and col
REVERT: 06ccc22 using helper for deadline days
REVERT: d353509 adding helper for deadline in days
REVERT: 80ae024 bolding the deadline in how this works page
REVERT: b70bcc6 adding the label for project deadine
REVERT: dd0c6e6 clarify about
REVERT: 04fc072 test
REVERT: 6305958 Add hash bang at the top
REVERT: cfbe3dc Ignore python cache files
REVERT: 35e378e Add test git up command
REVERT: 164b375 Add init for scripts directory
REVERT: f1ec0d6 More subtree documentation
REVERT: 3e631f6 Add git up.py and make the directory called LEADA
REVERT: 2435a15 Merge commit 'a1717e4cd2a1758301682a6c02b46d8429c57496'
REVERT: 6aa2385 Add basic git up bash script
REVERT: 8030fa6 Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 98581c5 Add scripts subtree to readme
REVERT: a576317 Add 'scripts/' from commit 'f8f5f23516d8341bec243111d5379d925e229cf8'
REVERT: ff086fa Merge pull request #724 from teamleada/mark-deadlines
REVERT: 11e775d Add js to show the countdown
REVERT: ee57627 Load project statuses for lessons and steps
REVERT: 01d5209 Add style for the countdown on project lessons and steps
REVERT: f4ecf2b Save the project status on every show
REVERT: 8e81ad4 Add color helpers for red
REVERT: 29239fe Add date helpers for project_status start and end dates
REVERT: 4d74309 Add giant red x if a user has not finished the project and ran out of time
REVERT: 1ab10ae Restrict users who have run out of time from accessing project lessons and steps
REVERT: 0c41dab Add title to the time remaining section of the project page
REVERT: f94cebe Remove quotes from the endDate
REVERT: ea86d4e Only show deadline if it has one and seed deadlines for challenges
REVERT: d0bc83c Add the countdown to the projects page
REVERT: 4ced06e Add end date to project statuses
REVERT: 8204397 Add js for countdown for projects
REVERT: 855005a Add jquery countdown gem
REVERT: 50b1ef7 Annotate models
REVERT: c1722ef Add deadline to mighty hive evaluation project
REVERT: b2d8325 Add before_create for setting the start_date. Method for end_date
REVERT: b53d225 Remove end date from project statuses
REVERT: 6d006e1 Add start and end date to project users
REVERT: 3ba22f0 Add deadlines to projects
REVERT: f6ad485 Fix home page buttons on mobile
REVERT: b62c890 Disable mail delivery errors on test
REVERT: afe636b Fix database test username
REVERT: 305f4aa Add secret key generator to travis
REVERT: f41a222 Add travis version 1.7.0
REVERT: 1365349 Reorder fog credentials for carrierwave
REVERT: 08a3a23 Add bundle exec to commands. Reorder commands
REVERT: 9a69326 Fix hamburger button css. Fix #722
REVERT: bdefb1a Set rails env at the same time as the db
REVERT: 773211e Set environment variable in the script section
REVERT: 4e26d10 Set the rails env under env section of travis.yml
REVERT: 06974db Add test configuration to travis database.yml
REVERT: 0043865 Fix typo in travis script
REVERT: 08e6dfe Add database.yml for travis
REVERT: 9e5d0c7 Add travis.yml
REVERT: b04ebaf Remove empty spec files
REVERT: 530a37c Remove helper specs
REVERT: 7657b3f Fix padding on the right part of the navbar
REVERT: 80d733d Style the navbar with a line to separate the content
REVERT: 3d17def Separate out first link from the rest
REVERT: 1b31948 Remove active li links
REVERT: be408fd 'Save' is now 'Submit' for code/respnses
REVERT: 78503b4 Update left padding on logo
REVERT: 8827e1b fix margin issue on logo placement
REVERT: 103f18b Add stylesheet to style the logo
REVERT: 6663360 Add logo to the header
REVERT: 017a75e Add logo image
REVERT: 736784c Update changelog for 1.0.5
REVERT: 651f794 Merge pull request #721 from teamleada/mark-mobile-navbar
REVERT: 2dcbd40 Mobile header css
REVERT: 616e787 Add sign in / out buttons
REVERT: de76fc2 Toggle open close modal button
REVERT: 9e9255b Change icon to remove button
REVERT: 8d5a8ef Add js function to toggle mobile header
REVERT: c646f8b Add stylesheets for mobile header
REVERT: 17b45bd Split header into regular and mobile
REVERT: a8f760f Move header links into a partial
REVERT: bc7b249 Remove tutoring link
REVERT: 8d38dcf Add css for the backdrop
REVERT: 3c0c578 Begin the mobile backdrop
REVERT: f645441 Merge pull request #720 from teamleada/mark-mobile
REVERT: a775772 Only have home page animations if the page is not mobile
REVERT: 2b9b631 Fix home page css and js
REVERT: dea9a71 Retab js file
REVERT: 137fdb5 Add mobile css to the home page
REVERT: 791b3b3 Fix home page css (middle buttons)
REVERT: 5f5eb41 Merge pull request #719 from teamleada/mark-no-edit-username
REVERT: f4b9164 Disable field for editing username
REVERT: 4a35b33 Fix flash messages on linkedin callbacks
REVERT: 8aed753 Merge pull request #717 from teamleada/mark-bio-spacing
REVERT: db5aa0a Remove bio from user page
REVERT: 3785615 Merge pull request #716 from teamleada/mark-disable-ask-peter
REVERT: 51a7315 Remove form for ask peter
REVERT: 009f7f1 removing linkedin link, if already integrated
REVERT: dee8dbf disabling omniauth controller from re-linking linkedin accounts
REVERT: ac4962a better flash notice for linkedin integration
REVERT: 5d1855e fixing modal location, and indentation, ordering in user view
REVERT: fdbdcab style fix for omniauth controller
REVERT: 6a0bdaf Merge pull request #713 from teamleada/tristan_linkedin_master_integration
REVERT: 5dab841 User prof has linkedin integration link/button
REVERT: 8fd53be removing debugger
REVERT: 774ad2e helper function to check for linkedin integration
REVERT: d8edc06 linkedin controller updates user if valid user visits the auth path
REVERT: 182bb9e user moddel can update with linkedin now
REVERT: 80dac86 Set button hover to underline as well
REVERT: 3b9496d moving the new project label down a tiny bit
REVERT: dcbb7c7 Merge pull request #708 from teamleada/tristan_remove_tutor
REVERT: 6c2cfe7 commenting out the tutoring link
REVERT: 47c7107 removing the tutoring link, but the file is still there
REVERT: dc9c44e Merge pull request #707 from teamleada/tristan_cleanup_url_name
REVERT: 843c77d changes to rename public prof url
REVERT: b3841cd migration to rename public_prof_url
REVERT: e5036e3 Merge branch 'master' of https://github.com/teamleada/teamleada.com
REVERT: 9803fc2 flu trend should be new
REVERT: a20aac5 Merge pull request #706 from teamleada/tristan_new_badge
REVERT: 2ba2572 adding is new param for seed
REVERT: 4b1051d adding new lable if a proj is new
REVERT: f46e1ff new label css
REVERT: 7434194 schema update
REVERT: d4057e2 migration so we know if a proj is new
REVERT: e53b805 new admin users are given proj access
REVERT: a005648 Merge pull request #703 from teamleada/mark-employer-cards
REVERT: bc8f9e5 Enforce size on profile photos
REVERT: effb082 Basic card view
REVERT: 4feef4d Fix typo in readme
REVERT: 7796e7c Merge pull request #702 from teamleada/brian_flutrends_QA
REVERT: f7f2f38 spelling stuff
REVERT: 63d0122 Merge branch 'master' of https://github.com/teamleada/teamleada.com
REVERT: 422d63c quizzes font fix
REVERT: b2f9a41 Remove really slow queries from dashboard
REVERT: 659d630 Change order of queries for impressions
REVERT: 79ad412 Merge pull request #700 from teamleada/mark-unique-resumes
REVERT: b5fe057 Add chart metric for users with resumes
REVERT: 5af180b Add metric for unique resumes
REVERT: ad132ee Merge pull request #699 from teamleada/mark-pagination-buttons
REVERT: c5facb9 Will paginate for users
REVERT: 5c96bb8 Add bootstrap will paginate
REVERT: 4272a71 Merge pull request #698 from teamleada/mark-project-pageviews
REVERT: 762d44d Add more metrics to the admin dashboard page. Fix #577
REVERT: bd1471c Refactor page view counts and show number of project pageviews. Fix #648
REVERT: 24fe20f Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 52d9af7 Change text for starting a project button. Fix #647
REVERT: ba4399f Merge pull request #695 from teamleada/mark-padding-between-submit
REVERT: 91227fc Add padding between submit button and content. Fix #387
REVERT: da38838 Split up routes into multiple files. Fix #694
REVERT: df2a213 Merge pull request #693 from teamleada/mark-404
REVERT: 57dc975 Fix styling on 404 page
REVERT: f61a319 Change text on 404 page
REVERT: afdb474 Merge pull request #692 from teamleada/mark-chart-for-profile-photos
REVERT: 9799161 Add metric for tracking users with profile photos
REVERT: 87d48df Add chart method for user
REVERT: 9569c90 Change print statement to be more accurate
REVERT: 63f0301 Show total number of users on the admin page
REVERT: e5cc250 Update rails to 4.1.4
REVERT: a030a04 Let admins invite as many people as they want. Fix #526
REVERT: 3ca1928 Actually fix nil error for projects
REVERT: 1c9416e Fix error when recruiter doesn't have a company. Fix #687
REVERT: 13a3038 Merge pull request #688 from teamleada/mark-fix-zoom
REVERT: 17d3420 Use the reveal stylesheet that we imported
REVERT: 09bf1dd Add reveal stylesheet
REVERT: 49cd3ba Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 748376c Annotate user model
REVERT: fbce4e7 Merge pull request #686 from teamleada/mark-admin-view-universities
REVERT: ebe587f Add universities controller for admins
REVERT: 9d735d0 Add university views to admin sidebar
REVERT: e5937e1 Add University routes
REVERT: 7a24ad5 Fix spacing in user model
REVERT: 796b83b Fix remember me on the sign in page. Fix #670
REVERT: c65f64e Add a photo of Peter Norvig
REVERT: 48b9935 Fix plural text on invite page. Fix #610
REVERT: 3649283 Limit leaderboard to 10 people. Fix #574
REVERT: 3fd2b26 Change text in notification for submission. Fix #681
REVERT: 904e7cc Make sure multiple questions aren't seeded. Fix #682
REVERT: b587ec0 Add rakefile for a single metric. Fix #683
REVERT: 70b17ad Readme fixes
REVERT: 904b7e2 adding pkgconfig requirements
REVERT: 4367fb9 Merge pull request #684 from teamleada/tristan_linking_logos
REVERT: 904c490 linking the logos
REVERT: a7397e2 Fix user sign up
REVERT: 2351956 check for nil before asking for empty in user
REVERT: 88214c6 Fix count of hidden and non-hidden questions
REVERT: dabfb42 Changing trend to trends.
REVERT: e2c3155 Add new label to ask peter
REVERT: b942701 Merge pull request #680 from teamleada/brian_ask_peter
REVERT: 94f2be4 teehee
REVERT: cc06607 Add link to ask peter if feature toggle enabled
REVERT: c4dc69f Merge pull request #679 from teamleada/mark-ask-peter-fixes
REVERT: 19b04ce Remove automatic ui update because of page view updates
REVERT: 908557b Fix scoping for questions
REVERT: 7fc1d0a Change width of upvote columnn
REVERT: df52785 Add margin between titles and content
REVERT: 68a2e12 Change width of upvote
REVERT: fa20f4d Switch order of buttons
REVERT: 74f2993 Add posted at time for questions
REVERT: 080410a Change to table style and fix new line
REVERT: 9289fee Full width question/answer and fix typo
REVERT: 01a91eb Fix typos and grammaer in readme
REVERT: 24b26de adding more warning in sidekiq
REVERT: 61e5a17 nginx congis
REVERT: 796099a installing nginx
REVERT: 7bf37d9 Fix validation for users. Fix #659
REVERT: 3296ff0 Merge pull request #669 from teamleada/tristan_new_proj
REVERT: f11f963 clean up the end comments/template flu trend
REVERT: aa7bac8 complete flu trend lesson
REVERT: 245998a renaming methods to be more descriptive
REVERT: 655a6ad quiz controller uses the new model method to check answer
REVERT: cc74c4c quiz module bump with better result comparison
REVERT: a386ba6 validation for quiz seeds
REVERT: 34d1da6 flu trend up to differencing
REVERT: ef7dcb3 highlighting renabled
REVERT: 8ee85fa quizzes comparison done after lower casing
REVERT: 5470c5a Merge branch 'master' into tristan_new_proj
REVERT: 0ea3051 rough medium finale flu trend
REVERT: f685e75 Ljung-Box test added
REVERT: e246e44 near finish last module
REVERT: 4fdb608 Use complete sentences. Fix sidekiq command in readme
REVERT: 07cfa3f near completion of evaluation module
REVERT: 380f408 finished building the model
REVERT: 9b7e12b bad arima parameter selection
REVERT: 5fb3e77 Merge branch 'master' into tristan_new_proj
REVERT: 7d3b21a halfway adding to flu trend final
REVERT: d025ffa adding flu trend images
REVERT: ed26202 daemonize sidekiq
REVERT: 7c02ab0 updating redis directions
REVERT: 4364cf6 Merge branch 'master' into tristan_new_proj
REVERT: ef0fb30 typo in intro R
REVERT: 8a219ff Allow underscores for usernames. Fix #649
REVERT: 8c14f31 Make box look okay for large photos. Fix #578
REVERT: 18a21a9 Remove second resume upload dialog from modal. Fix #650
REVERT: b42bc52 Merge pull request #657 from teamleada/mark-disallow-username-changes
REVERT: ddde5a4 Disallow username changes. Fix #643
REVERT: 94a5d85 Merge pull request #655 from teamleada/tristan_prof_photo_linkedin
REVERT: 6d460b3 using not empty plus fix typo
REVERT: 2710671 spacing fix in linkedin user creation
REVERT: 1c082d8 user model uses the new col as well
REVERT: 2f888a3 renaming the linkedin_prof... tp linkedin_profile
REVERT: 504e626 helper uses the new linkedin profile image url name
REVERT: 77af18a fixing typo and changing prof to profile photo
REVERT: b5d3e13 user now uses linkedin photo as backup
REVERT: 4a3668f renaming the linkedin img col in User
REVERT: 12ae608 renaming image to linkedin_prof_image_url in User
REVERT: 6eb4d69 updating the helper method to use the new image_url in Users
REVERT: bf39fe9 Merge pull request #654 from teamleada/tristan_linkedin_chart
REVERT: d095c76 simplying logic in user.linkedin_before?
REVERT: a2b0017 schema update
REVERT: 187d317 adding the metric helper to user
REVERT: 024e94b saving linkedin time in user helper
REVERT: 4b826c6 fix typo in metrics seed
REVERT: 04fbf64 renaming the lindein updated time column
REVERT: e61c4d7 type datetime in migration
REVERT: 36a0d0d changing date of birth to Date
REVERT: fba56dd user will now keep track of when first linkedin confirmed/updated
REVERT: 68438d3 merge conf in quiz controller
REVERT: 106a1ea Merge branch 'tristan_linkedin_upgrade_2'
REVERT: d11a7b2 db schema change
REVERT: 5cc719c Remove all .keep files
REVERT: b05ca27 Add default ordering for profile photos and filenames
REVERT: 20327b9 Store directly to s3 and process in background
REVERT: db97656 Add default ordering to resumes
REVERT: e06372c Add procfile with background task
REVERT: 26b9ad1 Set correct url for profile photos and resumes
REVERT: e7e781d Add filename back to resumes
REVERT: ebd07f1 Update readme with full backup instructions
REVERT: 137d878 Annotate all models
REVERT: 6af571a Remove delayed jobs
REVERT: a88d2e3 Save original filename for profile photos
REVERT: a0e7dc5 Add original_filename to photos and resumes
REVERT: bd51727 Schema moves linkedin_id down
REVERT: 0b28486 Merge pull request #637 from teamleada/tristan_linkedin_upgrade_2
REVERT: dc36d60 adding back the bookmark count
REVERT: 062d879 renaming skill_name to name
REVERT: a3c8aff veirified is default so no longer re-saving in model helper
REVERT: ed327c1 has_many :users in skills model
REVERT: 925c1ea added default to university and company for verified column
REVERT: 7f5ffe1 adding relations to Jobs
REVERT: 238b203 Add absolute url to docs
REVERT: 267b712 Add link to leada docs
REVERT: 6d3feae Update changelog for 1.0.4
REVERT: 913f16d plural names in user helper + rename create_education_table
REVERT: 778f2e2 removing comment
REVERT: 0c240f1 reupdating the db schemae
REVERT: 342be7d some nil issues, plus saving the updated values
REVERT: 2a2c1df Add a huge profile_photo type
REVERT: 1697efa Add more installation instructions to readme
REVERT: 3e7e9c4 Merge pull request #636 from teamleada/mark-fonts
REVERT: ec36822 Only add the fonts that we're using
REVERT: 5201464 merge db scheme conf
REVERT: 56b6332 Add fonts to the stylesheets
REVERT: 89a41c4 Add fonts
REVERT: 3163c6e Auto load fonts directories
REVERT: 0f99101 Cleanup to remove comments and byebugs
REVERT: 63ca761 making the update static so that it works
REVERT: 6c206fa Merge pull request #635 from teamleada/mark-dev-bar
REVERT: 49c11c0 Merge pull request #634 from teamleada/mark-feature-toggles
REVERT: d81a790 Add spacing to navbar
REVERT: e5f26bb Add error protection if not associated with a company
REVERT: 27f51a6 Add debug bar that allows you to change roles
REVERT: 9389c65 Add change-role endpoint
REVERT: 5d17d37 schame reflects newest linkdein tables
REVERT: c264928 update the update_user path + bug fix
REVERT: adc024d removing '?' in verified, for linkedin tables
REVERT: 4b40bdb In dev, load a debug bar
REVERT: c48e497 Change column for enabled
REVERT: 1a3b7a0 Add views for feature toggles
REVERT: 44fe7ca Add features to admin dashboard and to routes
REVERT: 57606a0 Hide messaging behind a feature toggle
REVERT: 7694a11 Add name to features
REVERT: fac5f44 removing the extra linkedin crap from user model
REVERT: 12a7495 Add feature model
REVERT: b4aedf1 Merge pull request #632 from teamleada/mark-refactor-users
REVERT: e58d768 Move the construction of new objects into the view (bad but okay for now)
REVERT: 671c1f6 Refactor users into a partial that let's admins edit. Fix #537
REVERT: a574fda updating db schema linkedin_id up change
REVERT: 9adfe27 Fix enrollment class name
REVERT: 18c6ad4 User now properly owns job_rec
REVERT: 0a7cd29 migration to change the linkedin_id related cols
REVERT: 11544df Change dashboard profile photo url
REVERT: f104c0c Merge pull request #631 from teamleada/mark-profile-photos-on-carrierwae
REVERT: 7b189e4 Fix temp cache directories for uploaders
REVERT: ae87663 adding skills table
REVERT: 8f63ae4 Add photo to profile_photos
REVERT: 995a56a Add columns for carrierwave to the schema
REVERT: 2b98e25 Add profile photo uploader
REVERT: b52cc2c Store temporary downloads in publci/tmp
REVERT: 9c0ef8f Fix resume url
REVERT: 0055cfa Ignore tmp files
REVERT: f5c3162 adding user_skills table
REVERT: 6088382 adding skill table
REVERT: 2d89b6e finishing extracting job, education, recom, and publication
REVERT: 9665561 adding publication id to publication
REVERT: b1050d4 change recommendation type
REVERT: be6f75d additional colns for education and enrollment
REVERT: 25d7349 Change link to just say view
REVERT: bea4807 Merge pull request #630 from teamleada/mark-background-uploader
REVERT: e3c5787 Add instructions for uploading offline
REVERT: 719ddb0 Add sidekiq initializer and config file
REVERT: 6cf470a Store in background and process in the background
REVERT: e16537d Update gems
REVERT: 99e31d6 Don't require rmagick twice
REVERT: fe45b5f Add resume file processing
REVERT: 68ee3d3 Change carrierwave config to sidekiq
REVERT: 9fbb3a9 Add carrierwave backgrounder
REVERT: af77e26 Merge pull request #628 from teamleada/mark-carrierwave
REVERT: 37681cf Add resume file to resumes
REVERT: f32d093 Add RMagick
REVERT: 79a3c95 Don't delete old resumes
REVERT: b2b554f More carrierwave config
REVERT: 91f0afc Fix spacing on diff
REVERT: 57847cd Add carrierwave config
REVERT: 8c4fd2f updated schema for enrollments
REVERT: de6cabe adding notes and activities to enrollments
REVERT: 6ce84de Add resume uploader
REVERT: fdafd17 Add resume uploader
REVERT: 6bcdfd7 Merge pull request #627 from teamleada/mark-architecture
REVERT: 2c1d64e Fix spacing in gemfile
REVERT: e2cd675 Add fog
REVERT: 1b48cf1 Add sidekiq and redis
REVERT: 3977f04 Add readme with example code_submission finder
REVERT: 4752078 Add code submission finder
REVERT: 7866692 Add changelog
REVERT: f011623 Add vim swp files to gitignore. Fix #617
REVERT: 2c82f6c updating the db schema
REVERT: 4c010ef job eperience has one compay thorugh: :job
REVERT: 73d2b65 company has_many users, through jobs
REVERT: 6478852 UserHelper now extracts jobs etc
REVERT: fd02462 user model refers userhelper's static method (for now)
REVERT: 4fd0649 renaming type col, which is reserved
REVERT: 979ce46 including UsersHelper in user
REVERT: e2a9e4a schema change
REVERT: 46445be user has companies through job experiences
REVERT: b584e8d starting to upgrade the auth function to load the db
REVERT: 71779f0 forgot to add job reference to job_experience
REVERT: 38f820b more data for company model
REVERT: 3e70c26 schema change
REVERT: 57cb9d1 adding publications
REVERT: 02a6511 fixing ownerships in user and universities
REVERT: 88dd6ba renaming education to engollments
REVERT: b3f96c3 updating user model for job recs
REVERT: d17abd2 spec for job rec
REVERT: 10cbc92 adding job recs
REVERT: dc1a505 user has job_eperience through jobs
REVERT: d9c419b updating company to  include verified
REVERT: e3886ba adding education
REVERT: d7fcac3 adding job experience
REVERT: 37992b3 adding/updating job
REVERT: dbc2b76 adding university
REVERT: be695f4 removing old linkedin talbe
REVERT: f5442ac spec files for the new linkedin related models
REVERT: 519c371 linkedin master table plan, init
REVERT: dc5d114 half done migrations for linkedin upgrade
REVERT: 2a289d8 some quiz view update
REVERT: 741a927 Merge pull request #614 from teamleada/mark-user-names
REVERT: f8b4431 Show pretty names for users or email if it doesn't exist. Fix #546
REVERT: 41cdac9 Merge pull request #613 from teamleada/guang_stuff
REVERT: c7943ae Change code_submission link on admin dashboard
REVERT: fa17877 Remove code submission show view
REVERT: 48824b4 Add ruby version and gemset files to gitignore
REVERT: d6a6f5d Merge pull request #612 from teamleada/mark-admin-view-evaluations
REVERT: 965a63f Add project title and table view for the evaluations
REVERT: 640f2af Add pretty created at method
REVERT: 5ef0f91 Change controller name in routes
REVERT: de14e5c View all code submission evaluations
REVERT: 55a7a87 Add code submissions evaluations controller
REVERT: 74a17eb Merge pull request #611 from teamleada/guang_trying_stuff
REVERT: b402d4c Add guang to admin seeds
REVERT: 25de111 Add extra by project tab. Fix #549
REVERT: 3b15048 Add user submission count to project_status
REVERT: 2ce0f0c Add in the extra tab for by project
REVERT: 94ea324 Add view for displaying users by project for their code submissions
REVERT: ea2f4c6 Scope for users who have not completed sign up and scope for users missing name. Fix #608
REVERT: f92bbaa Exclude messages autocomplete from page views. Fix #571
REVERT: 65f5d48 Remove comment and fix scope
REVERT: bd72b4e Merge pull request #609 from teamleada/mark-user-methods
REVERT: 331cf40 Remove self from class method. Logging in via linkedin still works!
REVERT: 6c70f8f Simplify the methods for linked in even more
REVERT: 5273295 Move linked in auth to users_helper
REVERT: 091900e Fix indentation for has_many profile_views for users
REVERT: 7ed3c51 Add alphabetical sorting of users. Fix #603
REVERT: 4054159 Add scopes for with and without project access. Fix #604
REVERT: 0930980 Write migration to give all current users with access, access
REVERT: c8f3a69 Add has_project_access to users for faster access
REVERT: e922488 Fix indentation for user search
REVERT: 493dc15 Add scope for users who have not started any projects
REVERT: 3b67bb6 Add filter method to users. Fix #605
REVERT: c5b2cdc Merge pull request #607 from teamleada/close-gap
REVERT: 864cac0 Close the gap between columns on users show page
REVERT: c75f43c Remove spin and add linked in environment variables
REVERT: 4d47049 Fix missing apostrophe on brian's quote
REVERT: 4d051be Fix spacing on about page
REVERT: 0513a38 Conversation title depends on who is looking at it
REVERT: d4748e2 Add 'other_users' method for conversations
REVERT: 896a2ee Merge pull request #601 from teamleada/mark-convo-titles
REVERT: 3fbc3b4 Conversation titles should show the full name of users when it's just a conversation between the two users
REVERT: 4cbfa2d Merge pull request #600 from teamleada/mark-unread-messages
REVERT: c4bb950 Add 'send new message' and 'see all' buttons
REVERT: b1063ca Highlighted and unread states
REVERT: d48c639 Style for the conversation module
REVERT: e123c73 More style for the messages module
REVERT: 6ed44a1 Style for the new messages module
REVERT: 2faad7e Partial for the messages module
REVERT: 30389db Slight modification to the height
REVERT: 4210431 Add profile photo to top bar
REVERT: f248340 Fix mobile expand button
REVERT: 9295215 Add large header to invites page
REVERT: 3c1386f Add icons for common tasks with tooltips
REVERT: 9f4adae Style the new navbar
REVERT: 1dfb301 Add unread conversations count
REVERT: 412168a Add some after_create hooks to trigger unread notifications
REVERT: a6ad4b7 Cascading destroying of a conversation
REVERT: 5e37067 Add styling for unread indicator
REVERT: 1d6ba65 Merge pull request #594 from teamleada/mark-enable-messaging
REVERT: 436c0a3 Give students and employers an opportunity to post messages
REVERT: ea86e7e Merge pull request #592 from teamleada/tristan_fix_shitty_quiz
REVERT: bbdabfe merging to master
REVERT: 9c783d6 schema merge conf
REVERT: 1cbe25d Merge pull request #591 from teamleada/mark-fix-seeded-users-names
REVERT: 33356e8 Fix seeded users
REVERT: e457b77 Remove another page view migration
REVERT: 9c2d722 Remove page view migrations
REVERT: 7da6261 quiz recording module
REVERT: 010324f quiz results are saved each time
REVERT: cdf99b9 new default spec test for quiz submissions
REVERT: 3dedaf0 users has many quiz_submissions
REVERT: 2b08952 Attempt to add heap analytics back
REVERT: d3908fb adding sanitize to quiz
REVERT: c6aade4 Update schema
REVERT: ee04ad6 Merge pull request #585 from teamleada/tristan_fix_about_white_paragraph
REVERT: abefa05 Minor update to the advisor col position
REVERT: a787ddb moving the about-advisor col to the right
REVERT: c951de0 about-advisor-col now in about.css
REVERT: 1336d54 new classes and spacing about.html
REVERT: 3ac515e moving circes in about.css
REVERT: 170eb32 Merge pull request #584 from teamleada/tristan_linkedin_last_bit
REVERT: f5f3a7b removing all puts and byebugs
REVERT: 9d6cc6d confirmation method update
REVERT: 161f043 adding confirmation checks
REVERT: 231b1c8 dumb typo about linkedin_Uid
REVERT: 4e10d71 updated username is now following the proper format
REVERT: 27e8fb1 fix syntax issue
REVERT: 58d5be6 update and adding temporary username
REVERT: 2d3893e doing save! to check for bug
REVERT: f51dea0 ading debug prints
REVERT: 1c93ac5 saving updated user
REVERT: 2b4dd47 printing uid in linkedin update
REVERT: 2e4ac7c missing ? in LinkedIn Update users in user.rb
REVERT: 6c9efa4 existing users will update with new LinkedIn info
REVERT: 7cf535a print uid for debug
REVERT: aa1686a alotta puts
REVERT: 37e0011 adding one more rescue nil in user.rb
REVERT: 1cf3f24 refactor omniauth controller
REVERT: d1b270b renaming migration
REVERT: f413081 Merge pull request #568 from teamleada/tristan_new_linkedin_auth
REVERT: 19157a2 rescue nils for user creation, also generating new secret token each time
REVERT: bb8ee04 moving migration back to the old time
REVERT: ded3d8a old schema so migration runs
REVERT: 2befca2 updating syntax in view
REVERT: 4270718 last bit of merge bits from fix branch
REVERT: e9902d2 merging fix_branch into new_linkedin_branch
REVERT: f703f36 final clean up for linkedin...
REVERT: 9c1b33e removing last byebugs
REVERT: a0f2d7e schema update to most recent
REVERT: 35928c2 adding a blank line in devise.rb init
REVERT: 89af007 commenting out the old signon link
REVERT: b4293f1 linkedin_confirm needs linkedin_uid instead of the whole auth
REVERT: 6b4e157 Gemfile, adding back in LinkedIn
REVERT: f40cacb intermediate views update
REVERT: d73aedc reverting confirmation controller
REVERT: f8d04cb linkedin_id now
REVERT: 7b5b6f7 new linkedin id
REVERT: e725982 working schema..
REVERT: 124087d Merge branch 'master' into tristan_new_linkedin_auth
REVERT: ff02fa3 removing dup migration
REVERT: 4eabadf removing old schema
REVERT: a0f5afa updated schmae with new loation column
REVERT: 1b0c2ae adding location column again
REVERT: 6c78006 location not showing up anymore
REVERT: 629fcde cleaning up routes comments
REVERT: f59bc52 updating to new syntax in linkedin_confirm.html
REVERT: 90eb98c removing comments
REVERT: 8c9cc6f updating to correct syntax of render action
REVERT: 94440b1 removing comment from omniauth_c
REVERT: d7030ec removing unused before filter from confirmations_controller
REVERT: 8a3040f fixing typoes in anscombe
REVERT: 61fea76 final update to schema
REVERT: 7eed6c0 updating Gemfile afte bundle install
REVERT: c99a2f3 more merge stuff for newest converation code
REVERT: 9b10073 merge confliects in user model and schema
REVERT: d03a38f removing new line in devise init for omniauth
REVERT: d544997 disabling byebugs
REVERT: e97b24c restrict linkedin-confirm view and clean up
REVERT: 5035f5b adding sign-in redirect in app cont for omniauth authentication
REVERT: 7e225dd checks to restrict access to linkdein-confirm view
REVERT: 5af26ef forgot to bundle install and update Gemfile.lock
REVERT: 2ee24ff adding byebug version in Gemfile
REVERT: 190f081 adding in ignore file to ignore dump file
REVERT: ea57af3 removing the unused phone number extraction
REVERT: f2449a5 removing default linkedin signin link, since users/shared_link has it
REVERT: 12b5e36 fixing location extration from linkedin api call
REVERT: 12e22ce migrations for linkedin integration
REVERT: d9587cd user model now creates linkedin user with proper data assignement
REVERT: e27e6fc schema update to include linkedin info
REVERT: 7e97d41 config to ask for additional linkedin info via omniauth
REVERT: cc515d0 Temporarily commenting out heap
REVERT: 438c968 Add required fields per: https://github.com/crowdint/rails3-jquery-autocomplete/issues/210
REVERT: 04cf418 Update jquery to newest version
REVERT: 1446434 Load jquery ui all
REVERT: b20861e Merge pull request #561 from teamleada/mark-conversations
REVERT: ed12e63 Enforce that you can only add a user once to a conversation
REVERT: 96e4fe7 Properly update conversations on message create
REVERT: d80472a Small front-end tweaks
REVERT: 1638db4 Add jquery ui
REVERT: d0bb703 Some before save methods to keep data fresh
REVERT: 22c4e4f More routes
REVERT: fb77e7b Add name to users and add last_message_sent_at to conversations
REVERT: d402a71 Add autocomplete and jquery rails
REVERT: 686b83b Add method for creating conversations
REVERT: 54da81e Fix up routes for creating conversations
REVERT: a181551 Use display title instead of normal conversation title
REVERT: 2be92a0 Add rails 4 autocomplete
REVERT: 38af35d Styling for new messages button
REVERT: ebf1ad9 Add messages controller, you can now reply to messages in conversations
REVERT: 20afb43 schema update
REVERT: 53c5fd7 adding omniauth.linkedin init in devise
REVERT: 44d1f89 moved static connect_to_linked in and changed user creation method
REVERT: bf19e3b adding omniauth call back controller
REVERT: ae0c82d adding linkedin confirms in confirmation_controller
REVERT: 3aa2b85 adding omniauth to the routes
REVERT: 7aa1497 Reply comment box is ready to go
REVERT: 5d6b43a Remove some header links
REVERT: 389bb5c Basic view of conversations table
REVERT: dbb41ff Seed more messages and conversations
REVERT: 4d882d4 Conversation partial with view of conversation for list view
REVERT: 5704d8e Conversation messages are displaying nicely
REVERT: dd6cffc Add show method/view for conversations
REVERT: 720e381 Add routes to match views
REVERT: 7a900f8 Change spin_id to a random number
REVERT: 1eb2d8c Add index and show method to conversations
REVERT: cdbf231 Add more seeds with messages and stuff
REVERT: 6c9375b Add relationships between conversations and users
REVERT: b81bf36 Add conversations view
REVERT: 7d2da36 Add conversations index method and seed file
REVERT: a5183bf Add messages to the header
REVERT: 6e01c89 adding linkedin confirmation view
REVERT: bf3f7e4 Update gems
REVERT: 92cd9ff Add conversations index with routes
REVERT: 9ebb210 Add relationships between conversations, messages, and users
REVERT: cd4fcb7 Add SPIN as an environment variable
REVERT: bb98f10 Obfuscate based on environment variable
REVERT: e42296d Obfuscate message ids
REVERT: 4c2d629 Add conversation id to messages
REVERT: 009b214 Add message model
REVERT: 7738290 Add conversation user model
REVERT: 2f8b42e Add obfuscate id to conversations
REVERT: 134bd58 Install obfuscate_id
REVERT: 7d1138e Add conversation model
REVERT: fda1d73 removing guang again, after seeding
REVERT: 12c19cd adding guang temporarily to the seed
REVERT: 761adba Merge pull request #558 from teamleada/brian_about
REVERT: 7551b7d content edits
REVERT: e370ece bug fix that showed 'Submission' when proj didn't have submission
REVERT: 16031e4 more QA and adding quizzes flu trend
REVERT: 5184a4b QA and adding some quizzes
REVERT: 8700c74 compare quiz answer after lower casing
REVERT: b2c4080 some tabulation fix
REVERT: 714016c flu trend minor fixes near the end
REVERT: ad00561 flu trend very rough finish, missing pieces
REVERT: e79f2eb minor fixes in flu trend arima section
REVERT: a917453 flu trend arima.prediction complete
REVERT: 71038c6 flu trend finish timeseries
REVERT: c0b7473 flu trend timesries.differencing complete
REVERT: 247e37b fixed some bug in flu trend timeseries.setup
REVERT: 9a86e44 flu trend timeseries.setup
REVERT: 5d20da6 flu trend clean up format remove missing data
REVERT: 16b9b4c finished up to TimeSeriesModel in flu trend seed
REVERT: 4e60b67 finishing missing.explore() in flu trend
REVERT: 49a5b2a finishing exploration.plotting() in flu trend
REVERT: 3052cfc finishing exploration.cleaning() in flu trend
REVERT: 8b8e80b updating titanic bootcamp seed
REVERT: 7ed55ea flu trend intro done
REVERT: 2305d66 crime viz is advanced now
REVERT: 80ae836 Merge pull request #555 from teamleada/tristan_fix_proj_index_order
REVERT: 844bead adding byebug Gem
REVERT: ce9a3bb reversing the project order to newest first
REVERT: fb8f9be Merge pull request #554 from teamleada/tristan_new_proj
REVERT: 3962146 finalizing flu trend data
REVERT: 03a44ee adding crime viz coming soon proj
REVERT: 7fa8828 adding flu trend seed
REVERT: 1fecfa8 typo in statricks
REVERT: 68eb7f9 Add admin scope for users and fix query for non-admins
REVERT: e0c8336 Equal to and use OR
REVERT: ad817ea Count not logged in people as non-admins
REVERT: 7241d30 updating schema
REVERT: 5138283 adding linked_in confirm route
REVERT: 8e83436 adding temporary linkedin_confirm to confirmation_contrller
REVERT: e70b016 moniauth controller, not fully working
REVERT: 94792c7 User model connects to linkedin
REVERT: 76a26c8 schema change
REVERT: 33e4eb7 adding byebug
REVERT: 0f5adc8 Merge pull request #543 from teamleada/mark-submissions-main-projects
REVERT: 5c33fbf Link to the particular step or lesson that the submission is on
REVERT: 86cd733 Show submissions on the projects page
REVERT: 2a3ce7d Merge pull request #541 from teamleada/mark-submission-required
REVERT: b44ac5a Add more descriptive error
REVERT: cbb25ca Takes user to correct lesson or step
REVERT: 7599552 Add more users who can run queries about their code submissions
REVERT: 76552af Add methods to user to compute missing code submissions
REVERT: a914b3f Count the number of points including the number of submissions
REVERT: 970c3e7 Show slide id on code submissions view
REVERT: ccb8e0e Fix email template for evaluation feedback
REVERT: 032721f Fixing the missing submission context
REVERT: 7e16c62 Fixing the slide index.
REVERT: 54457bb Merge pull request #539 from teamleada/mark-submission-by-user
REVERT: 7a27815 Add flash info and change wording for mailer
REVERT: 1a2d36e Set evaluations to visible
REVERT: e61a06d Redirect users in the email to code submissions
REVERT: 628183f Add evaluation mailer
REVERT: abd6bbd Add new mailer message template
REVERT: 9122dc4 Add endpoint for sending out feedback
REVERT: 5b86c53 Add visible to code submission evaluations and only show if visible
REVERT: cabe342 Only show projects that can receive feedback
REVERT: 692527f Check if a code submission has more than 0 evaluations
REVERT: bfe5825 Refactor views into nice partials
REVERT: 5cb0bf3 Move logic from code_submission to users controller
REVERT: ad952ac Redo routes for user code submissions
REVERT: f61a5b1 Add code submission route for user per project
REVERT: b9cc963 Add gnarly queries to track project completion and user submission progress
REVERT: d257e58 Visually show the project submission that have been fully completed
REVERT: afd188f Collect all the valid project_statuses
REVERT: 3a68d84 Migrate downloaded database
REVERT: 6f7d8df Add relationships to models
REVERT: bf109c8 Start to show project statuses that are completed
REVERT: adc0ace Add project id to submission contexts
REVERT: dbb6afa Move the code out into the partial
REVERT: 1220503 Add helpers to figure out if a tab is valid
REVERT: 7435678 Add empty views for the tab content
REVERT: 398ed34 Merge pull request #538 from teamleada/brian_mh_edit
REVERT: f471299 added evaluation question clarity
REVERT: ee3658e PROPERLY adding linkedin id migration
REVERT: 10b0dca redoing the ghetto migrate
REVERT: e96966d sketch rename/change migration to add linkedin column
REVERT: c1bca7a changing migration to only add linkedin column: SKETCH, I know
REVERT: 89ccc5f adding omiauth controller
REVERT: a79b661 sign in with linekdin link
REVERT: c4fba54 migration to add user column for linkedin
REVERT: d3a6aad enabling ominiauth in user model
REVERT: c1f0e2f conversation is gone, adding column for LinkedIn in users
REVERT: 8b7d656 adding omniauth linkedin to devise
REVERT: 108343e adding omniauth/omniauth-linkedin Gem
REVERT: 1edab9d Merge pull request #533 from teamleada/mark-users-more-info
REVERT: 40777c0 Allow a user to have a bio
REVERT: 3e469b5 Only add users if the username isn't taken
REVERT: 030eb17 Add location and bio to users. Fix #529 and fix #528
REVERT: 605e525 Add pagination to code submissions index. Fix #527
REVERT: ca23ce3 Merge pull request #532 from teamleada/mark-grading
REVERT: 749b909 Evaluation colors and indicators
REVERT: b795bc2 Add different fields for evaluation. Fix #530
REVERT: 830ac15 Add score fields to evaluations
REVERT: e1f2073 Fix nil submission context. Fix #503
REVERT: d118cda Add comment for non-admin users
REVERT: addb54a Add pageviews for the day
REVERT: b237249 Add user invite acceptance to confirmations controller
REVERT: 738e1cb Backfill week rake task
REVERT: 2c1eefe Add chart and metrics to join table in chart_metrics. Fix #521
REVERT: 22638ad Add db schema
REVERT: 03e3745 Add charts and metrics for invites
REVERT: 7c7da1c Add way to access user invite
REVERT: 3710d18 Show the correct code submission for the feedback page. Fix #524
REVERT: f1ca735 Fix admin view of users showing current_user's percentage
REVERT: fc419f9 Add database backup instructions
REVERT: 4d29098 Don't let admins upload resumes for users and show percentage for @user. Fix #523. Fix #525
REVERT: 147498b Need to add invite before we count
REVERT: 960f54a Add metric for invited users
REVERT: 29b261b Only prompt users if they have project access. Fix #472
REVERT: 2bb060b Show message when you don't have any submissions
REVERT: fd846a3 Change evaluations to feedback
REVERT: 38567bc Use size instead of count for now: https://github.com/Casecommons/pg_search/issues/153
REVERT: 48c63db Show invite button for admins
REVERT: 4eb7e76 Merge pull request #518 from teamleada/mark-show-code-submission-question
REVERT: e97f2fc Show title and description for submission context. Fix #505
REVERT: db6a5f6 Merge pull request #517 from teamleada/tristan_fix_project_page
REVERT: e4ef3fa new class for project's to not overlap ihover
REVERT: 1754a94 udpating project page css to NOT overlap with ihover
REVERT: 3f56cd7 Add backfill yesterday to rakefile
REVERT: 3385892 Don't let companies invite users
REVERT: 4a8f339 Add newest code submissions to dashboard
REVERT: 96faffc Add newest profile photos to dashboard
REVERT: fca08a6 Fix awkward large spacing on admin dashboard
REVERT: e89f712 Merge branch 'master' of https://github.com/teamleada/teamleada.com
REVERT: c45d081 db schema changed
REVERT: d664bb6 Add unconfirm method to users
REVERT: adcd33f Only send one email to user
REVERT: b600a39 Fix invite model method
REVERT: 0dbbff0 Say which email invited you
REVERT: e4725b7 Merge pull request #515 from teamleada/mark-invite-system
REVERT: f412d2b Change text on the invites page
REVERT: 8f5fbe0 Give people access to making invite codes
REVERT: b49514b Edits to invite mailer and invites controller
REVERT: 825c496 more mistakes* in emplyer's page
REVERT: 59f5b20 Add template for invite email
REVERT: d1caf94 stupid typo in employer's app...
REVERT: db5e8a2 Add invite mailer
REVERT: eb50f6e Fix invite creation method
REVERT: c4e8926 Add invites index page to display invites
REVERT: 70afb74 Add route to post to
REVERT: a287239 Add invite methods to users
REVERT: 3448132 Merge pull request #514 from teamleada/tristan_team_page_update
REVERT: f142e1b finalizing the about page
REVERT: 17c8cc7 Add invite link to header
REVERT: 52cd63d Add invites controller
REVERT: 0b26a1b Add invite model
REVERT: 211aa23 Fix default scope
REVERT: 691a12a Remove person_studying image
REVERT: 2a48565 Add valid impression check to application controller
REVERT: abb42cc removing the last bit of about-advisor for Brian
REVERT: af28020 Merge pull request #512 from teamleada/mark-impressionist
REVERT: 6a735c8 Update gems
REVERT: d93ddb1 Add user agent to impressions
REVERT: 2808431 Merge branch 'master' of https://github.com/teamleada/teamleada.com into tristan_team_page_update
REVERT: 790a6e3 updating homepage title to "Practice" from "Learn"
REVERT: 5875748 finalized quote for everyone
REVERT: d6f12c2 adding Mark's quote
REVERT: 565df03 adding link for the adivsors
REVERT: 1543778 update Mark and Prasanna's positions
REVERT: da34d9d adding the physical photo of prasanna
REVERT: cb4a190 finally adding rasanna's pic
REVERT: bf9cfe1 about page view, links to LinkedIn
REVERT: 51801ad changing quote font size
REVERT: 1facaec added Tristna's quote
REVERT: 5ff78d5 added style to about-founders p
REVERT: 0aa36ef added Brian's Quote
REVERT: 70e6102 finalizing hover design, img class to allign :before and :after
REVERT: 2170644 about page css update to allign pictures
REVERT: f5879e8 added a rough advisor's section
REVERT: 9d67762 schema change
REVERT: ae2e8ee loading ihover sheet
REVERT: d974097 adding ihover stylesheet
REVERT: fc880cd added rough founder's section in about
REVERT: 6921dfe Merge pull request #502 from teamleada/mark-profile-photos
REVERT: 3caa2cc Add profile_photos controller
REVERT: 4c8a15e Add profile photo routes
REVERT: e7b8e4c Add view with profile_photo model attributes
REVERT: de21208 Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 7725da6 Move code submissions and resumes into new admin section
REVERT: 2b3187b Merge pull request #501 from teamleada/tristan_add_subission_type
REVERT: 69f83f7 resolving conflict for scheme
REVERT: 1aa897d adding validation in submission_context
REVERT: cee1fe4 new statricks adding submission context type
REVERT: 7906fd9 New MightyHive adding submision context type
REVERT: 0231b08 titanic finalize submission context type add
REVERT: 240528d Merge pull request #500 from teamleada/mark-admin-users
REVERT: 2b2a1a1 Disallow admins from uploading profile images for users
REVERT: c0c7361 Add content to the admin users show view
REVERT: 6dfa637 adding missing ubsmission context in titanic
REVERT: 86391fb Merge pull request #499 from teamleada/mark-email-update
REVERT: 2903b6f adding more submission type
REVERT: e9c5078 Change message you get back as well as showing a message when the change is successful
REVERT: dfd156c Reconfirm users
REVERT: dd2eb14 adding context to titanic submissions
REVERT: 18eab5d adding the migration to add sumission_context
REVERT: 05ae3b8 adding submission_type column to submission_context
REVERT: d3d5966 adding submission_type constant to submission_context
REVERT: a0c6091 Merge pull request #498 from teamleada/mark-update-email-fix
REVERT: 6aa70b9 Fix escaping javascript for user input
REVERT: 3b468a6 Merge pull request #497 from teamleada/mark-fix-code-editor
REVERT: ab23e81 Not sure why the code editor was deleted. Fix #492
REVERT: a3d45f4 Merge pull request #495 from teamleada/mark-hourly-chart
REVERT: 43ac99f Fix hourly chart to start at the right time
REVERT: acca24a Use latest version of forked lazy high charts
REVERT: 0a18253 Use our own fork of lazy high charts
REVERT: ee05c22 Fix hourly chart
REVERT: 3adb67b Remove page view table and all models
REVERT: 7894999 Remove custom logging
REVERT: 4ad1dab Add url to impressions
REVERT: f27c0fa Update impressionist gem
REVERT: be24c14 Use the correct impression model
REVERT: 8484c6a Annotate models
REVERT: 9756005 Update gems
REVERT: 2b62316 Add indicies back to the impressionist model
REVERT: 801684c Add profile views to users
REVERT: 1800fda Add impressionist properties to the db
REVERT: 98cd2de Add impressionist columns
REVERT: 6ce0383 Add impressionist gem
REVERT: e7ad8ec Add hourly chart helper
REVERT: 736f102 Ruby has dates backwards
REVERT: 1b5b3c6 Make print statement accurate
REVERT: 27318c8 Change start date
REVERT: a27185b Log except on user uploading
REVERT: ae8bbfc Add 'how this works' section for projects
REVERT: 361a521 Temporarily disabling page views
REVERT: e50fe85 Merge pull request #486 from teamleada/brian_frontend
REVERT: bc52b9e Merge pull request #485 from teamleada/mark-view-evaluations
REVERT: 0ab1356 Change evaluations to feedback
REVERT: b706a83 Add div around evaluation description
REVERT: 13a44ef Clean up code submission evalautions view
REVERT: 9e372d9 Add view for project_evaluations and fix silly typos
REVERT: 8467e2f Add new routes for users with project evaluations
REVERT: 3eea51e Add project_evaluations links
REVERT: 7da4394 Add projects partial for multiple views
REVERT: 24fc19f Add relationships to projects and code submission evaluations
REVERT: b8efafd Add project to code submission evaluations
REVERT: 24b6199 Show user sidebar on any user controller view
REVERT: 42176cb Add blank views for projects
REVERT: 06a9d22 Give users access to their own projects
REVERT: aae8b87 Edit routes for projects for users
REVERT: 283a123 Add methods to show projects for specific users
REVERT: c2d0dec Add routes that I want to show
REVERT: 4eb8808 Adding editor, teehee ;)
REVERT: 13050d4 Merge pull request #476 from teamleada/tristan_add_statricks
REVERT: 7bd51f4 adding the last submission context, statricks
REVERT: ec613cf statricks bug fix, shit works now..., lesson_id was off
REVERT: d00abd1 Fix route for updating
REVERT: 1c1dd40 Allow updating evaluations
REVERT: 5691d53 Merge pull request #474 from teamleada/mark-evaluations
REVERT: b3e64e6 Add evaluate method
REVERT: 03dc895 Build evaluation form on the code_submissions show view
REVERT: 4dafac0 Use - for routes and add code submission links
REVERT: 29e7c76 Correctly annotate model
REVERT: 59bcd3e Add evaluation id to the right table
REVERT: aade40b Annotate models
REVERT: 725a7da Add relationships between code submissions and evaluations
REVERT: 5b98293 Add id for code_submission
REVERT: 535ea82 Add code submission evaluations
REVERT: 5b39a8a Merge branch 'master' into tristan_add_statricks
REVERT: 004c407 Merge pull request #469 from teamleada/mark-pageviews
REVERT: e38a1e2 Add viewed_user
REVERT: bab6cfc wtf why u no seed
REVERT: aa7d14c Add indicies to page_views
REVERT: 4bc167f Add viewed_user_id
REVERT: 191794c Load page views table
REVERT: f7544e7 Add viewed_user_id to page_views
REVERT: 94bfeae Add one day chart by hour
REVERT: 3342142 statricks now have a 'complete-module' section that actually combines the code
REVERT: 3f18267 Add page views dashboard
REVERT: 431eb64 finalize mightyhive seed
REVERT: ce1ab98 Add pageview tracking
REVERT: e6ca7a2 fixing the slides/video seed in mightyhive
REVERT: 4b4dee2 Add page views
REVERT: d93a76a frontend phrasing changes
REVERT: 96704f3 statricks period nd spacing, plus wording
REVERT: 9f9288a brian phrasing edits
REVERT: c056084 camel be gonne
REVERT: 999e613 fixing explanation for ind-page level info extraction
REVERT: 7c3499d fixing statricks to include generate result links
REVERT: 63728dd statricks better explanation
REVERT: 713e3f2 fixing link margin in reveal
REVERT: b364a24 statricks seed, breaking down long section + periods
REVERT: 2e346e0 breaking the link into a new line
REVERT: cda7704 updating projectOverview_background_content0 content load
REVERT: 61b6bf8 updating typo and sentence to explain right arrow key
REVERT: 61578aa Merge pull request #463 from teamleada/guang_statricks_context
REVERT: 62a0c1f Add submission context to statricks seed
REVERT: e9fed2a Merge pull request #461 from teamleada/tristan_fix_titanic_submission_error
REVERT: 5e66d81 renaming the new titanic submissino file to correct name
REVERT: c0f01cb adding the new submission soln for the new titanic proj
REVERT: 799ddb5 Merge pull request #460 from teamleada/tristan_fix_proj_page_index
REVERT: 98f96a1 updating proj index to render COMING_SOON proj differently (only interest)
REVERT: 7bc4313 updating proj_controller to not load disabled proj
REVERT: 7554e2d enabling the ComingSoon projects
REVERT: 2ffc0c4 Merge pull request #458 from teamleada/tristan_proj_category_and_cleanups
REVERT: 0f874c1 disable old titanic
REVERT: 0eebd9d adding category to old titanic
REVERT: 3acd98a adding category to old mh
REVERT: e0d121e changing mh eval difficulty to advaned
REVERT: 3d6df97 Fix typo in readme
REVERT: 890e926 Actual style fix
REVERT: bef607f Margin fix for company user profile
REVERT: 5376588 User skill graph
REVERT: 175e9a8 Split by category
REVERT: 7fb8193 Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 3163cd4 Fix metric methods
REVERT: be87840 Merge pull request #450 from teamleada/tristan_add_subCont_mh
REVERT: f1c13e2 merging MH final submission slide
REVERT: ee47bcc Add video and presentation
REVERT: 3595e9d Submission Context for Return Code, MH
REVERT: 039f02b Submission Context for Statistical Analysis, MH
REVERT: 044bad2 Merge pull request #448 from teamleada/mark-more-charts
REVERT: 2e518e6 Users not user
REVERT: a185313 Merge pull request #447 from teamleada/brian_projects_push_two
REVERT: 2a5bb06 add presentation lesson
REVERT: 80d1bd1 Fix up method name for code to count users
REVERT: 44eb28a Change text to just submit
REVERT: a572e62 Merge branch 'master' of https://github.com/teamleada/teamleada.com into tristan_add_subCont_mh
REVERT: d4f244f Submission Context for Data Cleaning, MH
REVERT: c932335 fix seed issues
REVERT: 2c77c1e Fix up methods to collect data
REVERT: 0073922 Add collection methods to metrics in seed file
REVERT: 1b6900e Add collection method to metrics
REVERT: ce38b6c added project descriptions
REVERT: 3057625 Submission Context for data matching, MH
REVERT: 1540897 Put data challenges first
REVERT: 61cfccc Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 568ce7f Fix missing commas for seed file
REVERT: 850fbd1 Merge pull request #446 from teamleada/tristan_mh_fix
REVERT: 9accd6c cleaning up spacing mh
REVERT: 166b079 Merge pull request #445 from teamleada/brian_projects_push
REVERT: 663801c adding complete button to new mh
REVERT: cca23de breaking down stat analysis into 3
REVERT: f8d634f added project categories
REVERT: 8f34598 Fix typo for method name
REVERT: a1a473d Add count for users with project access to seed file
REVERT: 0603ad6 Add method to compute the number of users with project access
REVERT: 93821d9 Collapse view should only show the first one expanded
REVERT: feb4d4c breaking down data cleaning into 2
REVERT: 7cd0c47 breaking down data matching into 2
REVERT: d81a47d Merge pull request #442 from teamleada/mark-project-separation
REVERT: 25f28ee Adding sections for projects back to the projects index page
REVERT: e62f40b Add projects partial for showing sections
REVERT: 5938f8c Add categories to projects
REVERT: 60dc8f5 Add category to projects
REVERT: 9603ffc Merge pull request #440 from teamleada/mark-profile-photos-fix
REVERT: a9a96bb Change color of photo icon and text for profile photos
REVERT: 4416468 Remove unnecessary change for profile_photos
REVERT: 6e33465 Fix photo uploading and showing issue
REVERT: c63fd8a Adding Colons in MightHive Eval
REVERT: 565b01b Change resume to file
REVERT: b4506be grammar update in mightyhive
REVERT: c5e62d6 Commenting out the company sponsored cost
REVERT: b63f6fd Merge pull request #413 from teamleada/guang
REVERT: c01edd3 Annotate specs and models
REVERT: 5d1336d add steps
REVERT: 196d931 Move project to partial
REVERT: 0e5c7c9 Show user code submissions per project
REVERT: 9baa61d Add method to show code submissions per project
REVERT: f3627dc Merge pull request #437 from teamleada/mark-ruby-2.1.2
REVERT: 4b63f05 Bundle update to update gems
REVERT: 1ea490b Upgrade to ruby 2.1.2
REVERT: ea78853 Merge pull request #435 from teamleada/brian_mh_edits
REVERT: f816eec more edits
REVERT: 76144cc mh edits
REVERT: b678dc4 Merge pull request #434 from teamleada/tristan_titanic_clarify
REVERT: 21bd1bf clean up titanic plus add final code submission
REVERT: ccf236b updating the work submission to prediction submission
REVERT: 62c61aa Change width of code
REVERT: f7d7a50 Delete submission contexts on seed
REVERT: fe50c78 Fix comma errors in v2 of titanic
REVERT: 2c5db1b Merge pull request #431 from teamleada/guang-submission-context-model
REVERT: 24c7426 Add submission context to titanic project
REVERT: d1a6cfc Merge pull request #429 from teamleada/mark-company-dashboard
REVERT: 6244b38 Merge pull request #430 from teamleada/guang-submission-context-model
REVERT: 53d829d Add submission context to titanic project
REVERT: 940859c Remove username from title
REVERT: 7e17a05 Display code submission and its context on the employee dashboard
REVERT: 3da9f18 Add temporary date for code_submission
REVERT: c50f297 Show submissions on the side
REVERT: 47934ad Show more projects
REVERT: daa4607 Add ability for companies to see users
REVERT: 3479854 Add projects to the user profiles for companies to see
REVERT: b4b7c0d Fix naming of route for user projects
REVERT: 157c043 Add title to submission_contexts. Fix #428
REVERT: a4f3c65 Begin to show project data
REVERT: ba94030 Remove user profile into its own partial and add it to the show page
REVERT: 3dc229d Add project endpoints
REVERT: 32b87f0 Add content to the company user page
REVERT: e7af28b Add styling to the company browse users page
REVERT: 99d1ed6 Add profile photo method to users
REVERT: 31efc98 Merge pull request #427 from teamleada/mark-submission-context
REVERT: 8db8536 Add comment to submission context for slides
REVERT: a0bb9cc Add relationships between slides and their submission contexts
REVERT: 4b20ba6 Add submission context set uid method
REVERT: 4933636 Add submission context model
REVERT: d33f1fb Add company overview for projects
REVERT: 668567f Merge pull request #426 from teamleada/mark-rich-user-profiles
REVERT: e94a7e7 User uploads work
REVERT: b57ef70 Actually add profile photo to attachments
REVERT: a780c6e Front-end for profile photo uploading
REVERT: 5c695e7 User profile photos working
REVERT: 966ce4c User has many profile photos
REVERT: 7fc99a2 Allow uploaded files
REVERT: e20d65f Add profile photo model
REVERT: d886fd6 Add upload photo button, now to make it work
REVERT: 9de93db Hover to upload photo
REVERT: c44a509 Users can indicate if they are looking for a job: Fix #221
REVERT: e669eeb Add looking for opportunities to users
REVERT: 9dd09ed Merge pull request #425 from teamleada/mark-employee-dashboards
REVERT: 9d68349 Add basic show view for company dashboards
REVERT: 66585a5 Add company users controller
REVERT: c52d974 Fix up sass classes and syntax highlighting
REVERT: f2b8f80 Add stylesheet for company dashboard stuff
REVERT: f904a21 Add routes and helper methods
REVERT: a9df3bb Show the company sidebar on namespaces company routes
REVERT: 5722a4b Add shared company sidebar
REVERT: 1274b77 Add company dashboards method
REVERT: 73ad1f6 Add section for company dashboards to the admin dashboard
REVERT: 4868189 Add note about future refactoring
REVERT: 15f6cfb Add company dashboard with static text
REVERT: 4b42860 Add abilities to company users
REVERT: 47da8fb Add base company controller
REVERT: b43c32d Show different routes depending on user type. Fix #420
REVERT: 9963473 Add user paths to company dashboards
REVERT: e6c0a8a Add is_student method to check if a user is a student
REVERT: 11f64f8 Add company views and controller
REVERT: 2831b39 Only prompt user if they are a student. Fix #422
REVERT: 50a77b1 Change admin routes to 'a' and add company routes
REVERT: 7aca871 Change first button based on user type
REVERT: 035df74 Remove comments from header file
REVERT: 9f4c369 Merge pull request #419 from teamleada/mark-charts-fix
REVERT: 30b6dd6 Zooming for all charts
REVERT: 02a23ac Fix realtime page
REVERT: 8171728 You can now click and drag on charts
REVERT: b9d551d Use the default timeframe for displaying charts
REVERT: 4b9b89d Add default timeframe for charts
REVERT: 65b02bb Annotate all models and specs
REVERT: e1aea2e Merge pull request #416 from teamleada/brian_MH_eval_edits
REVERT: 575998c minor mh content fixes
REVERT: 9a12f2f added statricks project seed
REVERT: feea917 Merge pull request #412 from teamleada/tristan_footer_margin_fix
REVERT: aac2916 fixing the footer, dnt know why it broke in the first place
REVERT: de294b4 Merge pull request #410 from teamleada/mark-project-graphs
REVERT: 57c04e8 Add chart metric for all project interactions
REVERT: f2fce83 Add a total interactions chart for projects
REVERT: d4d0fa2 Actually link metric with chart
REVERT: 30c0bc0 Add new chart for completed projects
REVERT: d16a4a6 Add method to project status for charts
REVERT: dec14e0 More charts for tracking in progress projects
REVERT: bf94873 Print out feedback as it runs
REVERT: f4eb94a Capitalize names in sidebar
REVERT: 27b1a32 Made it easier to input metrics
REVERT: 7ecfb79 Made it easier to input charts
REVERT: 1b87417 Various seedfile edits
REVERT: 5038dd6 Add projects as a type of chart
REVERT: c03c6e4 Admin dashboard is more like a dashboard now
REVERT: 1e12aec Load dashboard at the top and realtime charts under the charts section
REVERT: 4990ffe New admin dashboard page
REVERT: 6428211 Add realtime charts routes
REVERT: 721250d Add realtime charts view
REVERT: 7b1fdf1 Correctly create day
REVERT: 910b3aa Add rake command for the current day's worth of statistics
REVERT: eab2166 Small off by one errors for dates
REVERT: dbbcec2 Set primary key and methods for pretty dates
REVERT: 9a4972f Count things that happen today under the current day
REVERT: 9b386f7 Fix up db columns for days
REVERT: 73c3aa1 Add rake task to backfill all data from 100 days ago
REVERT: 26ee5a5 Debug puts statements in charts_helper
REVERT: 91c7526 Fix seed to use find instead of where
REVERT: e5067a3 Use a multichart
REVERT: 1d0bf3a Establish relationships between metric entries and days with metrics
REVERT: 4b15969 Add seeds for metrics and chart metrics
REVERT: 335e7d0 Add seeds for metrics
REVERT: c51f500 Actually render chart for charts by category
REVERT: 244a023 Add chart methods for users
REVERT: 3c31a47 Add by_category method of displaying charts
REVERT: 1be4d3f Add helper for displaying new type of chart
REVERT: c327aba Add relationships for charts
REVERT: 0fcc52e Add chart views for displaying pretty charts
REVERT: 636301a Load categories on the side
REVERT: 76c2531 Add charts controller with by_category method
REVERT: 50dcc37 Add routes for charts and categories in the model
REVERT: 338a5b4 Add metric entries
REVERT: e1a17ee Add launch model
REVERT: a29e83c Add day model
REVERT: c78f4f1 Link charts and metrics together with chart_metrics
REVERT: d6271ca Add metric model and change to uid
REVERT: 9e4cfce Add uid, remove id from charts
REVERT: 5f145fb Add blank seed files for charts
REVERT: 99bff5d Move dashboard down to charts section
REVERT: db9bc5e Add chart model
REVERT: 3507b8e Same size buttons on the home page. Fix #386
REVERT: 3908a33 Fix default_scope for slide model. Fix #395
REVERT: f7b8ac2 Merge pull request #403 from teamleada/mark-order-submissions
REVERT: bc1832f Show pretty submit date on the index
REVERT: d1097cd Add pretty_submitted_date and add default_scope
REVERT: 42d6507 renaming logogs
REVERT: 62b489a Merge pull request #398 from teamleada/tristan_refactor_grading_code
REVERT: a55736f Merge pull request #397 from teamleada/tristan_sidebar_ui_change
REVERT: 6601840 adding Mark's suggested change
REVERT: 289f2ac fixing broken icon on project show page
REVERT: edbd133 Give regular users abilities to submit code. Fix up some api stuff for the code submission
REVERT: 51ee889 Another titanic fix
REVERT: 7f7d1bc Fix seed file for titanic v2
REVERT: d2b20b6 Merge pull request #391 from teamleada/mark-code-submission
REVERT: 57eb9d4 Show email for user
REVERT: 623d6a2 Do not let the user interact with the text (no modication)
REVERT: d0c5c37 Correctly render python in the code submission view
REVERT: feaa221 Add code submissions controller and index view
REVERT: 9b830b8 Add code submission viewing to routes
REVERT: 619cfd2 Add code submissions to the admin sidebar and add blank views
REVERT: 77f00f4 Add code submission chart
REVERT: a798a42 Successfully gets previous submission
REVERT: fbe0ae4 Add get submission method
REVERT: 64e1d8e Finally fixed the open/close issue
REVERT: e650d63 Use ladda for loading animations for buttons
REVERT: b5a7276 Add ladda css and small style edits
REVERT: 6a72e43 Add ladda js
REVERT: 7331dc7 Show static button for saving
REVERT: 8a3cad5 Use slide index
REVERT: f973a64 Add pace for loading indicators
REVERT: 845ee15 Merge pull request #389 from teamleada/tristan_titanic_seed_submission_fix
REVERT: 103c157 titanic seed now has one submission per page
REVERT: dbc5c43 Add some TODOs for later
REVERT: c0470e4 Don't mess with slide position
REVERT: 0bb45f5 Grab current slide id and send it to the server as the slide index
REVERT: 0fa3619 Add slide index to code submissions
REVERT: f1adcda Add styles for code editor and right sidebar
REVERT: 07cb494 Add resource submission method
REVERT: e545e8f Establish relationships for code submission with other models
REVERT: 4a6c6cb Fix up the right sidebar to show code submission
REVERT: 3dcd170 Show code submit buttons on the slides
REVERT: b84fcc4 Load content from the dom and send as post request
REVERT: edc0212 Add route for submitting resource
REVERT: 6445c33 Add small screen and medium screen support. Add controls to the screen. Fix #388
REVERT: 20f2bed Add right sidebar content
REVERT: 0897620 Add right sidebar to the application layout
REVERT: c7167c2 Code editor css and right sidebar css
REVERT: 506ab76 Reveal js settings
REVERT: 3eff6e5 Use full-width class now
REVERT: bc3300b Add code submissions as objects on steps and lessons
REVERT: 105d815 Turn content input into a code editor
REVERT: edde8a2 Little bit of refactoring of the _content partial
REVERT: efe4b3a Add routes for code submission
REVERT: 77e7b8d Merge pull request #384 from teamleada/tristan_sidebar_ui_change
REVERT: 3c5059b updating current slide in app_helper
REVERT: 9014d29 updating current slide in proj/show
REVERT: 6d52974 Add reveal stylesheet with some annoying lines removed
REVERT: 81585d0 Add code editor stylesheet
REVERT: 107599a Merge pull request #383 from teamleada/brian_ask_peter
REVERT: 7c4c45c yay CodeMaster Brian Returns
REVERT: d6a3f67 Load ace editor in the code snippet
REVERT: ecb81c9 Add ace editor
REVERT: 45b3764 Add code submission model
REVERT: 19c8bc2 Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 1661d50 Fix project completion link to survey. Fix #382
REVERT: 4ed849b Merge pull request #381 from teamleada/tristan_qa2_new_titanic
REVERT: fcebbcf new titanic QA fixes
REVERT: 81abd51 Merge pull request #379 from teamleada/mark-qa-bio
REVERT: 6805273 Add question and answer guidelines and text
REVERT: 39425b4 Add question_guidelines route
REVERT: a55fb3b Add peter norvig bio
REVERT: 7fd5d05 Merge pull request #378 from teamleada/mark-project-bug-fixes
REVERT: 8ea6294 Add up points for step_statuses and fix steps for a project method
REVERT: 7891b69 Fix sidebar rendering issues
REVERT: aa7ad47 Prevent users from skipping to middle of project. Fix #353
REVERT: 41ab111 Don't open survey and redirect if you haven't completed the project
REVERT: 0a956e8 Load the full icon for sidebar next steps
REVERT: b14fe26 Use main_lesson instead of lesson for next steps
REVERT: 60b737c Make box bigger for asking questions
REVERT: 78c7965 Add migration to change question to text
REVERT: 9c69f42 Track when the modal comes up. Fix #366
REVERT: 756aa6e Merge pull request #377 from teamleada/mark-question-moderation
REVERT: 0479707 Make the button a toggle and show text for hidden/unhidden
REVERT: 8a835d2 Don't show hidden views and make the button a toggle
REVERT: f487ba8 Rename route for hiding questions
REVERT: cf099aa Run migration for questions
REVERT: 4d3451f Add migration to hide questions
REVERT: 4034d06 Only show non-hidden questions and add hide method
REVERT: 92d27c2 Add hide route for questions
REVERT: 7050be6 Show error message for uploading a non-pdf resume
REVERT: c8f391a Resume must be under 10 megabytes
REVERT: bda9ca5 Round percentage to nearest tenth
REVERT: 866b493 Use step total points instead of points
REVERT: da387f5 Merge pull request #374 from teamleada/mark-project-completion-bug
REVERT: b949643 Make the default points 1 for lessons and steps
REVERT: fc8c3d7 Rely on default points to be 1
REVERT: 993522a Merge pull request #373 from teamleada/mark-project-lesson-step-titles
REVERT: 5385a24 Add page title method to lessons and steps. Show the title for each tab
REVERT: a33ce02 Merge pull request #372 from teamleada/mark-timezone
REVERT: 0fad38d Set timezone. Fix 365
REVERT: 25a4138 Merge pull request #371 from teamleada/mark-prompt-randomly
REVERT: a4ef504 Prompt users 20% of the time. Fix #367
REVERT: b8e000e Merge pull request #370 from teamleada/mark-fix-twitter-link
REVERT: e7f58ae Link twitter to our full website to get the number accurate and show tweets. Fix #344
REVERT: 3f0719c Fix typo "preparation" in CT
REVERT: 4940d52 Merge pull request #363 from teamleada/tristan_fix_brian_mh
REVERT: ef7d994 converted mh seed code responses
REVERT: 97468ef converted mh seed free responses
REVERT: 1b5e396 Merge pull request #362 from teamleada/tristan_titanic_new_format
REVERT: 6f9b832 new titanic finishing up QA
REVERT: e9a95bc new titanic QA round 2
REVERT: 18b0457 clenaing up new titanic, cutting more explanations
REVERT: af8a473 polishing up new titnaic
REVERT: 78a4340 rough finish new titanic
REVERT: abeb944 cleaning up original titanic
REVERT: 48b400e new titanic wokring up to the model building part
REVERT: 089c56a Merge pull request #361 from teamleada/brian_MH_eval
REVERT: 0935083 small edit
REVERT: 94a07b2 MH project eval version
REVERT: 90287a9 new titanic train clean complete
REVERT: 1f10184 adding skeleton for user_response and user_code
REVERT: a094865 adding DEPRECATION comment in application.js
REVERT: 58d85fa new titanic starting train clean
REVERT: c8582e9 new titanic starting viz
REVERT: a4f67ff new titanic train data
REVERT: a100fa3 init new titanic proj
REVERT: 0fdeeba Merge pull request #359 from teamleada/tristan_misc_fixes
REVERT: d7db620 remove white space in css
REVERT: cbdb057 titanic adding back the next_step button
REVERT: 0032a18 adding id to submit btton
REVERT: 79caa8e submit button fix
REVERT: 08ae366 titanic cleanup
REVERT: eb2db7c bringing back the submit button
REVERT: 8ca60e8 Merge pull request #356 from teamleada/tristan_seed_comp_btn
REVERT: 3d2efd5 submit section loads via arrow instead of preloading
REVERT: 090e367 complete button for all
REVERT: 316068f fix titanic seed not fitting
REVERT: 527e7b9 Merge pull request #341 from teamleada/mark-fix-resume-submission
REVERT: f9de51d Resumes are now remote forms and work now
REVERT: 78c4371 Merge pull request #336 from teamleada/mark-completed-projects
REVERT: 6022ea4 Show percentage on user profile page
REVERT: a951db7 Show nice icons on the user profile page for completed projects and in progress projects
REVERT: 51a7cbb Default completed to false
REVERT: a7e557d Only list projects that haven't been completed yet
REVERT: 5ab773d Add a nice checkmark to the projects on the projects index endpoint if they are finished
REVERT: caa809f Let people complete projects
REVERT: 39c4c85 Go to correct path and use post method
REVERT: 30a46b7 Add complete method to projects_controller
REVERT: bc559e1 Add complete project endpoint
REVERT: 08a18f8 Fix seedfile for complete project button
REVERT: 2f6a2b3 Check for finished project
REVERT: ff1bfcd Fix bug related to next_lesson_or_step
REVERT: 39f176d Fix #334
REVERT: 93ff958 Moving too fast, fixing bugs now
REVERT: 16d9fbe Load project_status when you view a project page
REVERT: 330823b Establish relationships between project_statuses and users
REVERT: eae4972 Add model for project_status
REVERT: 1dbf56d Add tests for project_status
REVERT: a5fa9b3 Add project_status
REVERT: ebaaeb0 Merge pull request #329 from teamleada/tristan_mh_small_fix
REVERT: d86d6c3 next_link needs to be lesson_link in mighty_hive
REVERT: 3800aeb MightyHive Seed SE => SD
REVERT: f269993 Merge pull request #327 from teamleada/mark/project-completion
REVERT: 1106a5b Use font-awesome mixin and load icons on the side with correct margin
REVERT: 0bebe3b Add fa class to sidebar icons
REVERT: c6acb7b Show different icon for current item
REVERT: 41cbcda Lock sidebar items until you get to them
REVERT: aa42dde Show completed icon next to completed project and steps
REVERT: 6c3a589 Add some sidebar completed tags
REVERT: 804883c Add completed item helper
REVERT: 64d81ed User knows when they have completed something
REVERT: 936caae Add completed item style
REVERT: 205c266 Link to the first lesson if they have not started the project yet
REVERT: d3271b1 Add link to continue where you left off
REVERT: f3d34be Add todos for changing way we give points later
REVERT: b7860f1 Fix logic error for computing nonzero points
REVERT: 1993c8a Helper methods to compute the next lesson or step
REVERT: 77f11b3 Relate users and projects to lesson_statuses
REVERT: b4b2f03 Add points to lessons
REVERT: 5bee7c5 Add belongs_to relationships to lesson_status
REVERT: dcc6508 Annotate models and add lesson_status
REVERT: 985ea00 Add lesson status model
REVERT: d509232 Merge pull request #326 from teamleada/mark-prompt-users
REVERT: c51fa48 Calculating percentage work!
REVERT: 5c4ecee Show accurate percentage for projects
REVERT: 0a67539 Change project id to integer
REVERT: e11895d Organize project model
REVERT: 3bbc6c8 When you see a step, mark it as complete
REVERT: b78dd81 Add method for completing a step
REVERT: d8c9c2b Change step and project id to strings for step statuses
REVERT: cb2304d fix typo "operations" in anscombe prep
REVERT: 0b16760 Two categories of information, basic and not basic
REVERT: b69af6b Conditionally show information to the user
REVERT: 8b3fe3e Modify the page to show the new resume partial
REVERT: b723cca Pulled out logic for resume modal into a partial
REVERT: 197c911 Only prompt if they are signed in and have not provided a lot of info
REVERT: e6c5fbe Prompt for resume
REVERT: 75e94bd Add flags to prompt user on certain pages
REVERT: d3bf5d8 Merge pull request #325 from teamleada/tristan_admin_emplyer_view_update
REVERT: ea1de51 changed the emp view to reflect new idea
REVERT: 6ac9f9e Fix double up-vote bug
REVERT: f6db2c0 Merge pull request #324 from teamleada/mark/qa-fixes
REVERT: e7c7906 Change header text to ask peter
REVERT: 010e60e Hide QA link for now
REVERT: fc4e94e Merge pull request #323 from teamleada/tristan_twitter_heap_fix
REVERT: cc5e006 Twitter Tweet goes to the same page now
REVERT: c38c974 heap margin fix
REVERT: f655ec1 Fix bug relating to negative indicies
REVERT: efc2792 Merge pull request #318 from teamleada/mark/livereload
REVERT: 2f1ee75 Update readme with more specific instructions
REVERT: 2ebf3db Update all gems installed
REVERT: 75f4dd9 Add guard as a gem
REVERT: bb4c9c4 Update readme with livereload instructions
REVERT: 1a46e76 Add guardfile
REVERT: bdf2b8e Add guard reload and guard rspec
REVERT: 806e31f Merge pull request #316 from teamleada/mark/qa-page
REVERT: c91675e Change route name to 'ask-peter'
REVERT: a8dbbfd Load top 7 and rest of the questions separately
REVERT: b1da708 Break into smaller single question partial
REVERT: caa9330 Break ties by created_at date for question
REVERT: 7c60677 Require that the title be there
REVERT: 2e54fd9 Remove description from form
REVERT: 39a0892 Only allow users to vote from the same IP once
REVERT: 385c98b Add voters array to questions
REVERT: ddf60ee Add index view for questions in admin panel
REVERT: 83eb76d Add controller and routes for the questions under admin
REVERT: 663e4f1 Load all questions on an up-vote and render the view in a partial
REVERT: 3e29ae4 Ajaxified the up voting system
REVERT: 449a922 Add up vote method to questions
REVERT: 44bd499 Basic outline for the qa page
REVERT: e7f2425 Link to the up vote button
REVERT: 425d700 Remove redundant routes
REVERT: 41516e8 Add qa stylesheet
REVERT: 6fa5764 Simple container for showing questions
REVERT: 7e406a9 Load previous questions and default scope
REVERT: d313563 Assign asker if signed in
REVERT: fcaf5d9 Add simple form for question
REVERT: caaa0fe Add create method for questions
REVERT: 77c81c2 Add questions as seed data
REVERT: 1e4cd30 Let questions have an asker
REVERT: fad16e3 Add question_params and add default value to up_votes
REVERT: 5e809d3 Add routes for questions with up-voting
REVERT: a9589ee Add questions controller
REVERT: ee90981 Add question model
REVERT: 7ca8aec Add static qa page
REVERT: ac8eeae Merge pull request #310 from teamleada/mark/student-to-learn
REVERT: 504c062 Change student path to learn path
REVERT: b6ce0d7 Change student route to learn
REVERT: ba38ac1 removing the word "already"
REVERT: 15530af Merge pull request #308 from teamleada/tristan_rm_accesscode_entry
REVERT: 2a4730a Project page no logner double prompts for Access Code
REVERT: 53ca61b Student page no logner double prompts for access code
REVERT: 1d61897 changing the to your in emp app.
REVERT: 2e38ffe Merge pull request #307 from teamleada/tristan_ui_changes
REVERT: 32fc71a changing headline
REVERT: ef31a5e finalizing student's page
REVERT: ca4c7d5 changing header to learner
REVERT: 1007d15 most recent resume opens new tab
REVERT: e8e3f30 clarifying to students the recruiting aspect
REVERT: 824a0af home page indidate updated p
REVERT: 06da838 updating emplyer page
REVERT: 37c6378 Merge pull request #305 from teamleada/tristan_seed_fixes
REVERT: 60e1b0a scheme diff, dunno why it happened
REVERT: 92bd4a1 mighty hive typo fixes
REVERT: c5622a4 Merge branch 'master' into tristan_seed_fixes
REVERT: b210357 Remove js comments and change to relative path
REVERT: 42c5ec5 Set host in test and production
REVERT: 2b1fa35 Merge pull request #303 from teamleada/mark/modal-analytics
REVERT: ca5b416 Add full_url helper and pass through to modal
REVERT: 6adebf8 Set host in development
REVERT: efc1956 Add new modal.js file for tracking modal analytics
REVERT: 5c776be Merge pull request #301 from teamleada/mark/resumes-sidebar-admin
REVERT: bd53bec Show view for resume is unnecessary
REVERT: 5e2c486 Add index view for resumes
REVERT: 6849dad Add attributes to resumes
REVERT: 4da2a09 Add resume routes and admin controller
REVERT: c1887a6 Add resumes to sidebar
REVERT: 961b4ad Merge pull request #297 from teamleada/mark/resumes-chart
REVERT: f868105 Add chart for resume uploads. Fix #295
REVERT: 30fdce1 Merge pull request #296 from teamleada/mark/access-code-tests
REVERT: 0365d6b Add more code specs to test project_access
REVERT: cadc31f Fix up the auth_code method to use the new add_code method
REVERT: a6a9ad8 Add add_code method to users
REVERT: b55ee56 Clean database before and after running tests
REVERT: 0e43f0a Add database cleaner
REVERT: 96dbc17 Set host for test environment
REVERT: 67058cb changing mightyhive title to be shorter
REVERT: 520ad80 Add user factories and more rspec factory girl config
REVERT: 646ad39 Use factory_girl_rails
REVERT: c27bd1d Rspec initializers are done in the spec_helper
REVERT: 33eb0e5 Add factories directory
REVERT: 7b38379 Add user access to projects tests to code
REVERT: f4c1e4e Factory girl settings for rspec
REVERT: d25635a Specs for codes
REVERT: bab1923 Annotate models and tests
REVERT: 8ce1350 Remove all base tests besides codes and users
REVERT: 46bf839 Remove old specs that do not have corresponding files
REVERT: af9180b Basic code to test correct access value for codes
REVERT: 779f6bc Rspec installation
REVERT: 22d33ac Merge pull request #294 from teamleada/mark/admin-projects-index
REVERT: c34f42b Add UID to projects table
REVERT: 2b2e3d7 Change case for text and use user constants for privacy
REVERT: 9c55d3f Use access_type not group
REVERT: 5c1bae2 Check access_type not group
REVERT: 24e0856 Change group to access_type
REVERT: 83e1b23 Merge pull request #291 from teamleada/mark/users-by-access-code
REVERT: f2e35a3 Add comment for scopes to add for users
REVERT: bd98c70 Chart for users works
REVERT: 07c170b Fix codes seed file
REVERT: 8de365d Move group to access_type
REVERT: 074f1ad Change group to access_type for codes
REVERT: 6e0d077 Start to add custom users chart
REVERT: ee6b3eb Merge pull request #290 from teamleada/mark/projects-chart
REVERT: 28d8df8 Merge pull request #289 from teamleada/mark/disable-access-tokens
REVERT: a440354 If the code is disabled, show an error and don't add the code to the list of users codes
REVERT: daeb9a0 Add default ordering to codes
REVERT: 7577a91 Make codes editable (only enabled for now)
REVERT: c962d21 Add enabled column to the codes index table
REVERT: 0a7e21b Add enabled to codes
REVERT: 510f435 changing feedback btton value
REVERT: 36ec425 Merge pull request #288 from teamleada/tristan_sponsored_logo
REVERT: 66c70f4 Adding logos in the employer view
REVERT: d669fdc sponsor logo css
REVERT: d5aa202 adding logos for mightyhive and statricks
REVERT: c2b5e1c Merge pull request #286 from teamleada/tristan_admin_z-index
REVERT: 73bf406 adding class to the search bar
REVERT: 5d87140 adding searh-bar css, z-index=0
REVERT: e9c7c10 Merge pull request #285 from teamleada/tristan_twitter_fb
REVERT: c09e789 in footer addded twitter, facebook commented out
REVERT: 4c70394 added css for twitter, changed heap css
REVERT: 4e8594a Merge pull request #284 from teamleada/tristan_add_difficulty
REVERT: 164e599 removing twitter bit
REVERT: 919c59f adding diffuculties
REVERT: 67b5af5 Display the chart on the projects index page
REVERT: 5234469 Add chart methods for multiline charts
REVERT: 2096fc2 Include chart helpers and load a projects chart
REVERT: ab3c380 Merge pull request #280 from teamleada/mark/project-difficulties
REVERT: 80003b5 Merge pull request #279 from teamleada/mark/paperclip-fix-issues
REVERT: b3d47af Merge pull request #283 from teamleada/tristan_adding_resume_praivacy
REVERT: 46abf52 updated privary setting to include reusme
REVERT: a331817 Merge pull request #282 from teamleada/tristan_titanic_forloop_fix
REVERT: 55fd67a changig chick weight from 10 to 70
REVERT: a2ccb87 titanic, changing col-index to col-names
REVERT: 86809f7 fixing titanic submission header to 'Survived'
REVERT: 3a87f65 correcting chickweight answer
REVERT: 2fe3a16 fixinng the missing index
REVERT: 948c64c forloop doesn't use column index, but instead col name
REVERT: 5247bee Add difficulty tags to the projects index page
REVERT: e548d45 Add tag to projects index page
REVERT: e42898a Add difficulty constants
REVERT: 59b1ce3 Add difficulty to projects
REVERT: a193a64 Show the most recent resume on the profile page
REVERT: 0bf5e6c Merge pull request #278 from teamleada/tristan_fixes
REVERT: 27f754a QA titanic bootcamp
REVERT: 707b2df typo execute
REVERT: 6dffb77 standardizing names
REVERT: ed43c35 standardize project names
REVERT: 59034c4 renaming proper
REVERT: 623e5c5 addign missing return link in Titanic
REVERT: 657c68d fix anscombe typo
REVERT: ca5dd6f Add ability to upload another resume
REVERT: f51d155 Merge pull request #274 from teamleada/mark/refactor/seed-users
REVERT: 110815e Refactor seeding users to use a single function. Fix #267
REVERT: 740355f Merge pull request #273 from teamleada/mark/paperclip-resumes
REVERT: 259a8c4 Use a modal to upload resumes
REVERT: 307a9c3 Add s3 credentials to initializers
REVERT: 9e8a95a Add s3 credentials to resumes
REVERT: 203cd83 Don't need separate endpoint for resume uploading
REVERT: 3bcb61e Add more environment variables to the readme
REVERT: 5dd060f Add S3 initializer
REVERT: ffd7462 Update aws and organize gemfile
REVERT: ed4d82f Add parameters to users_controller to let through
REVERT: af7eae3 Add resume preview view
REVERT: cbcc8f6 Accept nested attributes for resumes
REVERT: a0975b0 Add routes for resume uploading
REVERT: 6653278 Add who_can_see_resume to users
REVERT: 8b1e38a Use constants for user types
REVERT: 0de8196 Merge pull request #271 from teamleada/tristan_charts
REVERT: 1472182 Refactor the user profile page
REVERT: f420c5d Helpers for resumes
REVERT: 41ac340 chart's yaxis starts at 0
REVERT: aa6b0f8 Attach resume file with content type of pdf
REVERT: 25bb5a4 Resume has attached file
REVERT: 79dbf29 Add resume files to resumes
REVERT: e53fb01 Organize user model
REVERT: 5b15bbd Add resume model
REVERT: 520a55f Add paperclip gem
REVERT: 6be2870 Actually confirm users
REVERT: 31d79da Find users by email. Fix #266
REVERT: 19e1ff7 Annotate user model
REVERT: eda3238 renaming adminpage codes to access codes
REVERT: 5fee7bd Merge pull request #263 from teamleada/tristan_favicon
REVERT: b34cb37 fixing accidentally erasing main logo, adding back favicon now
REVERT: 8c9c1a2 Revert "using the larger logo"
REVERT: f1e9bbb renaming favicon
REVERT: 30262de using the larger logo
REVERT: 9e86cb6 adding favicon code
REVERT: f591ea7 Merge pull request #261 from teamleada/brian_fake_matlab
REVERT: 92d328f add matlab project
REVERT: a7dd1cf Merge pull request #259 from teamleada/mark/interest-graph
REVERT: 397af51 Add employer applications chart
REVERT: eaa41df Move charts to helper module and add interest chart to dashboard
REVERT: 4f8eb23 Remove text in admin panel and add margin
REVERT: c1f3c16 Add up/down arrows for sorting
REVERT: ee4347f Add font-awesome
REVERT: 631ccad Merge pull request #258 from teamleada/mark/search-pagination-admin-users
REVERT: d0ca8d2 Remove comments from js
REVERT: 25f7cb3 Add sorting by role and confirmed_at. Fix ##252
REVERT: 19b35e3 Ajaxified user searching is done. Can now update the table as you type
REVERT: 2647a3e Add hidden params for user sorting
REVERT: e432472 Move table for users into partial
REVERT: 2c0afaf Javascript template for loading users with ajax
REVERT: 30885a9 Add helper for sorting and filtering the columns
REVERT: 565ea3d Add user search parameters
REVERT: 3250a20 Add pg_search gem
REVERT: bc5772f Start x-axis at 0
REVERT: e7b2756 Start graph at previous total number of users
REVERT: cbb4be8 Now loads in every day including days with zero sign ups
REVERT: 18c5e87 Merge pull request #257 from teamleada/mark/admin-sidebar
REVERT: eaf2cc4 Show number of users signed up over time. Fix #232
REVERT: 4dba13b Test chart on the admin dashboard
REVERT: 481a053 Add highcharts gems
REVERT: 586a678 Make the admin modules full width
REVERT: 2004162 Add sidebar links back to admin dashboard/sidebar
REVERT: 94f71ea Add helpers to determine if in admin namespace
REVERT: 3ded146 Add admin sidebar and edit application.html.slim to include the admin sidebar
REVERT: 1891c0a Add rake task to set user defaults
REVERT: eb9d0dc Merge pull request #256 from teamleada/mark/edit-user
REVERT: 3d507e1 Render json on success and show those fields on a successful update
REVERT: d788655 Seed 5 more test accounts
REVERT: ea52147 Show error messages on fail
REVERT: 7ee73c3 Users need the ability to update their profile...
REVERT: 96eb8a9 Set default privacy preferences
REVERT: c546132 Set updated_password_at at account creation
REVERT: 34ab27b Add has_missing_profile_info method
REVERT: fdbcf66 If the user doesn't have a full profile, prompt them
REVERT: fc44b55 Add tab to general
REVERT: 5276551 Add highlighting to the active tab
REVERT: 3555d44 Use the select boxes on the privacy page
REVERT: 04e6445 Allow the params to go through
REVERT: 9f5386a Move js specific for these pages out of app.js
REVERT: f6e1562 Add class variables to get user types
REVERT: 7bed6eb Fix flash messages and fix password update check
REVERT: e0cfc95 Add signature to reset password email
REVERT: a33a5a4 Add privacy columns for users
REVERT: ede0064 Privacy questions added
REVERT: 9d8e4f5 Don't push the title in the main view
REVERT: 8dcd3ae Add clearfix and styles for privacy page
REVERT: c5d6f1a Smooth animations for changing your password
REVERT: a59ca0c Autofocus on the password field
REVERT: ab82340 Add comment about flash messages
REVERT: ed904fe Replace all 'notice' with 'info'
REVERT: a0b57a8 Use custom passwords_controller
REVERT: c53f67f When a user updates his/her password, it is reflected on the time
REVERT: 346dd02 Got password validation to work and so that it does not sign out the user
REVERT: 75f1bfe Add updated_password_at for users
REVERT: 55da078 Clicking on the row starts the edit process
REVERT: 833fceb Add unconfirmed email to users
REVERT: f0c1080 Major styling on the settings page
REVERT: f1dc96a Shows success when you update your attributes
REVERT: 5ee2b9e Playing around with the ajax:success callback
REVERT: 550837b Use mark's version of best_in_place
REVERT: 63c8142 Convert all flash messages to toastr. Fix #249.
REVERT: 7aef738 Logic to display the error messges
REVERT: 7effe1c Show toastr notifications
REVERT: 93d347e Actually add toastr gem
REVERT: ec85358 Require toastr
REVERT: 38f22ac Add toastr gem
REVERT: 5bbf0e8 Use best_in_place editing feature
REVERT: 2619f58 Endpoint for editing a user
REVERT: b8c25eb Add best_in_place to app.js
REVERT: 09523c4 Add best_in_place gem for inline edits
REVERT: 9c4d871 Fill up the general settings page
REVERT: 81b0ea7 More styling for settings page
REVERT: 40eaf8f Use new helper function in view
REVERT: cdc5512 Fix up name method to show when you don't have a full name
REVERT: 10ebea0 Add helper for settings tabs
REVERT: 03a13a1 Allow users to edit their profiles
REVERT: 2d69c9c Add routes for settings
REVERT: 2ec46b8 Structure for the settings page
REVERT: 705fa14 Add partials for sidebar, account, and privacy pages
REVERT: 74c631c Add settings stylesheet
REVERT: e993abd Add basic edit page
REVERT: 2c03ce4 Resend confirmation email if you change your email
REVERT: 466dc24 Merge pull request #255 from teamleada/mark/fix/submission
REVERT: 5ac795b Add check submission ability to companies and students
REVERT: 9012897 Seed quizzes
REVERT: 82856c1 Merge pull request #247 from teamleada/mark/show-codes-on-users
REVERT: 335eafc If a user doesn't have a role, define them as a student
REVERT: 4419a8c Show more info about the users
REVERT: fd0821a Add links to access codes on users page
REVERT: ab698ae Merge pull request #246 from teamleada/mark/page-titles
REVERT: fd3138a Add titles to most static pages
REVERT: 7ac903f Show page title if there's a page title
REVERT: 30d5f22 Merge pull request #245 from teamleada/mark/woopra
REVERT: 990ca31 Add Woopra Analytics. Fix #244
REVERT: 29967bf you're, not your. who keeps typing this lol
REVERT: 616c27e typo in tutoring page
REVERT: f768253 Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: fc0a610 Fill in code using param
REVERT: 6052089 adding ga tracker to env var in readme
REVERT: aee9f66 Don't allow symbols in username
REVERT: b46fd94 Merge pull request #241 from teamleada/mark/users-pagination
REVERT: 4c928c3 Load 50 at a time and show total count
REVERT: 1d7a064 Add pagination links
REVERT: 79afe8d Upgrade to ruby 2.1.1
REVERT: 841aaff Set number of users per page and add default_scope
REVERT: ad26417 Add will_paginate gem
REVERT: 73679eb Reannotate models
REVERT: 4a6c2ed Merge pull request #240 from teamleada/mark/require-name
REVERT: de58183 Add first_name and last_name as parameters
REVERT: 04656a6 Add name method for users with proper first and last names
REVERT: 778e27f Style the form for users
REVERT: 78c1de3 Add first and last names to users
REVERT: 9a6901a Usernames should be case insensitive
REVERT: 5b4ec4d Fix Heap Analytics logo in footer. Fix #219
REVERT: 1173336 Revert logo in top left
REVERT: 8840b11 Merge pull request #236 from teamleada/mark/tutoring-payment
REVERT: 6696a09 Add text before pay button
REVERT: aba396b Set up action for purchasing tutoring
REVERT: 1242b40 Add cost in dollars for transactions
REVERT: 8ecbc4a Tests for tutoring slots
REVERT: 77883b1 Create tutoring slot model
REVERT: 1c349b3 Merge pull request #235 from teamleada/tristan_logo
REVERT: 9bc1ea4 header refers to new logo
REVERT: e8dd99f adding header css
REVERT: ad402ed adding logo png
REVERT: 79ca8d9 Add large header to the tutoring page
REVERT: f4461ec Add tutoring to the header and fix styling on that page
REVERT: 09a3307 Merge pull request #234 from teamleada/mark/form-on-projects-page
REVERT: d26166d Center the access code box
REVERT: 3315af4 Remove access code from student page
REVERT: 4596fc1 Move the access code section into a partial
REVERT: 9da812c Merge pull request #233 from teamleada/mark/users-with-codes
REVERT: 096d1ea Show number of users for codes
REVERT: 7703858 Show users who used an access code. Fix #225
REVERT: 06b240f Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: 52db42d Add signature to email. Fix #224
REVERT: db4e8a6 Merge pull request #230 from teamleada/tristan_ga
REVERT: 77c12d9 adding ga back in as partial
REVERT: 82fb50a moving ga out
REVERT: 390b121 Separate abilities into sections
REVERT: 3c9eb63 Fix user has project method
REVERT: dfb664a Merge branch 'master' of github.com:teamleada/teamleada.com
REVERT: d1fa1d5 Fix employer button
REVERT: 297ca25 Clarifying access code
REVERT: c369ed0 Merge pull request #229 from teamleada/tristan_emplyer_view_fix
REVERT: 1359a06 employer view update
REVERT: 7c709a5 Show submit on projects page...
REVERT: 24db413 Merge pull request #227 from teamleada/mark/admin-employer-apps
REVERT: e6f458e Add basic show view for employer_applications
REVERT: f74208b Forgot exclamation emplyer flash
REVERT: 08db7b0 changing the flash message for employer interest
REVERT: f4de649 Add show and index employer_applications views
REVERT: 0718290 Add views for employer_applications
REVERT: 7cd6926 Add routes for employer_applications
REVERT: eaf23b8 Merge pull request #226 from teamleada/mark/submission-fix
REVERT: a3aa911 Change submission path for project submissions
REVERT: 7dfd9cc Let company employees view their own projects
REVERT: 87313a2 Fix up forgot password views
REVERT: 78aedc3 Change subject for confirmation
REVERT: 3b1762a Everyone can see lessons and steps because they have to have access to the project too
REVERT: b20689c Check that project is within a set of company projects
REVERT: 748b2e0 Actually add the employee to the company
REVERT: def66b4 Load resource only if it's show_interest
REVERT: 4625e39 All projects, not just one
REVERT: 62b8534 Explicitly use uid as the primary key
REVERT: 21a3141 On sign in, always go to projects page
REVERT: be441cc Redirect AND return. Fix #206
REVERT: 9d7dcaf Block signed in users from accessing free projects. Fix #194
REVERT: cc026b1 Uh, typo
REVERT: ab49bea Authorize for everything except showing interest
REVERT: 60ed02e Add host as an environment variable
REVERT: e15f09e Need host
REVERT: 12f2678 Add environment variable info to readme
REVERT: 1ffaa6a Merge pull request #222 from teamleada/mark/employee-account
REVERT: c82dc3a Add table to show employees
REVERT: f29a3ac Everyone can see projects
REVERT: b32c188 User can belong to a company now
REVERT: 279af1a Add method for generating a new token for users
REVERT: d24bec6 Add add_user method
REVERT: 4e26883 Set up relationships between users and companies
REVERT: d33974d Fix flash message on login pge. Fix #175
REVERT: 1bbde35 Fix link to user and show if confirmed
REVERT: 0123c16 Fix user mailer, fix registrations redirect, fix after confirm user
REVERT: 3cfa047 Merge pull request #218 from teamleada/tristan_slide_order
REVERT: 9e62cf3 adding default order
REVERT: c235d11 adding back next link after order fix
REVERT: df8314c Email settings for dev and prod, fixing up confirm user view
REVERT: ea74574 Remove comment from migration
REVERT: eeb770f More mail delivery settings
REVERT: c43ed09 Fix email template to users
REVERT: 4cdca75 Merge pull request #216 from teamleada/tristan_seedfix_nextlinks
REVERT: 8d4f0cc small fix up in mighthive
REVERT: ae1eb8b adding a check for step belonging to a step
REVERT: 0e62d92 Change view for confirmation form
REVERT: e2ce972 titanic spacing issue in seed, next_links show now
REVERT: f14fbee Fix bugs in registration links and add routes
REVERT: 7b16884 Set up email sending for local
REVERT: 7506cc7 Use teamleada email address
REVERT: f7ee2aa scalar back
REVERT: ef5d8b5 scalars don't work
REVERT: 3f1d7fc bug fix, mh + next_link
REVERT: b206675 check step nil before next_link
REVERT: 35d354c intro to r next_steps
REVERT: c454e1b titanic seed next_steps
REVERT: abdfc47 Merge pull request #211 from teamleada/tristan_next_step
REVERT: 56bc23e views for next_link
REVERT: 60712fc next step by uid
REVERT: f72693a next lesson by udi
REVERT: d7c2739 Add basic confirmation views
REVERT: 5d36506 Add columns for confirmations
REVERT: f689127 Add devise confirmable
REVERT: d60f9cd Merge pull request #208 from teamleada/mark/admin-view-projects
REVERT: f290087 Simple show method for companies
REVERT: a1b0a99 Show company view
REVERT: 36d42fa Make endpoint for showing companies
REVERT: 3c0dd27 Give company employees access to their company page
REVERT: 136fb02 Add link to create new user for that company
REVERT: c5819c4 Change routes to better describe the action
REVERT: de8d496 Can now successfully add projects to companies
REVERT: 23a2cd7 Add ability to add projects to companies
REVERT: 169baa5 Make url the find method
REVERT: 5c5b9e9 Add url to companies
REVERT: 3838fe6 Create company projects and set up relationships between them
REVERT: bf04d66 Add validation for unique name
REVERT: 16540f2 Index and new views for companies
REVERT: 9b719ef Merge pull request #209 from teamleada/tristan_surveys
REVERT: 25fa7be survey module, if we decide to use it
REVERT: 6a0e9e4 survey link
REVERT: 1abbfac Use load_and_authorize_resource for codes and add company views
REVERT: ff94f61 adding finish to survey link
REVERT: 1b751f4 Add routes for companies
REVERT: 46d03de adding project feedback
REVERT: 1da855a Add companies
REVERT: 7c3bb93 Fix #207, admins should see all projects
REVERT: 2f055fb Merge pull request #205 from teamleada/mark/fix-project-seed-with-codename
REVERT: 5f022c5 Add ids to titanic bootcamp
REVERT: 3221362 Fix mh project with ids for everything
REVERT: 896d4dc Seed coming soon projects
REVERT: 31133e2 Fix up anscombe project
REVERT: ca37f4e Fix next steps load_and_authroize_resource
REVERT: aa868ec Change next step id to string
REVERT: e4985f4 Change previous_step to be a string to reference uid
REVERT: e034954 Fix up anscombe project
REVERT: 353bae9 It uses uid by default as the primary key
REVERT: fbd0335 Don't seed submissions multiple times
REVERT: 6ec84aa Fix relationship between submissions and the projects
REVERT: e2435a0 Separate has_many relationships into dependent and not dependent
REVERT: d5988c0 Seed some submissions for titanic
REVERT: 5615094 Load production and development after the folders
REVERT: bd12072 Add submissions seed file
REVERT: 0a12b96 Fix up models for titanic project
REVERT: aa752b9 Merge branch 'mark/fix-project-seed-with-codename' of https://github.com/teamleada/teamleada.com into mark/fix-project-seed-with-codename
REVERT: ded8f6b changing next_steps to section_complete
REVERT: 0764b00 adding new content_type
REVERT: 6157c83 adding section complete button
REVERT: e648a46 Remove redundant $ sign
REVERT: 159a25c Merge branch 'mark/fix-project-seed-with-codename' into tristan_endofstep_logo
REVERT: 5429bd9 new titanic with id
REVERT: 9a1be7e updating the titanic proj
REVERT: 6ce2982 bug ix in step uid + print for one more bug
REVERT: 8000c87 fix uid generation in slide + print too
REVERT: 2f72d13 print in lesson
REVERT: 999e0c0 printing uid for easier debug
REVERT: 6850d22 actually we do need lesson links
REVERT: 1907b3f starting finish logo
REVERT: 7a98c63 Change the types of the keys for relationships
REVERT: 1bdc6e6 Comment out unused views
REVERT: 0464764 Fix up relationships and foreign key primary key shit
REVERT: 7844bf6 First project seed file fixes
REVERT: cb95407 Use slide_id as the order id
REVERT: d5c96da Add id methods for polymorphic relationship and add uid to slides
REVERT: 23c637c Fix step and move seeds temporarily
REVERT: 7a15996 Add lessons primary key
REVERT: e29109e Use uid for projects as the primary key
REVERT: e4959e2 starting end of step logo
REVERT: b2ca5d9 renaming intro R
REVERT: 981ab12 Make sure codename is unique
REVERT: 033053e Add codename to projects, can be null for now
REVERT: f50b42b Merge pull request #203 from teamleada/tristan_codename
REVERT: cfd217c Merge branch 'master' into tristan_codename
REVERT: 72dc540 Merge pull request #202 from teamleada/tristan_QA_mh
REVERT: 176096d Merge branch 'tristan_QA_mh' into tristan_codename
REVERT: 7dd86d8 Merge branch 'master' into tristan_QA_mh
REVERT: 87de86c adding codenames
REVERT: 3521443 Merge pull request #201 from teamleada/mark/projects-im-interested
REVERT: a6de223 Change 'take me the survey' to be a button
REVERT: 62dd6c8 Make the project circles bigger
REVERT: b2482d9 renaming test vectors
REVERT: 51fce5c disabling some proj
REVERT: be1bbfc ab testing false
REVERT: c0ef6a4 Remove blurb about waitlist
REVERT: ad58cd4 Fix small bug on sign up page
REVERT: c50397c If user has beta access, only show projects that are enabled
REVERT: 677baa3 Change logic for showing i'm interested button
REVERT: 95b9b20 Add projects link to the header
REVERT: 5fcee49 Allow anyone to see the projects
REVERT: c1e4330 mh removing webtest
REVERT: 365fe47 Take all users to projects page
REVERT: 7f5482d Merge pull request #199 from teamleada/mark/admin-projects
REVERT: fc5fba5 Add link to project on admin dashboard
REVERT: 7a79080 Add number of interested users to the projects
REVERT: dc3dc3d mh data matching done
REVERT: 9554e5d Show interest button if the project is not enabled
REVERT: 58553a9 Fix views so that cost_in_dollars shows dollar sign
REVERT: 4da58fa If cost is nill, it's cost is 0
REVERT: 43b3d6b Add project routes for admin
REVERT: a9adf5c Add views for admin projects and use cancan authentication
REVERT: e7e9093 Merge pull request #198 from teamleada/mark/organize-seed-files
REVERT: 4cd411a Move seed files into respective folders
REVERT: bed8278 Seed files for projects
REVERT: 688cacd Only load these seed files in development
REVERT: 9d2a3f1 mh cleaned up to initial ste up
REVERT: 8111207 mh clean up to analysis
REVERT: 2c3513b Merge pull request #197 from teamleada/tristan_QA
REVERT: 0d88c9f cleaned up bootcamp again
REVERT: b1b7795 intro QA complete up to comparison
REVERT: 47b2087 intro QA complete up to comparison
REVERT: 3d76fec r intro's intro fix
REVERT: d88088e revert back the devise
REVERT: 87957f0 Merge pull request #193 from teamleada/brian_titanic_bootcamp
REVERT: a4f0549 ?
REVERT: f9d9b72 Merge pull request #192 from teamleada/brian_titanic_bootcamp
REVERT: a41ae62 finish content
REVERT: 55f757a basic vis and if/else statements
REVERT: 9768015 visualizations
REVERT: 36babb9 fix comma
REVERT: 3cfa430 titanic bootcamp
REVERT: 21bfae8 Merge pull request #191 from teamleada/brian_projects
REVERT: b1e37a4 add submit button
REVERT: 75ead8b adding space for typo in student page
REVERT: ca1a41c Merge pull request #188 from teamleada/tristan_QA
REVERT: f6647be adding animation to the student/emlployer button ;)
REVERT: 23853d2 removing the join the revolution button
REVERT: a8635ce devise key
REVERT: c53a389 removing production seeding for users
REVERT: fdaf754 Annotate models
REVERT: 6610ebd seeding users in production too
REVERT: 4a54b51 Merge pull request #185 from teamleada/brian_website_edits
REVERT: 439f300 Merge pull request #184 from teamleada/tristan_deployment_proj
REVERT: 9a376e6 updating company sponsor
REVERT: c6b7f0e Merge pull request #183 from teamleada/tristan_deployment_proj
REVERT: c4ad36c period
REVERT: 1960590 added chris as user
REVERT: 24f7141 Merge branch 'master' into tristan_deployment_proj
REVERT: 0aaba20 adding paid to deployment
REVERT: 44b3cd3 Merge pull request #181 from teamleada/tristan_deployment_proj
REVERT: 71bcf2e adding the skeleton for the next proj 'deployment to cloud'
REVERT: ccdee9c Merge pull request #180 from teamleada/brian_mh_branch
REVERT: 388422f content
REVERT: e9b2736 updated mh project
REVERT: edf3ac1 Merge pull request #179 from teamleada/tristan_seed
REVERT: 4193398 anscombe intro cleanedup again, hopefully final
REVERT: 09e6f20 anscombe intro cleaned up to function()
REVERT: 459ec3e updated Mh project
REVERT: 8b3c127 anscombe intro matrix clean
REVERT: 39eeb3c ansbome bootcamp intro
REVERT: f961df9 Merge pull request #176 from teamleada/tristan_seed
REVERT: c591112 finished anscombe again
REVERT: dd750d8 proper-data-4 done
REVERT: 5d579fe anscombe cleaned up to proper-data-3
REVERT: ef7c822 updated mh seedfile
REVERT: ea9f258 starting anscombe cleanup
REVERT: 344ddc8 Merge pull request #174 from teamleada/brian_website
REVERT: e5fe7bd project descriptions
REVERT: acdae47 edits
REVERT: 7b58cf9 Merge pull request #173 from teamleada/tristan_front_end
REVERT: 12f9f2e combining brian's change in blurb
REVERT: a7acae4 final clean up
REVERT: 02659db Merge pull request #172 from teamleada/brian_website
REVERT: ebaccb8 student patge udpate
REVERT: 73dd7ef emplyer page update
REVERT: d392401 changed divider margin
REVERT: fcd38ae added student css
REVERT: 2e3dd52 added project descriptions and upcoming projects for waitlist
REVERT: 8aa3524 short description
REVERT: 43dec7f Merge pull request #171 from teamleada/brian_website
REVERT: d5fba6a small text changes to website
REVERT: efcb702 Resolved merge conflicts on about and home page
REVERT: 98ad1ae Only load users in development
REVERT: 10d0558 Admins don't have to pay
REVERT: 75a1937 Only load student test accounts on dev
REVERT: 5e6824b Merge branch 'master' of heroku.com:teamleada-stage
REVERT: 945a8b0 Merge pull request #166 from teamleada/mark/stripe
REVERT: 455e7a2 Fix up view if user has bought project. Completes #147
REVERT: 515d70f Use helper method for users buying projects
REVERT: 81bd690 Add helper method to see if user bought project
REVERT: c5f9e89 Fix up z-index for sidebar and header
REVERT: 3d9e0c3 Load and authorize resources in each controller
REVERT: f0cab8b Fix links on projects page
REVERT: cb994f6 Modify the sidebar links to the project steps
REVERT: d88a0f5 Fix links on content page
REVERT: 33c6e3e Use friendly ids and member do
REVERT: 2999b48 Give permission for lessons and steps
REVERT: c0ff423 Add friendly ids for lessons
REVERT: 8040e7e Add friendly id for steps
REVERT: 35ddf92 Use member for projects
REVERT: cba7639 Fix ability to block not purchased projects
REVERT: dd593e3 Let CanCan load users
REVERT: 6c1adbb CanCan takes care of loading the object
REVERT: d548841 Actually use friendly id for projects
REVERT: 66d5341 Use friendly id for projects
REVERT: 94dc1ef Fix charges controller
REVERT: 890ba49 Authorize resource except for auth_code
REVERT: 5473fd6 Seed file for codes
REVERT: 6ad2558 Add users seed file
REVERT: e50314e rails analytics gem init disabled
REVERT: bc4ad13 removing GA var
REVERT: ae794a3 removed google analytics gem
REVERT: d488bfd adding heap.js
REVERT: 945ba47 adding google analytics
REVERT: 531140c Fix stripe integration for projects
REVERT: 88cb381 Add forms css
REVERT: 037ac1a Add purchase path for projects
REVERT: b8d9090 moving heap out of raw views
REVERT: 5fa81c9 Show the stipe checkout button
REVERT: 810003d Add forms css file
REVERT: 982a024 Tweaking the charging method
REVERT: 0d89fa3 Add routes for purchases
REVERT: 7e0bcca Comment to refactor later
REVERT: 1698ead New method to view cost in dollars
REVERT: f8838f3 Use spaces, not tabs
REVERT: 7a07a4e Add transaction metadata
REVERT: 23ddc56 Add paid and cost to mighty hive project
REVERT: 6dc197a Add paid boolean to projects
REVERT: 79b57ac Add more info to a transaction
REVERT: dafb2f0 Fix create charge method
REVERT: f552bfb Set up relationships with transactions
REVERT: 4b8d87f Add transaction model
REVERT: 4d3bfdc Fix up create charges method
REVERT: b66cd30 Add cost to projects
REVERT: 7d9101a Add charges controller
REVERT: 2280327 Add stripe initializers config file
REVERT: 10e3be9 Add stripe gem
REVERT: f01cc0b Fix typos on the student page
REVERT: 56e9608 updating Greg's position to CTO
REVERT: 710e162 Merge pull request #165 from teamleada/tristan_student_access
REVERT: d2703f4 give access code on student page
REVERT: 715df71 Merge pull request #164 from teamleada/tristan_proj_access
REVERT: daf84f6 project page link to survey
REVERT: ff407ee Remove # from the url for projects
REVERT: 1804ddb Fix projects index page margin
REVERT: 3b5de63 Fix student page margin on bottom
REVERT: 4eeec03 Sidebar scrolls all the way now. Fix #155
REVERT: a098cd4 Fix show projects page
REVERT: 866d350 Add check for first lesson. Fix #132
REVERT: 6a0ff7c Fix up about page with positions
REVERT: 81fb36b Make the code form look nice
REVERT: 801923f Merge pull request #162 from teamleada/mark/remove-header-from-projects-page
REVERT: 7dc1b9b Add no-border class
REVERT: 0a97327 Only show border if it's not a large header
REVERT: 6cd78cc Add large_header to certain pages
REVERT: 4520dbe Merge pull request #160 from teamleada/mark/projects-has-submit
REVERT: 848d4eb Only show submit if it has a submission
REVERT: 4814da8 Add has_submit to projects
REVERT: 55c4c18 Merge pull request #159 from teamleada/mark/friendly-name
REVERT: 7a50035 Add load_and_authorize_user to users_controller
REVERT: 2c1d463 Add quiet assets gem
REVERT: 8502401 Load user by id now
REVERT: fe88673 Use regular user_path now
REVERT: f6d7876 Don't have to use param anymore
REVERT: 5db505f Add friendly url gem
REVERT: b3006f0 Show the users with access to the code
REVERT: ff94bd6 Fix after_sign_up_path
REVERT: 2c89a95 Merge pull request #158 from teamleada/mark/code-auth
REVERT: de3191f Store last location and redirect to on successful login
REVERT: f60dc1f Styling for student page
REVERT: 9a6de2d Fix admin codes page, and fix up the student page
REVERT: 9a111e4 Add users auth_code endpoint
REVERT: a6d1e6c Merge pull request #157 from teamleada/tristan_calendar
REVERT: cd03c49 Merge branch 'master' into tristan_calendar
REVERT: 0d80d1c route for tutor
REVERT: 33dacb4 employer page adding slide.js
REVERT: 9aa655d removed visible to modular
REVERT: 3659e5a adding the tutoring page
REVERT: f183e55 adding tutpring controller
REVERT: e7703f8 opacity adjust
REVERT: 8d88fb4 adding slide into a single file
REVERT: 8c27c71 modularizing slide css
REVERT: f408af5 removing slide css from home
REVERT: baad38a modulizing sliding
REVERT: cb0bba6 Add has_project_access method to check if a user has access. Fix #144
REVERT: dbb1f71 Fix full-container and generate random codes
REVERT: d4062e1 Generate random codes
REVERT: 2be3212 Add user_type and admin dashboard to header
REVERT: 6d9795e Establish relationships between users and codes
REVERT: ad7feaa Fix code db entry
REVERT: 180cf22 Fix button hover for projects
REVERT: 304d250 Fix sign in/up buttons
REVERT: f8270f3 Merge pull request #156 from teamleada/mark/student-page
REVERT: 6c85ffc Add blank method for telling if they have project access
REVERT: 2dd4e16 Add project modal with data. Fix #154
REVERT: 8464445 Load modal when project is selected
REVERT: e8ad4a2 Fix sign out message to be blue
REVERT: 9790b6b Fix margin on header
REVERT: 18c159f Use project-circle instead of img
REVERT: d9fbb34 Remove ihover and fix up project circles
REVERT: 36f8e9f Fix css on about and main page
REVERT: 0e1a622 Update flash messages to be nested in a container and fix log in page
REVERT: d946e45 Fix up about page. Fix ##150
REVERT: d2888d0 Merge pull request #152 from teamleada/tristan_analytics_integration
REVERT: f4e940f fixing merge conf for js logging removal
REVERT: a4fff0e Basic structure of student page
REVERT: 5985564 adding heapCode to steps/proj
REVERT: 9cd9ee1 adding .csv after changing in S3
REVERT: 2551ca3 Why were we loading the first project
REVERT: fc5c538 Merge pull request #149 from teamleada/mark/photo-header
REVERT: d92f043 New student path
REVERT: 15d645a Add size and industry options
REVERT: c90c4c7 Add validations for industry field and fix paths in header
REVERT: ffcccfc Fix home page paths and add text to employer page
REVERT: dbc88b1 Add employer applications controller
REVERT: 2942e25 Add employer applications views
REVERT: 01c3195 Add shared errors view for forms
REVERT: 10a2edc Add student endpoint
REVERT: a8bde66 Employer Application. Fix #145
REVERT: db7f942 Add employer page
REVERT: 404ea40 Smaller fonts on project page
REVERT: f52d5a9 Fix up animation on projects page
REVERT: 34ae0b1 Add short descriptions to projects
REVERT: 75bfd97 Hide if on lessons or steps
REVERT: 45e6168 Fix sign in/up buttons
REVERT: c248f1f Remove coming soon projects
REVERT: 575e978 Styling for home and projects page
REVERT: f4581a8 New header with large section with page title
REVERT: 057e7ab New home page with large header at the top
REVERT: ebd769a New projects page with fancy animations
REVERT: 4c6ffd1 I don't like committing libraries
REVERT: f6a2d01 Remove console.logs
REVERT: a9b0af9 Bootstrap overrides
REVERT: 58eb19b Remove home image
REVERT: 7580f29 Make the header not static
REVERT: 835759f more commenting out log
REVERT: e400f08 moved heap code to app.js
REVERT: fca9fdc Merge pull request #142 from teamleada/tristan_seed_fix
REVERT: 5a24cef adding id to signup button for heap analytics integration
REVERT: 789be7c adding heap data collection code
REVERT: a5d9ccc adding heap analytics logo
REVERT: 2297e58 seed works again
REVERT: cac2bca Merge branch 'master' into tristan_seed_fix
REVERT: 6c8485f slight clean up, anscombe
REVERT: c31cbef Merge pull request #141 from teamleada/mark/admin
REVERT: b56092d Remove beta_code spec
REVERT: 4fb3789 Add something to show view
REVERT: f8d2e1e Fix .error class
REVERT: 2077de8 Add validations for codes
REVERT: bfcc608 Add codes controller
REVERT: a29d3fa Add new and index views
REVERT: a33d2a5 Add routes for codes
REVERT: 007c001 Make simple_form use bootstrap
REVERT: 73bb64f Add user code
REVERT: cbdb25d Create code models
REVERT: 6137960 Add model for beta codes
REVERT: aeb1ae9 Add routes and link to admin dashboard
REVERT: df3f1ea Figure out if a user is an admin or not
REVERT: b2041c2 Add admin controllers for users and pages
REVERT: ba5f7c7 Add views for admin dashboard and users
REVERT: 4f918b7 Add role to users
REVERT: d8dd52c Add cancan abilities
REVERT: ea49379 Add CanCanCan
REVERT: 50c11be starting to clean anscombe prep
REVERT: e6d3b47 cleanup more bootcamp
REVERT: 4e4b74e Merge pull request #138 from teamleada/brian_mh_branch
REVERT: 48d6ced updated R bootcamp
REVERT: 03e2796 Merge pull request #137 from teamleada/tristan_seed_fix
REVERT: b4a25d3 adding second quiz to test
REVERT: a45b8d2 fixing to enable multiple quizzes
REVERT: d9191af changed class for spinner
REVERT: 27d17e8 removing extraneous lines from quiz
REVERT: 7ce4d45 Merge pull request #136 from teamleada/tristan_seed_fix
REVERT: 9408f6f add quiz in the reseed
REVERT: 5a863d4 fix seed link
REVERT: 9539a6f Merge pull request #135 from teamleada/brian_mh_branch
REVERT: 63b7691 skeleton and intro to seedfile
REVERT: 0757dee seedfile for project
REVERT: bd2b35b Merge pull request #134 from teamleada/tristan_fudge_around
REVERT: 2571761 removed routing spec test quiz
REVERT: 5104146 removing profanity from internal key
REVERT: dafe6ae bootcamp seed change to integrate one quiz
REVERT: c3116f7 removing todo comment in 000seed
REVERT: 7c5d991 deleted specs for quizzes views
REVERT: 456ce63 updated routes to reflect deleted views
REVERT: b5214ef deleted unneeded views
REVERT: 0bffa44 rename in quiz html
REVERT: f4a5efd css skeleton for quiz
REVERT: bbf69d3 some quizzes asset tune, not complete yet
REVERT: 3ca4dd5 quiz module working but UGLY
REVERT: 7ded126 removing the random seed
REVERT: 94e3953 loading gif
REVERT: 31dc7ce spinner css
REVERT: 45a3f9c add application css
REVERT: 1ba8229 quiz coloring works
REVERT: a3ad45b Merge branch 'master' into tristan_fudge_around
REVERT: f53d902 _quiz module javascript update
REVERT: aa7919d quiz controller functional
REVERT: 8d92d7e controller to check answer working
REVERT: fba5e0e added get get member for quiz model
REVERT: a631a3a quizzes view actually works
REVERT: 4a40b2c closig end issue
REVERT: ae48aae route update
REVERT: 65999eb quizzes db /seed
REVERT: 62da207 quizk controller/helper
REVERT: fccc569 added quiz model
REVERT: 8576d17 quizzes extra assert
REVERT: 80ed645 update to quiz query in content
REVERT: 0453580 quizzes view
REVERT: ef917c6 empty quiz specs addedd
REVERT: 44047ff adding spec for quiz
REVERT: 76e06f0 testing quiz print
REVERT: 4e47905 seed print clean
REVERT: ccab685 testing the quiz moddule i db
REVERT: 47bb83d Merge pull request #133 from teamleada/tristan_quiz_test
REVERT: b8b9ca9 change error message for projects#error
REVERT: c8ef0e7 controller refer to project error page now
REVERT: c2c4d61 page not found for pages#error
REVERT: 60e60af adding missing project error page
REVERT: 6021b3a project bug for no-proj found
REVERT: a8867ea added quiz slim
REVERT: d4d74b8 starting quiz
REVERT: 0631f40 Merge pull request #131 from teamleada/tristan_quiz_test
REVERT: 6c4ce15 adding quiz holder
REVERT: 0f932fb adding error color/share
REVERT: 3248cb0 adding video to app.js
REVERT: d45a117 fix video appear and error content
REVERT: cb35c1d fixing video/img appear
REVERT: 6a7de82 Merge pull request #130 from teamleada/Brian_seed_branch
REVERT: cf9a647 fixed merge
REVERT: 63529bd added submission help lesson
REVERT: b17a9b9 fixed lengthy train data text
REVERT: 9efb8cd Merge pull request #129 from teamleada/tristan_intro_fix
REVERT: 3c02e38 adding onboard to Rbootcamp
REVERT: bcca6df Merge pull request #127 from teamleada/mark/one-score-leaderboard
REVERT: 73ade95 Fix up the project submission
REVERT: 83788d8 Add methods for computing the updated score
REVERT: b77feb3 Merge pull request #126 from teamleada/mark/remove-intro-slide
REVERT: 68c2eea Remove the cover page from lesson content
REVERT: 2b94cc1 Remove the cover page on the step slides
REVERT: 10d1b16 Merge pull request #125 from teamleada/mark/end-of-steps
REVERT: 1d2c61d Display previous_step title
REVERT: f7ec3a9 Add example of previous_step
REVERT: a450cf0 Add previous_step option for content
REVERT: 8c0969a Merge pull request #124 from teamleada/mark/submission-csv
REVERT: 19c9de5 Check only filename
REVERT: 27da6f2 Add error checking for csv. Fixes #120
REVERT: d06474f Merge pull request #121 from teamleada/mark/project-submit-btn
REVERT: 74ebf0e Merge pull request #123 from teamleada/mark/rankings-on-leaderboard
REVERT: 503e3c6 Add rankings to the leaderboard, fixes #122
REVERT: 821b88e Small button fixes for the main page
REVERT: 7bcc798 Move submit button to a partial
REVERT: 9315368 Add submit partial
REVERT: 1830004 Merge pull request #119 from teamleada/mark/submit-error
REVERT: 612666b Return after redirect back so it doesn't error. Closes #98
REVERT: c9f6950 Add placeholder to email form
REVERT: 7fe4b39 Merge pull request #118 from teamleada/Brian_titanic_branch
REVERT: b0ee55a started to do small edits
REVERT: ee34f53 small edits to basic r bootcamp
REVERT: e88b2ee Merge pull request #117 from teamleada/tristan_seed_content
REVERT: c355fb5 bootcamp + anscombe_prep name change to prevent future bugs
REVERT: 53f6d4f content cleanup + name bug fix
REVERT: ac6a011 cleaningn anscomb_prep
REVERT: 91e8946 Merge pull request #116 from teamleada/mark/email-form-project-page
REVERT: a7ba892 Update interested_users_controller.rb
REVERT: 8e3d945 Update interested_users_controller.rb
REVERT: 3ae6ee6 Add styling to the form for interested_users
REVERT: 17ba4a7 Add interested user routes
REVERT: 8059c9f Add controller for interested_users and set up form
REVERT: d61f6ee Merge pull request #115 from teamleada/tristan_seed_content
REVERT: c96ccaa Add interested user model with email regex validation
REVERT: 7e68cb0 Add blank tests for interested users
REVERT: 354c62e Create interested users
REVERT: 3ca8505 fix width/height
REVERT: 42678c7 Merge pull request #114 from teamleada/mark/has-leaderboard
REVERT: 0eabc04 Enable leaderboard for titanic project, edit show view to hide if not enabled. Closes #107
REVERT: 3e656c2 Add has_leaderboard to projects
REVERT: 5b43832 Merge pull request #113 from teamleada/mark/embedded-youtube
REVERT: 935ccdf Fix content tag for videos
REVERT: 6d2ccdc YouTube -> Video
REVERT: 3d4b7ef Merge pull request #112 from teamleada/tristan_seed_content
REVERT: 265f1b9 Go back to using create, should not error
REVERT: 667f5bf small fix in seed so that it seeds
REVERT: ab6e988 Make the seed file re-runnable, fixes ##48
REVERT: d073c23 Set up projects slightly differently
REVERT: fc39fe3 Delete all projects first
REVERT: cca6001 Make the relationships dependent
REVERT: 49d0e3e Add youtube partial
REVERT: cceabc1 bootcamp clean
REVERT: 8d97a3e Remove instructions for setting up the blog
REVERT: 17820c3 Merge pull request #106 from teamleada/mark/get-rid-of-blog
REVERT: 7ffbd7c Fix up styling on 404 error page
REVERT: cca88ae Remove blog routes
REVERT: d9f2984 Remove submodule for blog
REVERT: 94bae0d Get rid of blog
REVERT: 44252f1 Merge pull request #105 from teamleada/tristan_interpreter_module
REVERT: 40517e7 actually going back to old tab...
REVERT: b1a16a5 fixing ugly tabs
REVERT: 846b690 a ghetto grader working
REVERT: 4e9bb07 small comment in genaws
REVERT: 9c98ed7 Merge pull request #103 from teamleada/Brian_anscombe_edits
REVERT: 3a53a54  edits
REVERT: e999f9b edits
REVERT: 64e54aa woops made edits to seed on master
REVERT: ea13e3c Merge pull request #102 from teamleada/Brian_titanic_seedfile
REVERT: 55669d6 seedfile and project guideline instead of description
REVERT: bee9a7d Merge pull request #101 from teamleada/Brian_titanic_seedfile
REVERT: fcdb10d small edits
REVERT: 0b4b7ca Merge pull request #97 from teamleada/Brian/titanic_seedfile
REVERT: b5e288b fixed Begin part to not be so shitty
REVERT: 288c1b2 Remove jquery
REVERT: 5b79fdc Merge pull request #95 from teamleada/tristan_front_slide
REVERT: 011a503 blog stuf
REVERT: ec23954 last bit to fix mobile view
REVERT: ba6671d removed unused visible.js
REVERT: 48dfb75 hide slides before transitino
REVERT: a614d1f css for fade/slide
REVERT: d82a4cf changed middle icon to fade
REVERT: ad6719e swapped icons locs for slide-in
REVERT: a343ad4 awkwardly slides
REVERT: fd353d9 Merge branch 'master' into tristan_front_slide
REVERT: f84391b Remove blog css folder
REVERT: f9fe068 slides-ish
REVERT: e1cf855 Merge pull request #94 from teamleada/mark/blog-with-layout
REVERT: b896b13 Updates for blog
REVERT: c623dd6 Move blog stylesheet
REVERT: ee4f88a Update blog with stylesheet
REVERT: 5cac69d Fix paths and update blog dir
REVERT: 563d5af Fix up rakefile and bump submodule
REVERT: 275afd1 Add blog routes
REVERT: ad53aa1 Add compiled blog directory
REVERT: 916f05a Remove old blog directory
REVERT: 7c54a34 gemfile issue
REVERT: 54c99c2 gemfile
REVERT: 49ac124 gefile.lock
REVERT: 1b9d152 Merge branch 'master' into tristan_front_slide
REVERT: 71197f5 Merge pull request #92 from teamleada/mark/add-blog
REVERT: d9930ef Initialize time zone constant in environment
REVERT: bd7cedb Merge branch 'master' into tristan_front_slide
REVERT: bdb6850 Merge pull request #93 from teamleada/tristan_seed_bootcamp
REVERT: 6cdb1fb anscombe_intro fixes deployable
REVERT: 867ff0c anscombe_intro finished function summary
REVERT: 676a409 anscombe_intro finished function plot
REVERT: 2e1e77e anscombe_intro finished function intro
REVERT: 7e57de2 anscombe_intro finished access dataframe
REVERT: 2e756d6 anscombe_intro finished access matrix
REVERT: 319bc48 anscombe_intro finished access intro
REVERT: 2e6b7bc anscombe_intro finished matrx+dataframe create
REVERT: 51370b9 anscombe_intro finished vector
REVERT: a003dc4 anscombe_intro finished slide one
REVERT: f85d284 Update blog -- remove favicon
REVERT: 6f724bf Add load_stylesheets method that renders css files
REVERT: 7a21262 Add 404 method and blog controller
REVERT: 6862956 Update blog -- add css directory
REVERT: 4bf492f Update blog
REVERT: cb0adde Once again, remove symlink, add back folder
REVERT: f2a8520 Add symlink to blog dir
REVERT: 2181ab9 Remove generated blog
REVERT: 091d084 Fix gitmodules file
REVERT: 5a28d75 Add blurb to readme for blog
REVERT: d69966e Combine tasks into a 'blog' task
REVERT: 5bdc68b Update blog and generate it
REVERT: 53d8081 Add blog back to static
REVERT: 1e087f2 Remove the blog temporarily
REVERT: d6649e4 Fix generate_blog command
REVERT: 89e9b18 Update rakefile and remove sym link
REVERT: b9f12a4 Add symlink for blog
REVERT: bb429ca Bump blog submodule
REVERT: ff75af8 Add jekyll gems
REVERT: 24503e9 Add rakefile for blog
REVERT: 7c2159d Add blog submodule
REVERT: 700a42a Messed up the submodule
REVERT: be4ec8c Fix submodule
REVERT: 2b7e75e Add blog as submodule
REVERT: 2bec4a8 Merge pull request #91 from teamleada/tristan_seed_bootcamp
REVERT: bd2e6bb fixing merge conf
REVERT: 2c4ca31 cleaned up, bootcamp deployable
REVERT: b53af9d finished rough bootcamp
REVERT: 41ac83c finished 'vetors'
REVERT: 11d90f4 intro started 'vectors'
REVERT: 05ec616 Merge pull request #89 from teamleada/mark/project-interest
REVERT: d85f868 Add project interest model
REVERT: f5fa60d Add 'I'm interested' button to project page
REVERT: d306ac7 Add routes for showing interest
REVERT: 015fa70 intro finished 'combined'
REVERT: f40fa43 intro finished 'comparison'
REVERT: 213ff5b intro finished 'assignment' and 'math'
REVERT: f5d8cca anscombe typo
REVERT: 063e4f9 changed link value
REVERT: 56df651 Fix collapse for projects page
REVERT: 56098c6 Remove collapse call
REVERT: 1eea662 Panel expansion for projects
REVERT: 798280f Add project link to header
REVERT: 601a8b0 Fix redirect on new registration
REVERT: 8576a33 Add project interest model
REVERT: 076130a Merge pull request #81 from teamleada/tristan_seed_anscombe
REVERT: fd89f47 anscombe bug fixes
REVERT: 1fdd974 anscombe finish + cleanup
REVERT: 9a2f7b3 anscombe post data 4 finished
REVERT: 2726d14 anscombe post_data_three + cleanup
REVERT: 33b7211 anscombe fix in lm analysis
REVERT: 5bdf865 anscombe proper post data 2
REVERT: 61dd38c anscombe lm comparison finished
REVERT: 4e41ce4 anscombe lesson starting lm comparison
REVERT: 0fbd99c Merge branch 'master' into tristan_seed_anscombe
REVERT: 58a0a39 finished data_pre seed
REVERT: 8c8608e first bit of anscombe seed
REVERT: c519f21 added break lines in titanic seed
REVERT: c8c5c37 Merge pull request #79 from teamleada/brian_branch
REVERT: ee3c87e seed file edits
REVERT: 07b029b Fix seed
REVERT: b946fb4 Merge pull request #77 from teamleada/mark/sidebar
REVERT: 4d555ab Add styling for sidebar
REVERT: 47a7532 Add html for sidebar
REVERT: d5c1e86 Add helper for active sidebar links
REVERT: 257acd4 Change name of some steps
REVERT: ae5746a Render content in the sidebar
REVERT: 11dec92 Add sidebar with margin for slides
REVERT: 5e25eea Render partial with the sidebar content
REVERT: ed73286 Add default order to slides
REVERT: b4eb5f5 Forgot closing parenthesis
REVERT: 5efbea1 Add database instructions
REVERT: 64f2ef0 Remove filler text
REVERT: f80be1d Merge pull request #74 from teamleada/brian_branch
REVERT: 4a4e716 Merge conflicts?
REVERT: d48eee8 Last first project fixes
REVERT: 627302c Fix more seed file
REVERT: ad6a321 Seed file is working
REVERT: 9332889 Fix more content
REVERT: 63b49be Fix up seed file
REVERT: dd068b5 Add error catching to blank submission
REVERT: 23555d5 Format code sections on the project
REVERT: 971570b Start to fix the seed file
REVERT: b055265 seedfile
REVERT: c14380e updated seed file
REVERT: 14c743a seedfile
REVERT: 2d94f39 updated seed file
REVERT: 43f2a63 Left justify everything except buttons
REVERT: 545ed81 Show text if on lesson or step
REVERT: 30426ce Merge pull request #73 from teamleada/mark/slide-model
REVERT: f0aa9a4 Make steps use slide model
REVERT: af13ffd Project page stylesheet changed
REVERT: f749003 Style the description field on the project page
REVERT: d851d25 Style the description field on the project page
REVERT: 220d58b Render the project content on the main page
REVERT: 2f1bcb3 Move project content to description, show on main page
REVERT: 414f47f Add polymorhpic parent relationship to slides
REVERT: c580fd0 Merge pull request #72 from teamleada/mark/hyphen-routes
REVERT: b173e8e Sign_up -> sign-up
REVERT: 96cb28d Remove old redirect in application_controller
REVERT: 182a349 Merge pull request #71 from teamleada/mark/redirect-on-sign-in
REVERT: 72b8084 Merge pull request #70 from teamleada/tristan_gen_aws
REVERT: 6833ad9 updating Gemfile.lock
REVERT: 2804893 added aws link gen script
REVERT: 924e348 added aws-gem
REVERT: aaa8925 Merge pull request #69 from teamleada/tristan_blog_link
REVERT: ded103c added blank _blog.html.slim
REVERT: f2a1fb2 added blog to header
REVERT: 6cd1c95 Merge pull request #68 from teamleada/tristan_redirect_fix
REVERT: 34b89d8 added todo
REVERT: 31d103f removing the prints
REVERT: 7ac26f1 redirect after signup/signin
REVERT: 682259b empty space
REVERT: 256b9d3 added visible jquery
REVERT: 66f3cb9 fades but looks like shit
REVERT: 92933e0 [broken] front page fade-load
REVERT: f9c2730 do we have jquery already?
REVERT: 9554b53 Merge branch 'master' into tristan_lessons
REVERT: f11ec18 Merge pull request #66 from teamleada/mark/ga-tracker-stage
REVERT: f9c14e1 Small tweaks to registrations controller
REVERT: 7e6cfbb Flash method css stylesheet
REVERT: 8587261 Add in flash method to the application controller
REVERT: 0eb4d2a Remove row for flash view
REVERT: 705287e Use sessions controller (our own)
REVERT: 937e0b9 Add sessions controller
REVERT: c65eb33 Change GA tracker to be environment variable
REVERT: 15a4805 Use full user variable instead of u
REVERT: 6d0e4ad Consistent font on the about page
REVERT: eef95ad Remove width on button container. Center the home page button
REVERT: eafc5c3 Center the home page photo
REVERT: 849622f Merge pull request #61 from teamleada/mark/mobile-views
REVERT: 3139b66 Projects page needs to import mixins
REVERT: a909081 Add page container
REVERT: ac6c195 Button overrides for the header
REVERT: 4a3146e Move screen sizes to mixins
REVERT: 1760779 Add flat button for just the header
REVERT: 6c6d9bd Remove fixed navbar on mobile
REVERT: 1bbd837 Add mixins stylesheet
REVERT: a943a60 upgrade ruby version
REVERT: 9e77e3b Fix collapse button for mobile
REVERT: db849a5 Merge pull request #60 from teamleada/mark/about-page-redesign
REVERT: 9f681a9 Mobile media queries
REVERT: 9b1a2e2 Move about styles to about.css.scss
REVERT: 9aee46b Fix up about page
REVERT: c993dc9 Add period on about page
REVERT: 7983f26 Fix professional typo on about page
REVERT: 5965f2e professinoal fix
REVERT: f4192ed Change text of button
REVERT: 1f34c73 Add exclusive text on sign up page
REVERT: 27866fc Change link on the home page
REVERT: 65490d9 Merge pull request #59 from teamleada/mark/new-front-page
REVERT: ee4c653 Add min height to container
REVERT: a1e91b6 Use hyphens instead of underscores
REVERT: fdf9bdb Left align text
REVERT: 6100d61 Css fixes for home page and adding animate library
REVERT: 58b6d1b More content addition on the home page and button now jiggles
REVERT: ee3715d Add css animate
REVERT: c6a10ee Remove old front page content
REVERT: b11a4af Add content sections to bottom of home page
REVERT: 2228cc7 Add trailing whitespace to welcome, user
REVERT: feedda7 Add footer partial
REVERT: f75fb54 Add footer stylesheet
REVERT: abdf3f4 Slim content for the home page
REVERT: 778a780 Change stylesheets for home page
REVERT: 485abf3 Add berkeley background
REVERT: 5a11b31 Change width of header in navbar
REVERT: 0b84d07 Add slide model
REVERT: 15920a9 fixing seed for grammar
REVERT: 8b62e3d added period in seed
REVERT: 5308e89 Merge pull request #58 from teamleada/tristan_seed_fix
REVERT: 9574f49 seed fix added data origin
REVERT: 641b9be Merge pull request #51 from teamleada/mark/reveal.js
REVERT: 35ac566 Change highlight to fragment
REVERT: 794406f Seed data again
REVERT: 218e72f Remove project link on analytics page
REVERT: 9fee920 Make link not invisible
REVERT: 6b6c05f Use main_lesson
REVERT: 04c3795 Add links to project page
REVERT: e6eb885 Wipe the leaderboard
REVERT: ba2f258 Load the buttons automatically
REVERT: 1df2dbf Load based on step or lesson object passed in
REVERT: 3d4afa9 Add project and step links to main page
REVERT: a988fcb Add reveal overrides
REVERT: 947f155 Load steps in presentation style allow step content to load next steps
REVERT: 70194c1 Grammar fix
REVERT: 52bde60 Set default progress bar to 0
REVERT: 84315de Add support to content to load links
REVERT: 5cd5a87 Add lesson links to project
REVERT: 7c2b9c6 Remove reveal theme in js and fix up line spacing in main.css.scss
REVERT: 38beaf7 Fix up sample lesson view
REVERT: 453d257 Remove surrounding container
REVERT: f94f663 Force sprockets to use 2.11.0 per: http://stackoverflow.com/questions/22426698/undefined-method-environment-for-nilnilclass-when-importing-bootstrap-into-ra
REVERT: fc0ca04 Sample lesson page
REVERT: 65742aa Fix gemfile with compiling assets and slim templating
REVERT: 06432d8 Add sample fragments view for a project
REVERT: 9110816 Add reveal.js stylesheets
REVERT: 24585df Add reveal js
REVERT: 22e1165 Add rails-reveal-js
REVERT: 739155e Merge pull request #53 from teamleada/mark/submission-system
REVERT: 3a0c83c Redirect to the project page on a successful submission
REVERT: afceb42 Fixes for project upload csv submission
REVERT: 42b4823 Add route for submitting
REVERT: fb8a69f Remove line for after submission
REVERT: 0fcca5c Add flash messages
REVERT: 9c8d664 Require user to sign in
REVERT: 4c9b9ee Merge pull request #52 from teamleada/mark/footer
REVERT: 641a3ad Add footer partial
REVERT: 74c69bb Styling the footer
REVERT: 585db68 Add a period
REVERT: 25b5f19 Merge pull request #50 from teamleada/mark/minor-fixes
REVERT: a258a1d Change link to go to welcome screen. Fix #33
REVERT: 23cfde8 Update readme with correct markdown links
REVERT: 453c1ee Fix indentation
REVERT: 3a41953 Merge pull request #47 from teamleada/tristan_about_page
REVERT: 8d8103f reword data analytic project
REVERT: 8236625 insert divier in front html
REVERT: f563538 adding divier for front page
REVERT: 6304712 text change for trial button
REVERT: b283e9c added trial-button, and modified style like Brian wanted
REVERT: ffb8673 moved trial-button to home.css.scc
REVERT: 1241616 404 change in print
REVERT: 69eceea fix allignment front page
REVERT: a4ed07a Merge pull request #45 from teamleada/brian_front_end
REVERT: f752673 Merge pull request #46 from teamleada/tristan_about_page
REVERT: 3a56c2c handbook link now opens new tab
REVERT: ff0523a updated frontpage resume part
REVERT: 1120878 trial button
REVERT: 1889a56 Merge branch 'master' of https://github.com/teamleada/teamleada.com into brian_front_end
REVERT: 1e18d4d updated project page
REVERT: 7664bce reduced c_tree image, made content less wordy
REVERT: ef77bf4 Merge pull request #41 from teamleada/tristan_about_page
REVERT: e47370a better styling in about page
REVERT: 1f20694 added more classes for about page
REVERT: 2f2827e Merge branch 'master' of https://github.com/teamleada/teamleada.com into brian_front_end
REVERT: 1dda0f2 adding the scss for about page
REVERT: 3f3b0bb Update Greg's Pic path
REVERT: 753a70a added Greg's Pic
REVERT: d88e0eb rename headshot images
REVERT: 7d18a47 added about page
REVERT: 864e9f5 moved hal's css
REVERT: 9f7bcb3 added headshot css
REVERT: 76790e5 logo
REVERT: 0e44962 relocate Hal-quote css
REVERT: e0a7b1e removed brightness, looks better
REVERT: 2b1bf53 added mission statement
REVERT: 69a5a3f changed phrasing for last content in main
REVERT: 0176adf Merge pull request #40 from teamleada/tristan_about_page
REVERT: b602383 front page refer to correct img
REVERT: d056495 renamed capital
REVERT: 78e7fc4 renaming and removing background images
REVERT: d123e3f Merge branch 'master' into tristan_about_page
REVERT: c48bd5f referring new background
REVERT: a44d8d0 Merge pull request #39 from teamleada/brian_front_end
REVERT: 61cb25f image
REVERT: 2625b16 scaled image
REVERT: ba81b69 Merge pull request #38 from teamleada/brian_front_end
REVERT: 54503a6 added text in frontpage
REVERT: a2edfdc Merge branch 'master' of https://github.com/teamleada/teamleada.com into brian_front_end
REVERT: ee1dbca dec res of images
REVERT: 7d2ce7f Merge pull request #37 from teamleada/tristan_about_page
REVERT: e79d01d removed try our project div at the end
REVERT: e214940 changing back flat button, didn't know it was used elsewhere
REVERT: b637ab9 changed try button class to standalone
REVERT: ccbc21a changed font size/transform
REVERT: 8685bc3 getting rid of shade and border frontpage
REVERT: 0e8efdf main page cleanup
REVERT: 5ef719b added Lusitana font load
REVERT: a4d10ae added image css and title border
REVERT: e27f7df front page css customized
REVERT: 3d094dd added icon class
REVERT: a1676c2 addd background image
REVERT: 7c140f5 Merge branch 'master' of https://github.com/teamleada/teamleada.com
REVERT: 770c737 Merge pull request #32 from teamleada/tristan_misc_fix
REVERT: 2a04bb6 Merge branch 'master' of https://github.com/teamleada/teamleada.com
REVERT: 505b7f4 typo front page
REVERT: 11c9404 Merge pull request #36 from teamleada/brian
REVERT: 7332eff add images for frontpage
REVERT: b7a2a2b changed seed to reflect img/link
REVERT: e020df6 link and img works in _content
REVERT: 516c419 css for content-image and content-link
REVERT: 229ae41 added new content support
REVERT: cff5191 added img names in seed, with type='image'
REVERT: fb1e974 added image/link in share/_content
REVERT: 2451182 seed file doesn't show html link, changing to original
REVERT: 6c20e50 added download dest
REVERT: b33b14e added classification_tree
REVERT: a0761f2 adding set_cwd
REVERT: 71fb13c Merge pull request #31 from teamleada/tristan_404
REVERT: 9a76031 removed unused code for route in AppCtrller
REVERT: 263fdf4 removed unsused class
REVERT: 6fd05b8 finalized poem
REVERT: e97afc6 changed poem color / font
REVERT: 5b337a9 lol dat font tho
REVERT: 756a256 added 404 in routes
REVERT: f4cc182 cleaned up 404 page
REVERT: d6ed4c0 trying out different route/rescue in app cntrl
REVERT: d41ad1e added 404 poem
REVERT: 428be2e Merge pull request #29 from teamleada/tristan_highlight
REVERT: 8afbe62 Restoring deployments link in readme.
REVERT: 90e15b0 adding import for highlight in application.css
REVERT: 81d08f7 rename highlight.css
REVERT: 93dc5a6 adding the highligh code
REVERT: 3189898 Merge branch 'master' into tristan_highlight
REVERT: cd7ae12 removing 2nd deployment
REVERT: 77a646f adding http://
REVERT: 871ddb6 Update readme.md
REVERT: 2e0852f Bundle update gems
REVERT: 2cfb6b7 Merge pull request #27 from teamleada/mark/progress-bar
REVERT: 0aff5c2 Merge pull request #26 from teamleada/tristan_heroku_fixes
REVERT: a9237f1 removing more commented out tokens
REVERT: 4b548ad clean up mess for secrets
REVERT: 1dae4d9 secret token update
REVERT: 90e6f79 needs base too?
REVERT: 6ea7869 forgot to change the title in secret
REVERT: c8906f7 changed secrets to existing key
REVERT: b54c2c6 added secrets.ylm
REVERT: 8ca5d30 CSV should be csv for heroku
REVERT: d9c237b Merge pull request #25 from teamleada/brian
REVERT: 2cf9981 images for about page
REVERT: 4b1e9dd updated seedfile, edited text on landing page, and added image assets for about page
REVERT: 858c0c6 changing back some dumb typos
REVERT: 6d4e2f1 line to check correctness
REVERT: e56877a added highlight?
REVERT: 3b4d5f4 empty line
REVERT: 3463e6e adding highlight script in page
REVERT: 5543fe3 small typo in seed
REVERT: 7176069 adding highlight
REVERT: 6bcf9aa Add hard coded progress bar to project page
REVERT: 8f187c4 Go to first project page instead of first lesson
REVERT: 4c1a957 Update gems
REVERT: 068f099 Home page front-end stuff
REVERT: d843111 Steps now require other steps
REVERT: 775a2d7 Change solution file name
REVERT: 4438810 Change RequiredStep to StepRequirement
REVERT: 8a4aef1 Add required_steps and dependent_steps
REVERT: 03f7da9 Add required step model
REVERT: 303abda Fix email regex
REVERT: d60e735 Validate username
REVERT: 511310b Add completed_points to the user
REVERT: 4177c3f Establish relationships for step_status
REVERT: 32fad32 Add blank step status model
REVERT: e036759 Add total points method
REVERT: e5122e6 Add points to steps and create step status
REVERT: bf6c5b5 Merge pull request #16 from teamleada/brian
REVERT: ae70832 updated front page
REVERT: 5257f8b Merge pull request #15 from teamleada/seed_update
REVERT: bc383c5 updated content
REVERT: 2d11477 updated seed + multiple steps from another step
REVERT: dc6dcc9 updated seed
REVERT: cb440a0 Merge pull request #13 from teamleada/mark/users-log-in
REVERT: ed25772 Add badges and friends
REVERT: 2f674ce Add projects to the user profile
REVERT: d2bb4d9 Find users by username
REVERT: 77b6d3f Add registration views for sign up
REVERT: c61f257 Make devise use registrations and separate users controller
REVERT: 7b6cfbe Misc javascript fixes
REVERT: 0c2c4f9 Autoload lib folder
REVERT: ae947a2 Add sign in and sign up views
REVERT: ccd26cc Add users controller
REVERT: 98938fa Finally got devise to work with my routes
REVERT: 3b0b022 Tristan forgot an end
REVERT: 8bdb662 Merge pull request #12 from teamleada/mark/leaderboard
REVERT: e837346 Default scope for submission
REVERT: 8ce5465 Add leaderboard partial
REVERT: 0cfd0e8 Fix up seed data
REVERT: 1f23ca3 Add username to form for signing up
REVERT: 47e6ebf Make usernames unique
REVERT: b9779dc Projects and Submissions are related
REVERT: be50a52 Add test user, mark
REVERT: 0ba5af6 Leaderboard view
REVERT: 11fdbac Add username to users
REVERT: e0a5992 Merge branch 'master' of https://github.com/teamleada/teamleada.com
REVERT: 4ed5b43 filled check_submission function
REVERT: b1ac454 Add leaderboard and submission
REVERT: 13f629b Update readme with seed instructions
REVERT: dadb444 Merge pull request #11 from teamleada/mark/check-solutions
REVERT: 0c3629e Add check_submission to the projects controller
REVERT: c5c3d6b Correctly load the solution file
REVERT: 11413c4 Stub for checking a submission
REVERT: 9fa8c41 Add number to projects
REVERT: d372953 Add project 001 solution
REVERT: 7e09392 Merge pull request #10 from teamleada/mark/user-sign-in
REVERT: 211822f Add container to main page
REVERT: 22c3e02 Nice looking views for sign in, sign up, reset password
REVERT: 08046ab Add user stylesheet
REVERT: 3a04ffc Add simple_form locales
REVERT: 1d131ea Add bootstrap simple_form support
REVERT: 5c07dd2 Add form template
REVERT: b9076ac Custom views for sign in and sign up
REVERT: e9bb927 Use custom views
REVERT: 94ea16c Add user views using devise
REVERT: 67af494 Migrate to add users table to db
REVERT: 5038eee Add devise users
REVERT: e684891 Merge pull request #8 from teamleada/mark/project-index
REVERT: f5d3835 Larger font for content blocks
REVERT: 002b182 Add more margin to titles
REVERT: 14e395f Restructure index method and show the disabled 'coming soon' projects on the index page
REVERT: 393d6ad Add disabled list-group-item
REVERT: 87517ba Enable index for projects
REVERT: 3a533ff Add index and @projects
REVERT: 6dbc19e Add index view of projects
REVERT: bc9127d Add enabled to projects
REVERT: 4e2ade3 Merge pull request #7 from teamleada/mark/more-developed-project
REVERT: 8ffeadf Complete step loaded with code snippets
REVERT: aa1ca96 Load local variables in the partials
REVERT: 819180e Serialize lesson and step content
REVERT: 56a6fc7 Add content partial
REVERT: 4ad7662 More seed data and content is now an array
REVERT: c88abd3 More hidden elements displayed on fadeIn
REVERT: 7fc1ca6 New seed data
REVERT: 5d7b95d Edit the lesson partial to include lazy loading the content
REVERT: 4c31e80 Add paragraphs method to content
REVERT: 6ca78e2 Add in hidden lessons and steps
REVERT: 9fd52f5 Small tweaks to the show views
REVERT: 4178b53 Add step partial and format titles
REVERT: d7e03e8 Move individual lesson to a partial
REVERT: a4da151 Fix flat-button hover
REVERT: e6dcf46 Organize and separate stylesheets
REVERT: a27b7c2 Link to the first lesson of the first project
REVERT: bc8fa2f Add new relic config file
REVERT: 34c29b7 Add new relic
REVERT: 409992f Merge pull request #6 from teamleada/mark/small-fixes
REVERT: 1f09eaf Change the colors of the home page
REVERT: 0532ad8 Typo on home page
REVERT: ef2f28e Add handbook link
REVERT: 75dd34b Remove test and handbook pages
REVERT: 1f66f6e Merge pull request #5 from teamleada/mark/step-views-with-code
REVERT: 73d1fbd Edit show methods to work on urls
REVERT: 78c83f2 Load based on urls instead of ids
REVERT: 1829a17 Edit step urls
REVERT: 4e1c2b4 Move seeds out to a new project
REVERT: db2d277 Removed blank stylesheets and created main
REVERT: 80f2daa Set urls for lessons and steps, change seeds file to load from individual files
REVERT: 0902c78 Change page title to Leada
REVERT: ca7a78a Change home page title to Leada
REVERT: 9944c79 Change name in readme
REVERT: d253199 Change app name to TeamLeada
REVERT: 43c7174 Add rails-rename and simple_form
REVERT: ffc3cf8 Merge pull request #4 from teamleada/mark/add-next-steps
REVERT: c695a42 List view for lessons and more seeds edits
REVERT: 0343ef3 Add testing data content
REVERT: f4c34cd Add training data steps
REVERT: 98512da Add back button to steps and lessons
REVERT: 5d58754 Add back button, pointer to lesson or previous_step
REVERT: f0c862b Add title to steps and get previous_steps
REVERT: 4637d5f Merge pull request #3 from teamleada/mark/add-lesson-model
REVERT: 3d448f4 Modify seeds to expand into more steps
REVERT: 16d0840 Misinterpreted the steps
REVERT: 0be5cc5 Add project show view
REVERT: 219a48a Add show methods for lessons and steps
REVERT: 0a39a93 Add paragraph method for lesson content
REVERT: 7c8cf2a Add link to first project on home page
REVERT: 443c85c Fix seeds file for multiline content
REVERT: dab7dc6 Add more routes for lessons and steps
REVERT: 8495f42 Add views for lessons
REVERT: 6eec112 Add lessons and steps controllers
REVERT: 902e2f0 Add relationships to the lesson, project, and step
REVERT: 0e8a57b Add first lesson and steps
REVERT: c8842a9 Add steps and previous/next lessons
REVERT: 1249ba4 Add r-fiddle and test page
REVERT: 438ef42 Merge pull request #2 from teada-me/mark/add-project-model
REVERT: 12c5f8b Add projects controller
REVERT: bdcb6e5 Add before_create to make the url
REVERT: 885178f Add url to projects and add corresponding routes
REVERT: e43a36b Add project model
REVERT: c6e23d6 Merge pull request #1 from teada-me/contentadd
REVERT: fa36044 Fix up the content sections with right photos
REVERT: d7d9fcf updated content
REVERT: 2dc8378 updated content
REVERT: 56246d0 Add handbook static page and active_li_link helper
REVERT: 1135815 Add about page with blank content
REVERT: 400e474 Move bootstrap_overrides out from partials to be separate entity
REVERT: 944fc2a Add google analytics tracker
REVERT: c23e37f Add config sass file and new colors
REVERT: b69d8df Remove typed for now and add content to home page
REVERT: 73be885 Swap schedule for try button
REVERT: dd9a841 Add filler image
REVERT: 192306b Rename main.css.scss to pages.css.scss
REVERT: 253011a Add setup instructions to the readme
REVERT: 7f7eb48 Remove vendor, test, and log directories from git
REVERT: 612ff2c Fix typo in typed.js
REVERT: 86cd354 Add typed.js
REVERT: bf0d1f9 Convert css to sass and add bootstrap overrides file
REVERT: c748a19 Add colors sass file
REVERT: 8c8a009 Add header links for the home page
REVERT: 6bb8247 Add navbar to the header
REVERT: 79888b0 Add home page
REVERT: b3b9540 Add sample database.yml file
REVERT: db369e9 Convert application.html.erb to slim
REVERT: 61bc5e8 Add pages controller
REVERT: 6c74acb Clear out comments in the routes file, add home page
REVERT: a4df706 Compile assets in production
REVERT: cc4a06b Add a ton of gems
REVERT: f078a68 Add schema.rb (blank for now)
REVERT: 51449ee Add gitignore for rails app
REVERT: fa35f22 Add initial Rails 4.0 app
REVERT: 911457e Add readme

git-subtree-dir: scripts
git-subtree-split: 258a95ef6b513f23ff8cc959236d9641cba32141
Merge commit 'ff047bf9e618e6f7990d4ef54ec284a847b8b2b5'
Squashed 'app/assets/stylesheets/primary/' changes from 3771981..20a61d9

20a61d9 Add blank base.scss file

git-subtree-dir: app/assets/stylesheets/primary
git-subtree-split: 20a61d916ad5fb9375a1c7bb7978f10a0a8ea5e2
Merge commit '17f68df9c5cc61d73d70a80e30ee34f3e400358c'