Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MEAN Stack I - Lyle, Hollis (final) #18

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open

MEAN Stack I - Lyle, Hollis (final) #18

wants to merge 97 commits into from

Commits on Oct 6, 2015

  1. write draft of semantic html

    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    c45656c View commit details
    Browse the repository at this point in the history

  2. Add initial file structure

    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    fd662bd View commit details
    Browse the repository at this point in the history

  3. add html for social media icon surrounding image

    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    c8445f9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from hollislau/file-structure 

    Add initial file structure
    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    730927e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/hollislau/mean-stack-1 in… 

    …to ls-initial
    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    1fcf226 View commit details
    Browse the repository at this point in the history

  6. Add main.css file

    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    403e2eb View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2 from hollislau/ls-initial 

    add draft index.html
    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    b173ee6 View commit details
    Browse the repository at this point in the history

  8. Add file placeholders

    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    022fe34 View commit details
    Browse the repository at this point in the history

  9. refactor semantic elements in html

    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    630b53a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'file-structure'

    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    60a98b7 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #4 from hollislau/file-structure 

    Add file placeholders
    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    5dae46a View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/hollislau/mean-stack-1 in… 

    …to ls-initial
    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    52de00a View commit details
    Browse the repository at this point in the history

  13. Merge pull request #5 from hollislau/ls-initial 

    Refactor semantic HTML elements
    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    f9e1886 View commit details
    Browse the repository at this point in the history

  14. remove uneccessary parts of HTML, continue refactor

    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    f7bba09 View commit details
    Browse the repository at this point in the history

  15. Add utility files and icons to file structure

    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    9e72c73 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #6 from hollislau/ls-initial 

    remove uneccessary parts of HTML, continue refactor
    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    c5023c5 View commit details
    Browse the repository at this point in the history

  17. Resolve merge conflicts

    @hollislau
    hollislau committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    144cc0d View commit details
    Browse the repository at this point in the history

  18. Merge pull request #7 from hollislau/file-structure 

    Add utility files and icons
    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    96063b7 View commit details
    Browse the repository at this point in the history

  19. refactor header in main content article HTML, refactor social media i… 

    …con area HTML
    @LyleCharlesScott
    LyleCharlesScott committed Oct 6, 2015
    Configuration menu
    Copy the full SHA
    4625546 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. add variables for colors, small HTML modifications

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    27e4134 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from hollislau/ls-initial 

    add color variables, remove all caps from HTML so we can do it with SCSS
    @hollislau
    hollislau committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    67aff48 View commit details
    Browse the repository at this point in the history

  3. Add additional file structure and some component styling

    @hollislau
    hollislau committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    19fa88b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'sass'

    @hollislau
    hollislau committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    380d4cd View commit details
    Browse the repository at this point in the history

  5. Merge pull request #9 from hollislau/sass 

    Add additional file structure and basic component styling
    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    b4ea9f4 View commit details
    Browse the repository at this point in the history

  6. commit before merge, expect package.json conflict

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    b1525a2 View commit details
    Browse the repository at this point in the history

  7. merge conflicts resolved

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    764e60d View commit details
    Browse the repository at this point in the history

  8. create button presentation style

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    0b515fa View commit details
    Browse the repository at this point in the history

  9. Merge pull request #10 from hollislau/ls-initial 

    add button presentation styles
    @hollislau
    hollislau committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    20aa25b View commit details
    Browse the repository at this point in the history

  10. Add variables for typography; add base and reset styles

    @hollislau
    hollislau committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    fc83500 View commit details
    Browse the repository at this point in the history

  11. a lot of sass added to variables file

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    61797b1 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #11 from hollislau/typography 

    Add variables for typography; add base and reset styles
    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    83b00a9 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into ls-initial

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    890e9a8 View commit details
    Browse the repository at this point in the history

  14. last pull request successful, synchronizing

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    aceacd8 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #12 from hollislau/ls-initial 

    Add many scss elements, WIP fixing typography
    @hollislau
    hollislau committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    8e291e9 View commit details
    Browse the repository at this point in the history

  16. WIP continuing to format content with sass

    @LyleCharlesScott
    LyleCharlesScott committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    f8a0866 View commit details
    Browse the repository at this point in the history

  17. Add social icon components

    @hollislau
    hollislau committed Oct 7, 2015
    Configuration menu
    Copy the full SHA
    9496399 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2015

  1. WIP continuing to format content with sass

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    9695a8c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into resolve-conflict

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    dafe3fe View commit details
    Browse the repository at this point in the history

  3. Add functioning express server and interactivity with mongodb

    @hollislau
    hollislau committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    4cdbd16 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into express

    @hollislau
    hollislau committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    d803362 View commit details
    Browse the repository at this point in the history

  5. Modify server.js file to remove unnecessary routing

    @hollislau
    hollislau committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    f51329c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #13 from hollislau/social-contacts 

    Add social icon components
    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    7f4effa View commit details
    Browse the repository at this point in the history

  7. WIP continuing to format content with sass

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    5dc7a8f View commit details
    Browse the repository at this point in the history

  8. resolve merge conflicts

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    687cb07 View commit details
    Browse the repository at this point in the history

  9. finish basic typesetting

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    4e26813 View commit details
    Browse the repository at this point in the history

  10. finish basic typesetting

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    c300e5b View commit details
    Browse the repository at this point in the history

  11. most basic of angular app is working

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    6301f52 View commit details
    Browse the repository at this point in the history

  12. angular app working with an array of objects.

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    f98ca85 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #14 from hollislau/resolve-conflict 

    Resolve minor conflicts, add typesetting throughout.
    @hollislau
    hollislau committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    479c20e View commit details
    Browse the repository at this point in the history

  14. Merge pull request #15 from hollislau/express 

    Add functioning express server and interactivity with mongodb
    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    6434dfd View commit details
    Browse the repository at this point in the history

  15. commit changes before merge to resolve conflicts

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    e610d05 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/hollislau/mean-stack-1 in… 

    …to resolve-conflict
    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    d06288f View commit details
    Browse the repository at this point in the history

  17. resolve merge conflicts

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    9fbbdb7 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #16 from hollislau/angular 

    Add some angular functionality
    @hollislau
    hollislau committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    fb601e6 View commit details
    Browse the repository at this point in the history

  19. WIP refactor sass

    @LyleCharlesScott
    LyleCharlesScott committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    a691292 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2015

  1. try to make an input form

    @LyleCharlesScott
    LyleCharlesScott committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    af081f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2015

  1. Modify file structure to align with best practices; 

    add initial form controller and services
    @hollislau
    hollislau committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    ede1917 View commit details
    Browse the repository at this point in the history

  2. Modify file and gulp structure to split up gulp tasks; 

    add watch task for all js files
    @hollislau
    hollislau committed Oct 11, 2015
    Configuration menu
    Copy the full SHA
    4c558d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2015

  1. Add html to watch task

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    c4bc83c View commit details
    Browse the repository at this point in the history

  2. contine trying to make form work, WIP. Add adjustments to layout

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    6df0263 View commit details
    Browse the repository at this point in the history

  3. Add functionality to post to and make calls from database

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    aed6021 View commit details
    Browse the repository at this point in the history

  4. Add navigation back to home page

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    9c17641 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #17 from hollislau/angular-crud 

    Add functionality to post to and make calls from database with Angular
    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    f1297f2 View commit details
    Browse the repository at this point in the history

  6. WIP add layout adjustments.

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    7c82b17 View commit details
    Browse the repository at this point in the history

  7. Add compiled view files to gitignore

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    3d24f42 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #18 from hollislau/angular-crud 

    Add compiled view files to gitignore
    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    c627be4 View commit details
    Browse the repository at this point in the history

  9. merge conflicts resolved

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    cdca606 View commit details
    Browse the repository at this point in the history

  10. Add editing and deleting functionality; 

    remove comments and unnecessary files
    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    f848ec3 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #19 from hollislau/angular-crud 

    Add editing and deleting functionality;
    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    4d6aaa5 View commit details
    Browse the repository at this point in the history

  12. merge conflicts resolved. add formatting elements.

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    bd5a481 View commit details
    Browse the repository at this point in the history

  13. finish basic typesetting

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    1de6468 View commit details
    Browse the repository at this point in the history

  14. finish new typesetting for forms

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    b5b300b View commit details
    Browse the repository at this point in the history

  15. Add jshint and csslint gulp support

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    a8b954c View commit details
    Browse the repository at this point in the history

  16. Remove public views folder to clean up Github repo

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    81f44c7 View commit details
    Browse the repository at this point in the history

  17. Add public views folder to gitignore

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    dd50295 View commit details
    Browse the repository at this point in the history

  18. Resolve merge conflicts

    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    63fcfd5 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #20 from hollislau/angular-merge 

    Add visual elements to all views for consistency.
    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    fd9de78 View commit details
    Browse the repository at this point in the history

  20. WIP add vendor prefixes.

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    204e451 View commit details
    Browse the repository at this point in the history

  21. modify gitignore to remove public files from github

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    20a37a8 View commit details
    Browse the repository at this point in the history

  22. modify gitignore to remove public files from github

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    8848c48 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' into vendor-prefixing

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    60b6390 View commit details
    Browse the repository at this point in the history

  24. modify gitignore to remove public files from github

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    30fbaf7 View commit details
    Browse the repository at this point in the history

  25. modify gitignore to remove public files from github

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    cbf3afa View commit details
    Browse the repository at this point in the history

  26. final updates to layout, linting

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    5103244 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #21 from hollislau/angular-crud 

    Add jshint and csslint gulp support
    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    88c5dcf View commit details
    Browse the repository at this point in the history

  28. Merge branch 'master' of https://github.com/hollislau/mean-stack-1

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    9cd2406 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' into vendor-prefixing

    @LyleCharlesScott
    LyleCharlesScott committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    7378286 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #22 from hollislau/vendor-prefixing 

    Final version, ready for submission
    @hollislau
    hollislau committed Oct 12, 2015
    Configuration menu
    Copy the full SHA
    2496177 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2016

  1. Cleanup extraneous code and files; 

    adjust button layout to respond properly to screen resizing;
