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

Open

pstrum wants to merge 166 commits into

SEA-Design-Dev:masterfrom

Commits on Oct 6, 2015

Add HTML

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

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

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
ec17c2f
Resolve merge conflicts

Peter Strumolo
authored and
Peter Strumolo
committed
92828af
Update the style guide

Peter Strumolo
authored and
Peter Strumolo
committed
8a1570d
Merge pull request #10 from pstrum/style-guide
pstrum
committed
695df69
merge conflict
jimmynono-dd
committed
05ec40b
Merge conflicts
jimmynono-dd
committed
565d3f8
Add initial styles to navigation component

Peter Strumolo
authored and
Peter Strumolo
committed
4bf3084
Add top navigation layout

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
1edfac1
Merge pull request #11 from pstrum/header-pagetitle
jimmynono-dd
committed
47cf28e
styling on blog section, styling on articles
jimmynono-dd
committed
ec4b86e
fix merge issue
jimmynono-dd
committed
c78e01f
Work on footer social icons
Sredna Kunowski
committed
e272e9d
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into footer-socialmedia-icons
Sredna Kunowski
committed
f0850af
Merge pull request #12 from pstrum/basicHTML
pstrum
committed
27d3cd2
Finish creating footer social media icons
Sredna Kunowski
committed
02afbc0
begin styling of footer section
jimmynono-dd
committed
087f923
Fix merge conflict
Sredna Kunowski
committed
1cb4f21
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into sassJames
jimmynono-dd
committed
e02d675
Removed main.css from gitignore
Sredna Kunowski
committed
00a37ba
Merge pull request #14 from pstrum/footer-socialmedia-icons
jimmynono-dd
committed
3ed11b0
fix merge conflicts
jimmynono-dd
committed
ba9aa5b

Commits on Oct 7, 2015

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

Peter Strumolo
authored and
Peter Strumolo
committed
f07d3ec
Resolve merge conflicts

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

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

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

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

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

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

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

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

Commits on Oct 8, 2015

Update to server.js

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

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
8ba35d9
Update to gitignore file

Peter Strumolo
authored and
Peter Strumolo
committed
28ba9d8
Update to gitignore file

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

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

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

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
5b1976e
Add initial angular files

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
54772b5

Commits on Oct 9, 2015

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

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

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

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

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

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
287a9ec
Update gulpfile

Peter Strumolo
authored and
Peter Strumolo
committed
d70927e
Merge pull request #32 from pstrum/angular
jimmynono-dd
committed
7dad202
merge conflicts
jimmynono-dd
committed
65ecb2d
merge conflicts
jimmynono-dd
committed
a1cef9f
stashing gulpfile
Sredna Kunowski
committed
6c95071
fix merge conflict
Sredna Kunowski
committed
10d0fe9
fix merge conflict
Sredna Kunowski
committed
d9bb6c8
Merge pull request #30 from pstrum/gulp-setup
pstrum
committed
8705edc
Merge issues
jimmynono-dd
committed
e0d5915
get functionality on add post
jimmynono-dd
committed
db7fddf
Merge pull request #33 from pstrum/angularJames
pstrum
committed
99e309e
Update to form controller

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
60b90bd

Commits on Oct 10, 2015

Adjust the file structure

Peter Strumolo
authored and
Peter Strumolo
committed
1e2dff6
small sass tweaks to page
jimmynono-dd
committed
7cca696
Merge pull request #37 from pstrum/angular
pstrum
committed
596ab5a
Merge conflicts
jimmynono-dd
committed
6df1d26
Update with webpack

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
493425f
Add autoscroll/anchorscroll

Peter Strumolo
authored and
Peter Strumolo
committed
1daccc4

Commits on Oct 11, 2015

Merge pull request #39 from pstrum/angular-fixes
jimmynono-dd
committed
3fc762c
add ellipses to blog preview, and paragraph breaks
jimmynono-dd
committed
aee59e5
move pre-wrap to p tags
jimmynono-dd
committed
53b0d9e
Remove output folder
Sredna Kunowski
committed
367ea13
Fix merge confict and add ellipses
Sredna Kunowski
committed
575e5bb

Commits on Oct 12, 2015

Update delete method to work on form template

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

Peter Strumolo
authored and
Peter Strumolo
committed
5f5447b
Add Jimmynono edits

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
d429a12
Adjust cache for push

Peter Strumolo
authored and
Peter Strumolo
committed
e9b9118
fix untracked files

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

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

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

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

Peter Strumolo
authored and
Peter Strumolo
committed
c4270ca
Style blog section
Sredna Kunowski
committed
4d3ac39
Style header layout
Sredna Kunowski
committed
4c4a61b
Update .gitignore
Sredna Kunowski
committed
92d380b
Update _blog.scss
Sredna Kunowski
committed
d536b3f
Add fonts to gulp tasks

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

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

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

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

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

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