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

Open

mollyfish wants to merge 113 commits into

SEA-Design-Dev:masterfrom

mollyfish:master

Commits on Oct 5, 2015

Rename and add new readme
Zachary Gordon
committed
0da3ee2

Commits on Oct 6, 2015

Set up basic file structure
mollyfish
committed
783d0b9
Install Gulp and Sass, run npm init
mollyfish
committed
a8fd527
Merge pull request #1 from mollyfish/directories
Zachary Gordon
committed
66a8d77
Remove .DS_Store, add mongoose, express and express server
Zachary Gordon
committed
e45271e
Add procfile
Zachary Gordon
committed
7426bef
Merge pull request #2 from mollyfish/express-server
mollyfish
committed
4bb3dca
Add 404 response to server.js
mollyfish
committed
bbf03ae
Add root directory to server so it can find stylesheets
mollyfish
committed
63b5907
Break to show Mark a different branch
mollyfish
committed
9fe8517
Add public folder as default folder
mollyfish
committed
9bf6122
Merge pull request #3 from mollyfish/express
Zachary Gordon
committed
fbc76fa
Add icomoon icons
Zachary Gordon
committed
b096b80
Add icon circle style
Zachary Gordon
committed
011b71d
Revise icon circle style
Zachary Gordon
committed
9f5480f
Make button components, Typography and Color modules
mollyfish
committed
5a10e2d
Revise icon circle style
Zachary Gordon
committed
d3832b6
Add icon.html component
Zachary Gordon
committed
bfc8e63
Merge pull request #4 from mollyfish/buttons
Zachary Gordon
committed
84bb4f7
Add imports and gulp watch
Zachary Gordon
committed
467fb5a
Merge pull request #5 from mollyfish/icons
mollyfish
committed
87345e1
Fix font imports
Zachary Gordon
committed
b8cecc3
Merge pull request #6 from mollyfish/fix-icons
mollyfish
committed
94462e5
Create Connection Link module and component
mollyfish
committed
74f0369
Merge pull request #7 from mollyfish/connection-links
Zachary Gordon
committed
d70b27f
Add footer elements
Zachary Gordon
committed
96ef304
Resolve merge conflicts
Zachary Gordon
committed
fae6862
Style footer
Zachary Gordon
committed
3650be2
Merge pull request #8 from mollyfish/footer
mollyfish
committed
95fd2f4
Add header html file and header scss
Zachary Gordon
committed
680d057
Fix footer tags and tabbing
Zachary Gordon
committed
a783748
Merge pull request #9 from mollyfish/footer
mollyfish
committed
680d13c
Merge branch 'master' into header
Zachary Gordon
committed
a0782e3
Begin Contact section component - break for lecture
mollyfish
committed
4b2e98b
Add breakpoint mixin
mollyfish
committed
a94c4d0
Break for lecture. In the middle of media queries
mollyfish
committed
b60ffc4
Add basic angular
mollyfish
committed
804fa61
Add html boiler
Zachary Gordon
committed
754909e
Finish contact section with mostly flexbox
mollyfish
committed
80bbc8b
Resolve merge conflict in main.scss
mollyfish
committed
06df612

Commits on Oct 7, 2015

