James, Peter, Sredna - MEAN Stack 1 (Final)#16

Open

pstrum wants to merge 166 commits intoSEA-Design-Dev:masterfrom

Commits on Oct 6, 2015

Add HTML

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #4 from pstrum/basic-html
pstrum
committed
Add initial layout architecture for Sass

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #7 from pstrum/sass-setup
pstrum
committed
Add in icons and icons font, add imports to INDEX files
jimmynono-dd
committed
add in basic button styling by creating a buttons partial and using a mixin
jimmynono-dd
committed
adjust borders on buttons
jimmynono-dd
committed
Merge pull request #9 from pstrum/basicHTML
pstrum
committed
Add css/main.css to gitignore

Peter Strumolo
authored and
Peter Strumolo
committed
Add first draft of style-guide

Peter Strumolo
authored and
Peter Strumolo
committed
Resolve merge conflicts on rebase

Peter Strumolo
authored and
Peter Strumolo
committed
Resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
Update the style guide

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #10 from pstrum/style-guide
pstrum
committed
merge conflict
jimmynono-dd
committed
Merge conflicts
jimmynono-dd
committed
Add initial styles to navigation component

Peter Strumolo
authored and
Peter Strumolo
committed
Add top navigation layout

Peter Strumolo
authored and
Peter Strumolo
committed
Add layout for the header and page title sections

Peter Strumolo
authored and
Peter Strumolo
committed
Remove superfluous navigation style sheet

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #11 from pstrum/header-pagetitle
jimmynono-dd
committed
styling on blog section, styling on articles
jimmynono-dd
committed
fix merge issue
jimmynono-dd
committed
Work on footer social icons
Sredna Kunowski
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into footer-socialmedia-icons
Sredna Kunowski
committed
Merge pull request #12 from pstrum/basicHTML
pstrum
committed
Finish creating footer social media icons
Sredna Kunowski
committed
begin styling of footer section
jimmynono-dd
committed
Fix merge conflict
Sredna Kunowski
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into sassJames
jimmynono-dd
committed
Removed main.css from gitignore
Sredna Kunowski
committed
Merge pull request #14 from pstrum/footer-socialmedia-icons
jimmynono-dd
committed
fix merge conflicts
jimmynono-dd
committed

Commits on Oct 7, 2015

style footer and resolve merge conflicts
jimmynono-dd
committed
fixed an error I made, changing a font size. back to normal
jimmynono-dd
committed
Merge pull request #15 from pstrum/sassJames
pstrum
committed
Resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
Resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
Updates to blog post styles

Peter Strumolo
authored and
Peter Strumolo
committed
Remove index.js file

Peter Strumolo
authored and
Peter Strumolo
committed
Styled indenting on top of page. Created classes to re-use indenting style for footer
Sredna Kunowski
committed
Merge pull request #17 from pstrum/footer-socialmedia-icons
pstrum
committed
remove server.js from commit
jimmynono-dd
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into sassJames
jimmynono-dd
committed
Merge branch 'master' into feature

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #16 from pstrum/feature
jimmynono-dd
committed
Add public directory to file
jimmynono-dd
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into sassJames
jimmynono-dd
committed
added margin to footer
jimmynono-dd
committed
fix changes made to experiment with server
jimmynono-dd
committed
move fonts to work on public site
jimmynono-dd
committed
Merge pull request #20 from pstrum/sassJames
pstrum
committed
Create server.js file

Peter Strumolo
authored and
Peter Strumolo
committed
Update gitignore with server.js

Peter Strumolo
authored and
Peter Strumolo
committed
Update the server.js file

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' into feature

Peter Strumolo
authored and
Peter Strumolo
committed
express server created, talks to mongodb
jimmynono-dd
committed
Merge pull request #21 from pstrum/angularJames
Sredna Kunowski
committed
add angular to index.html and package.json file
jimmynono-dd
committed

Commits on Oct 8, 2015

Update to server.js

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' into feature

Peter Strumolo
authored and
Peter Strumolo
committed
Moved sass directory to root level

Peter Strumolo
authored and
Peter Strumolo
committed
Update to server.js file

Peter Strumolo
authored and
Peter Strumolo
committed
Update to gitignore file

Peter Strumolo
authored and
Peter Strumolo
committed
Update to gitignore file

Peter Strumolo
authored and
Peter Strumolo
committed
Add public/css/main.css to gitignore

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'feature' of https://github.com/pstrum/mean-stack-1 into feature

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #22 from pstrum/feature
jimmynono-dd
committed
beginnings of angular, adding ng-app to html and create public/js folder
jimmynono-dd
committed
merge issues
jimmynono-dd
committed
Add ng-app to html

Peter Strumolo
authored and
Peter Strumolo
committed
add angular to make blog responsive, hard code test data in app.js file to be replaced with calls to mongo
jimmynono-dd
committed
Merge pull request #24 from pstrum/angularJames
Sredna Kunowski
committed
Edit the index.html file

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' into angular

Peter Strumolo
authored and
Peter Strumolo
committed
Add initial angular files

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #25 from pstrum/angular
pstrum
committed
updatea package.json to work with angular
jimmynono-dd
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into angularJames
jimmynono-dd
committed
rename and refactor app, still not working, but no errors
jimmynono-dd
committed
Merge pull request #26 from pstrum/angularJames
pstrum
committed
Edit the blog post controller

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into angular

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Oct 9, 2015