update readme file;
    @hollislau
    hollislau committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    10172c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from hollislau/cleanup 

    Cleanup extraneous code and files;
    @hollislau
    hollislau committed Jan 28, 2016
    Configuration menu
    Copy the full SHA
    4bdbb5e View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2016

  1. Remove blog comments functionality due to improper implementation; 

    remove CSS linter from gulp watch and default tasks;
update readme file with instructions to install app;
minor fixes to blog form and header layout
    @hollislau
    hollislau committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    a07c758 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #24 from hollislau/adjust-model 

    Remove blog comments functionality due to improper implementation;
    @hollislau
    hollislau committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    3502803 View commit details
    Browse the repository at this point in the history

  3. Update readme file instructions for better clarity

    @hollislau
    hollislau committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    a71cdfc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #25 from hollislau/adjust-model 

    Update readme file instructions for better clarity
    @hollislau
    hollislau committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    fe4e2c8 View commit details
    Browse the repository at this point in the history

  5. Update readme file with app screenshots

    @hollislau
    hollislau committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    10d2e1a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #26 from hollislau/adjust-model 

    Update readme file with app screenshots
    @hollislau
    hollislau committed Mar 3, 2016
    Configuration menu
    Copy the full SHA
    5486285 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2016

  1. Update package.json with angular and node version; 

    add .node-version file to .gitignore
    @hollislau
    hollislau committed Mar 28, 2016
    Configuration menu
    Copy the full SHA
    8c859aa View commit details
    Browse the repository at this point in the history