Molly and Zach Week 6 MEAN Stack 1: FINAL#7

Open

mollyfish wants to merge 113 commits intoSEA-Design-Dev:masterfrom mollyfish:master

+1,672-27

Commits on Oct 5, 2015

Rename and add new readme
Zachary Gordon
committed

Commits on Oct 6, 2015

Set up basic file structure
mollyfish
committed
Install Gulp and Sass, run npm init
mollyfish
committed
Merge pull request #1 from mollyfish/directories
Zachary Gordon
committed
Remove .DS_Store, add mongoose, express and express server
Zachary Gordon
committed
Add procfile
Zachary Gordon
committed
Merge pull request #2 from mollyfish/express-server
mollyfish
committed
Add 404 response to server.js
mollyfish
committed
Add root directory to server so it can find stylesheets
mollyfish
committed
Break to show Mark a different branch
mollyfish
committed
Add public folder as default folder
mollyfish
committed
Merge pull request #3 from mollyfish/express
Zachary Gordon
committed
Add icomoon icons
Zachary Gordon
committed
Add icon circle style
Zachary Gordon
committed
Revise icon circle style
Zachary Gordon
committed
Make button components, Typography and Color modules
mollyfish
committed
Revise icon circle style
Zachary Gordon
committed
Add icon.html component
Zachary Gordon
committed
Merge pull request #4 from mollyfish/buttons
Zachary Gordon
committed
Add imports and gulp watch
Zachary Gordon
committed
Merge pull request #5 from mollyfish/icons
mollyfish
committed
Fix font imports
Zachary Gordon
committed
Merge pull request #6 from mollyfish/fix-icons
mollyfish
committed
Create Connection Link module and component
mollyfish
committed
Merge pull request #7 from mollyfish/connection-links
Zachary Gordon
committed
Add footer elements
Zachary Gordon
committed
Resolve merge conflicts
Zachary Gordon
committed
Style footer
Zachary Gordon
committed
Merge pull request #8 from mollyfish/footer
mollyfish
committed
Add header html file and header scss
Zachary Gordon
committed
Fix footer tags and tabbing
Zachary Gordon
committed
Merge pull request #9 from mollyfish/footer
mollyfish
committed
Merge branch 'master' into header
Zachary Gordon
committed
Begin Contact section component - break for lecture
mollyfish
committed
Add breakpoint mixin
mollyfish
committed
Break for lecture. In the middle of media queries
mollyfish
committed
Add basic angular
mollyfish
committed
Add html boiler
Zachary Gordon
committed
Finish contact section with mostly flexbox
mollyfish
committed
Resolve merge conflict in main.scss
mollyfish
committed

Commits on Oct 7, 2015

Merge pull request #10 from mollyfish/contact-info
Zachary Gordon
committed
Merge pull request #11 from mollyfish/angular
Zachary Gordon
committed
Merge branch 'master' into header
Zachary Gordon
committed
Fix flex issue in footer
Zachary Gordon
committed
Add header import and begin desktop nav layout
Zachary Gordon
committed
Fix Sass bug
mollyfish
committed
Merge pull request #12 from mollyfish/sass-bug
mollyfish
committed
Create hero box component
mollyfish
committed
Secondary nav component. Restyled icons
mollyfish
committed
Merge pull request #13 from mollyfish/hero-box
Zachary Gordon
committed
Add my name to author in json
Zachary Gordon
committed
Fix merge conflicts
Zachary Gordon
committed
Merge branch 'secondary-nav'
Zachary Gordon
committed
Fix merge conflicts
Zachary Gordon
committed
Fix merge conflicts
Zachary Gordon
committed
Add home nav bar style
Zachary Gordon
committed
Add mobile nav responsiveness
Zachary Gordon
committed
Final edits
Zachary Gordon
committed
Merge pull request #15 from mollyfish/conflicts-fix
mollyfish
committed
Make feature box component, update btn component styles
mollyfish
committed
Merge pull request #16 from mollyfish/feature-box
Zachary Gordon
committed
Merge pull request #17 from mollyfish/header
mollyfish
committed
Compile html files into index
Zachary Gordon
committed
Remove unused footer classes
Zachary Gordon
committed
Merge pull request #18 from mollyfish/compile-index
mollyfish
committed
Working webpack, but not in watch mode
mollyfish
committed
Working angular require and webpack and Sass watch
mollyfish
committed
Attempt to resolve errors
mollyfish
committed
resolve merge conflicts
mollyfish
committed
Merge pull request #20 from mollyfish/old-state
Zachary Gordon
committed
Fix package.json to allow webpack to run
mollyfish
committed
Merge pull request #21 from mollyfish/old-state
Zachary Gordon
committed
Convert header and nav spans to pseudo elements
mollyfish
committed
Reorg files. Make src directory. Make Previews component
mollyfish
committed
Refactor angular to iterate through a collection of posts
mollyfish
committed
Start small format fixes
mollyfish
committed
Code lint
mollyfish
committed
Finish small format fixes
mollyfish
committed
Merge pull request #23 from mollyfish/format-bugs
Zachary Gordon
committed
Merge branch 'master' into blog-posts
mollyfish
committed
Merge pull request #22 from mollyfish/blog-posts
Zachary Gordon
committed

Commits on Oct 9, 2015

Apply refactors from lecture.
mollyfish
committed
Refactor server.js to avoid assets aliasing
mollyfish
committed
Format date field in input form
mollyfish
committed
Merge pull request #26 from mollyfish/refactor
Zachary Gordon
committed
Format date field to give a default of the current date
mollyfish
committed
Merge pull request #27 from mollyfish/refactor
Zachary Gordon
committed
Moved index.html into public, modified gitignore
mollyfish
committed
Removed complied files from git cache
mollyfish
committed
Merge pull request #28 from mollyfish/ignore-edits
Zachary Gordon
committed
Pull templates out of index.html
mollyfish
committed
Move templates out of index.html
mollyfish
committed
Merge pull request #29 from mollyfish/templates
Zachary Gordon
committed
Fix filename typo in post_detail.html
mollyfish
committed
Merge pull request #30 from mollyfish/bugfix
Zachary Gordon
committed
Fix typo in server.js, clean up package.json
mollyfish
committed
Merge pull request #31 from mollyfish/typofix
Zachary Gordon
committed
Add minifyCSS back into package.json
mollyfish
committed
Merge pull request #32 from mollyfish/npm-fix
Zachary Gordon
committed

Commits on Oct 12, 2015