Squashed 'scripts/' changes from f8f5f23..1b0af21

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

git-subtree-dir: scripts
git-subtree-split: 1b0af21e7157b4ef9eaabfbdd0acacb5b600dd5f
Merge commit '6fc8355dfcaff718f4d4da00225fc7e81f02a6c8'