Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

Brian, Chris, & Alina FINAL Github Gist Project #5

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

Brian, Chris, & Alina FINAL Github Gist Project #5

wants to merge 58 commits into from

Commits on Oct 13, 2015

  1. Refactor week 6 project into new file structure

    @toalina
    toalina committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    0e00663 View commit details
    Browse the repository at this point in the history

  2. Continue refactor of Week 6 project, removed Node Express server and … 

    …MongoDB features
    @toalina
    toalina committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    4179590 View commit details
    Browse the repository at this point in the history

  3. Add gulp html task

    @toalina
    toalina committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    ae096af View commit details
    Browse the repository at this point in the history

  4. Rename /templates to /html

    @toalina
    toalina committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    c749ad2 View commit details
    Browse the repository at this point in the history

  5. Add gulp/tasks/index.js to pipe index.html

    @toalina
    toalina committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    703f362 View commit details
    Browse the repository at this point in the history

  6. Continue refactor, success with js file bundling

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

Commits on Oct 14, 2015

  1. Resolve Sass compile problem

    @toalina
    toalina committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    0eb08d4 View commit details
    Browse the repository at this point in the history

  2. Organize file structure

    @toalina
    toalina committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    4227a95 View commit details
    Browse the repository at this point in the history

  3. Add ngConfig to generate access token, ready to merge to master!

    @toalina
    toalina committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    aa36a37 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from toalina/filestructure 

    Filestructure
    @chrisdholt
    chrisdholt committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    24a43ab View commit details
    Browse the repository at this point in the history

  5. initial pagination working

    @chrisdholt
    chrisdholt committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    1e9b8dd View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6 from toalina/pagination 

    initial pagination working
    @toalina
    toalina committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    a0d3e34 View commit details
    Browse the repository at this point in the history

  7. Add build to .gitignore

    @toalina
    toalina committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    29edfd8 View commit details
    Browse the repository at this point in the history

  8. git ignore build

    @chrisdholt
    chrisdholt committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    e513485 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #7 from toalina/token 

    Add build to .gitignore
    @chrisdholt
    chrisdholt committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    a1187f4 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of github.com:toalina/mean-stack-2 into pagination

    @chrisdholt
    chrisdholt committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    b0e112b View commit details
    Browse the repository at this point in the history

  11. updated partial with properties from gists

    @chrisdholt
    chrisdholt committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    524503a View commit details
    Browse the repository at this point in the history

  12. pushing rout

    @Brian11f
    Brian11f committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    4d7ef9e View commit details
    Browse the repository at this point in the history

  13. pushing rout

    @Brian11f
    Brian11f committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    bd82284 View commit details
    Browse the repository at this point in the history

  14. pushing rout

    @Brian11f
    Brian11f committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    149f823 View commit details
    Browse the repository at this point in the history

  15. pushing rout

    @Brian11f
    Brian11f committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    24d89a6 View commit details
    Browse the repository at this point in the history

  16. pushing rout

    @Brian11f
    Brian11f committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    a793dba View commit details
    Browse the repository at this point in the history

  17. Merge pull request #13 from toalina/brian-rout-three 

    Brian rout three
    @toalina
    toalina committed Oct 14, 2015
    Configuration menu
    Copy the full SHA
    a3d782f View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2015

  1. Modify blogpost.html to show object within object

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

  2. Delete token.js

    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    21169f4 View commit details
    Browse the repository at this point in the history

  3. Delete token.txt

    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    742734c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #14 from toalina/foreach 

    Modify blogpost.html to show object within object
    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    34fa0eb View commit details
    Browse the repository at this point in the history

  5. Modify gulp html task, clean up code. Add html and index to gulp watch

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

  6. Merge pull request #15 from toalina/playground 

    Modify gulp html task, clean up code. Add html and index to gulp watch
    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    ece74ba View commit details
    Browse the repository at this point in the history

  7. adding ID var

    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    7128c5e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/toalina/mean-stack-2

    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    615d9f9 View commit details
    Browse the repository at this point in the history

  9. added route and working on delete

    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    2080661 View commit details
    Browse the repository at this point in the history

  10. updating gist ctrl, blogpost.html and filters. Pagination working!

    @chrisdholt
    chrisdholt committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    fd6e1c7 View commit details
    Browse the repository at this point in the history

  11. merge conflicts

    @chrisdholt
    chrisdholt committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    ac0d381 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #16 from toalina/routefour 

    Routefour
    @toalina
    toalina committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    4122a82 View commit details
    Browse the repository at this point in the history

  13. Continue playing with controllers and service

    @toalina
    toalina committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    c7770c7 View commit details
    Browse the repository at this point in the history

  14. merge conflicts

    @chrisdholt
    chrisdholt committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    a9ca9b2 View commit details
    Browse the repository at this point in the history

  15. merge conflicts

    @chrisdholt
    chrisdholt committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    afc7476 View commit details
    Browse the repository at this point in the history

  16. Keep playing

    @toalina
    toalina committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    88fe974 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #17 from toalina/pagination 

    Pagination
    @toalina
    toalina committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    8c6ed1a View commit details
    Browse the repository at this point in the history

  18. Keep messing with service and controllers and form

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

  19. resolve merge conflict

    @toalina
    toalina committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    e5c241a View commit details
    Browse the repository at this point in the history

  20. Continue playground with landmines

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

  21. Modify form-ctrl.js

    @toalina
    toalina committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    6347f19 View commit details
    Browse the repository at this point in the history

  22. Able to view single gist

    @toalina
    toalina committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    df87c5f View commit details
    Browse the repository at this point in the history

  23. added route and working on delete

    @Brian11f
    Brian11f committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    0424213 View commit details
    Browse the repository at this point in the history

  24. Start refactor form controller

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

  25. Merge pull request #18 from toalina/playground 

    Playground
    @chrisdholt
    chrisdholt committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    00ec646 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2015

  1. added route and working on delete

    @Brian11f
    Brian11f committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    b0b28b9 View commit details
    Browse the repository at this point in the history

  2. got ng-click working

    @Brian11f
    Brian11f committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    f40741f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #19 from toalina/routefour 

    Routefour
    @chrisdholt
    chrisdholt committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    483d806 View commit details
    Browse the repository at this point in the history

  4. got ng-click working

    @Brian11f
    Brian11f committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    5998d7d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #20 from toalina/routefour 

    got ng-click working with http call
    @chrisdholt
    chrisdholt committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    dbd46f9 View commit details
    Browse the repository at this point in the history

  6. map fields to forms and working on form controller

    @chrisdholt
    chrisdholt committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    b7894af View commit details
    Browse the repository at this point in the history

  7. Merge pull request #21 from toalina/gist-form 

    map fields to forms and working on form controller
    @toalina
    toalina committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    49cb75a View commit details
    Browse the repository at this point in the history

  8. date appearing correctly, object being pushed into content, pushing c… 

    …hanges to ensure less conflicts in the future
    @chrisdholt
    chrisdholt committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    50caeb7 View commit details
    Browse the repository at this point in the history

  9. fixed form so it updates, need Alina's token, fixed delete with excep… 

    …tion of only shows deleted on page refresh
    @chrisdholt
    chrisdholt committed Oct 16, 2015
    Configuration menu
    Copy the full SHA
    dda3f52 View commit details
    Browse the repository at this point in the history

  10. redoing the shit we messed up

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