rename app to intellyApp, fix partials to accept changed variable name
jimmynono-dd
committed
Merge pull request #27 from pstrum/angularJames
Sredna Kunowski
committed
Add a form partial template

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into angular

Peter Strumolo
authored and
Peter Strumolo
committed
Add blogs.ctrl script to the index.html

Peter Strumolo
authored and
Peter Strumolo
committed
begin functionality of blog details
jimmynono-dd
committed
Merge pull request #29 from pstrum/angularJames
pstrum
committed
Add initial form/add post html

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into angular

Peter Strumolo
authored and
Peter Strumolo
committed
Add to gulp serve to gulpfile
Sredna Kunowski
committed
Update package.json
Sredna Kunowski
committed
add delete button to blog preview
jimmynono-dd
committed
Update to form controller

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #31 from pstrum/angularJames
pstrum
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into angular

Peter Strumolo
authored and
Peter Strumolo
committed
Update gulpfile

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #32 from pstrum/angular
jimmynono-dd
committed
merge conflicts
jimmynono-dd
committed
merge conflicts
jimmynono-dd
committed
stashing gulpfile
Sredna Kunowski
committed
fix merge conflict
Sredna Kunowski
committed
fix merge conflict
Sredna Kunowski
committed
Merge pull request #30 from pstrum/gulp-setup
pstrum
committed
Merge issues
jimmynono-dd
committed
get functionality on add post
jimmynono-dd
committed
Merge pull request #33 from pstrum/angularJames
pstrum
committed
Update to form controller

Peter Strumolo
authored and
Peter Strumolo
committed
Add missing semicolon. Add output folder to gitignore. Fix mispelled controller name in html
Sredna Kunowski
committed
add delete button to form
jimmynono-dd
committed
Work on limiting the number of characters in blog view
Sredna Kunowski
committed
Merge pull request #34 from pstrum/angularJames
Sredna Kunowski
committed
Change date to date format
Sredna Kunowski
committed
fix merge conflict
Sredna Kunowski
committed
Add breaks between paragraphs in blog post view
Sredna Kunowski
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into angular

Peter Strumolo
authored and
Peter Strumolo
committed
layout tweaks to buttons
jimmynono-dd
committed
Merge pull request #36 from pstrum/angularJames
pstrum
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into angular

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Oct 10, 2015

Adjust the file structure

Peter Strumolo
authored and
Peter Strumolo
committed
small sass tweaks to page
jimmynono-dd
committed
Merge pull request #37 from pstrum/angular
pstrum
committed
Merge conflicts
jimmynono-dd
committed
Update with webpack

Peter Strumolo
authored and
Peter Strumolo
committed
merge conflicts
jimmynono-dd
committed
Merge pull request #38 from pstrum/angularJames
jimmynono-dd
committed
Merge branch 'master' of https://github.com/pstrum/mean-stack-1

Peter Strumolo
authored and
Peter Strumolo
committed
Update the app.js to show correct information

Peter Strumolo
authored and
Peter Strumolo
committed
Add autoscroll/anchorscroll

Peter Strumolo
authored and
Peter Strumolo
committed

Commits on Oct 11, 2015

Commits on Oct 12, 2015

Update delete method to work on form template

Peter Strumolo
authored and
Peter Strumolo
committed
Add ng-show a message when no posts

Peter Strumolo
authored and
Peter Strumolo
committed
Add Jimmynono edits

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #40 from pstrum/angularJames
pstrum
committed
Merge branch 'master' into angular-fixes

Peter Strumolo
authored and
Peter Strumolo
committed
Remove index.html to public gitignore

Peter Strumolo
authored and
Peter Strumolo
committed
Adjust cache for push

Peter Strumolo
authored and
Peter Strumolo
committed
fix untracked files

Peter Strumolo
authored and
Peter Strumolo
committed
Add responsive, flexible navigation

Peter Strumolo
authored and
Peter Strumolo
committed
Reverse the order of posts

Peter Strumolo
authored and
Peter Strumolo
committed
Move ng-cloak outside article in blog-post.html

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #41 from pstrum/angular-fixes
Sredna Kunowski
committed
Add flexbox placeholder
Sredna Kunowski
committed
Style header layour
Sredna Kunowski
committed
Merge branch 'header-pagetitle' into blog-post-styling
Sredna Kunowski
committed
initial set up fonts

Peter Strumolo
authored and
Peter Strumolo
committed
Style blog section
Sredna Kunowski
committed
Style header layout
Sredna Kunowski
committed
Update .gitignore
Sredna Kunowski
committed
Update _blog.scss
Sredna Kunowski
committed
Add fonts to gulp tasks

Peter Strumolo
authored and
Peter Strumolo
committed
Update .gitignore
Sredna Kunowski
committed
Merge pull request #35 from pstrum/blog-post-styling
pstrum
committed
Edits to section padding

Peter Strumolo
authored and
Peter Strumolo
committed
Merge branch 'master' into fonts-gulp

Peter Strumolo
authored and
Peter Strumolo
committed
Add home and blog links

Peter Strumolo
authored and
Peter Strumolo
committed
Add functionality to misc links

Peter Strumolo
authored and
Peter Strumolo
committed
Add hover effect on social links

Peter Strumolo
authored and
Peter Strumolo
committed
Merge pull request #43 from pstrum/fonts-gulp
pstrum
committed
tidy up whitespace
jimmynono-dd
committed