Merge pull request #10 from mollyfish/contact-info
Zachary Gordon
committed
81cb145
Merge pull request #11 from mollyfish/angular
Zachary Gordon
committed
2b6d798
Merge branch 'master' into header
Zachary Gordon
committed
33d1726
Fix flex issue in footer
Zachary Gordon
committed
e9b1b75
Add header import and begin desktop nav layout
Zachary Gordon
committed
ca34446
Fix Sass bug
mollyfish
committed
5e6f119
Merge pull request #12 from mollyfish/sass-bug
mollyfish
committed
d0f01f8
Create hero box component
mollyfish
committed
f0663a6
Secondary nav component. Restyled icons
mollyfish
committed
8a3120b
Merge pull request #13 from mollyfish/hero-box
Zachary Gordon
committed
f48c67e
Add my name to author in json
Zachary Gordon
committed
9e56bdf
Fix merge conflicts
Zachary Gordon
committed
68406b7
Merge branch 'secondary-nav'
Zachary Gordon
committed
e1cf7aa
Fix merge conflicts
Zachary Gordon
committed
aaad73f
Fix merge conflicts
Zachary Gordon
committed
57c842d
Add home nav bar style
Zachary Gordon
committed
dbc1300
Add mobile nav responsiveness
Zachary Gordon
committed
c46f6e4
Final edits
Zachary Gordon
committed
7129d1f
Merge pull request #15 from mollyfish/conflicts-fix
mollyfish
committed
198ddcd
Make feature box component, update btn component styles
mollyfish
committed
8d1504a
Merge pull request #16 from mollyfish/feature-box
Zachary Gordon
committed
3a20742
Merge pull request #17 from mollyfish/header
mollyfish
committed
f70b20c
Compile html files into index
Zachary Gordon
committed
1c572b9
Remove unused footer classes
Zachary Gordon
committed
2650b16
Merge pull request #18 from mollyfish/compile-index
mollyfish
committed
b4d3c3e
Working webpack, but not in watch mode
mollyfish
committed
69a81e9
Working angular require and webpack and Sass watch
mollyfish
committed
7ba0d29
Attempt to resolve errors
mollyfish
committed
341ff84
resolve merge conflicts
mollyfish
committed
4105e93
Merge pull request #20 from mollyfish/old-state
Zachary Gordon
committed
8e5289b
Fix package.json to allow webpack to run
mollyfish
committed
bf20a70
Merge pull request #21 from mollyfish/old-state
Zachary Gordon
committed
c248cff
Convert header and nav spans to pseudo elements
mollyfish
committed
bcc0695
Reorg files. Make src directory. Make Previews component
mollyfish
committed
f259819
Refactor angular to iterate through a collection of posts
mollyfish
committed
b5657c7
Start small format fixes
mollyfish
committed
ceaa6d2
Code lint
mollyfish
committed
9ff343a
Finish small format fixes
mollyfish
committed
f5ff700
Merge pull request #23 from mollyfish/format-bugs
Zachary Gordon
committed
8d6a30d
Merge branch 'master' into blog-posts
mollyfish
committed
cc1688e
Merge pull request #22 from mollyfish/blog-posts
Zachary Gordon
committed
cbf64ab

Commits on Oct 8, 2015

Initial commit. File cleanup
mollyfish
committed
68679f5
Ignore testing directory
mollyfish
committed
d5c34a2
Import Mike's soccer app to work in our folders
mollyfish
committed
c96e82c
Break to show off Angular
mollyfish
committed
3ffbfb5
Change names to blog and post
mollyfish
committed
8e7b5d5
Import styles, reformat post list template
mollyfish
committed
f5affd2
Limit length of displayed preview
mollyfish
committed
448a0ef
Add posts to database
mollyfish
committed
981e7fe
Format detail view and new post form
mollyfish
committed
71420f8
Remove extra files. Check public into git
mollyfish
committed
23eb64a
Edit README
mollyfish
committed
1cf07f9
Merge pull request #24 from mollyfish/server-test
Zachary Gordon
committed
3ca2738

Commits on Oct 9, 2015

Apply refactors from lecture.
mollyfish
committed
182cea1
Refactor server.js to avoid assets aliasing
mollyfish
committed
450e69f
Format date field in input form
mollyfish
committed
2028c36
Merge pull request #26 from mollyfish/refactor
Zachary Gordon
committed
204240a
Format date field to give a default of the current date
mollyfish
committed
0f6b9f5
Merge pull request #27 from mollyfish/refactor
Zachary Gordon
committed
8ebb5a1
Moved index.html into public, modified gitignore
mollyfish
committed
691f799
Removed complied files from git cache
mollyfish
committed
0cfb8f1
Merge pull request #28 from mollyfish/ignore-edits
Zachary Gordon
committed
0b741c8
Pull templates out of index.html
mollyfish
committed
b5d12f2
Move templates out of index.html
mollyfish
committed
8075ef2
Merge pull request #29 from mollyfish/templates
Zachary Gordon
committed
c93cbbc
Fix filename typo in post_detail.html
mollyfish
committed
bf99c99
Merge pull request #30 from mollyfish/bugfix
Zachary Gordon
committed
4ced0da
Fix typo in server.js, clean up package.json
mollyfish
committed
66bbb1b
Merge pull request #31 from mollyfish/typofix
Zachary Gordon
committed
4e2fd35
Add minifyCSS back into package.json
mollyfish
committed
282c176
Merge pull request #32 from mollyfish/npm-fix
Zachary Gordon
committed
6dc9afb

Commits on Oct 12, 2015

Remove redundant Date.now()
mollyfish
committed
0a67dfb
Merge pull request #33 from mollyfish/date
mollyfish
committed
ca63f52