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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
0e00663
Refactor week 6 project into new file structure
toalina Oct 13, 2015
4179590
Continue refactor of Week 6 project, removed Node Express server and …
toalina Oct 13, 2015
ae096af
Add gulp html task
toalina Oct 13, 2015
c749ad2
Rename /templates to /html
toalina Oct 13, 2015
703f362
Add gulp/tasks/index.js to pipe index.html
toalina Oct 13, 2015
8bdce00
Continue refactor, success with js file bundling
toalina Oct 13, 2015
0eb08d4
Resolve Sass compile problem
toalina Oct 14, 2015
4227a95
Organize file structure
toalina Oct 14, 2015
aa36a37
Add ngConfig to generate access token, ready to merge to master!
toalina Oct 14, 2015
24a43ab
Merge pull request #2 from toalina/filestructure
chrisdholt Oct 14, 2015
1e9b8dd
initial pagination working
chrisdholt Oct 14, 2015
a0d3e34
Merge pull request #6 from toalina/pagination
toalina Oct 14, 2015
29edfd8
Add build to .gitignore
toalina Oct 14, 2015
e513485
git ignore build
chrisdholt Oct 14, 2015
a1187f4
Merge pull request #7 from toalina/token
chrisdholt Oct 14, 2015
b0e112b
Merge branch 'master' of github.com:toalina/mean-stack-2 into pagination
chrisdholt Oct 14, 2015
524503a
updated partial with properties from gists
chrisdholt Oct 14, 2015
4d7ef9e
pushing rout
Brian11f Oct 14, 2015
bd82284
pushing rout
Brian11f Oct 14, 2015
149f823
pushing rout
Brian11f Oct 14, 2015
24d89a6
pushing rout
Brian11f Oct 14, 2015
a793dba
pushing rout
Brian11f Oct 14, 2015
a3d782f
Merge pull request #13 from toalina/brian-rout-three
toalina Oct 14, 2015
7bd34e1
Modify blogpost.html to show object within object
toalina Oct 15, 2015
21169f4
Delete token.js
Brian11f Oct 15, 2015
742734c
Delete token.txt
Brian11f Oct 15, 2015
34fa0eb
Merge pull request #14 from toalina/foreach
Brian11f Oct 15, 2015
9c71842
Modify gulp html task, clean up code. Add html and index to gulp watch
toalina Oct 15, 2015
ece74ba
Merge pull request #15 from toalina/playground
Brian11f Oct 15, 2015
7128c5e
adding ID var
Brian11f Oct 15, 2015
615d9f9
Merge branch 'master' of https://github.com/toalina/mean-stack-2
Brian11f Oct 15, 2015
2080661
added route and working on delete
Brian11f Oct 15, 2015
fd6e1c7
updating gist ctrl, blogpost.html and filters. Pagination working!
chrisdholt Oct 15, 2015
ac0d381
merge conflicts
chrisdholt Oct 15, 2015
4122a82
Merge pull request #16 from toalina/routefour
toalina Oct 15, 2015
c7770c7
Continue playing with controllers and service
toalina Oct 15, 2015
a9ca9b2
merge conflicts
chrisdholt Oct 15, 2015
afc7476
merge conflicts
chrisdholt Oct 15, 2015
88fe974
Keep playing
toalina Oct 15, 2015
8c6ed1a
Merge pull request #17 from toalina/pagination
toalina Oct 15, 2015
6db3f06
Keep messing with service and controllers and form
toalina Oct 15, 2015
e5c241a
resolve merge conflict
toalina Oct 15, 2015
8c82857
Continue playground with landmines
toalina Oct 15, 2015
6347f19
Modify form-ctrl.js
toalina Oct 15, 2015
df87c5f
Able to view single gist
toalina Oct 15, 2015
0424213
added route and working on delete
Brian11f Oct 15, 2015
7a5064a
Start refactor form controller
toalina Oct 15, 2015
00ec646
Merge pull request #18 from toalina/playground
chrisdholt Oct 15, 2015
b0b28b9
added route and working on delete
Brian11f Oct 16, 2015
f40741f
got ng-click working
Brian11f Oct 16, 2015
483d806
Merge pull request #19 from toalina/routefour
chrisdholt Oct 16, 2015
5998d7d
got ng-click working
Brian11f Oct 16, 2015
dbd46f9
Merge pull request #20 from toalina/routefour
chrisdholt Oct 16, 2015
b7894af
map fields to forms and working on form controller
chrisdholt Oct 16, 2015
49cb75a
Merge pull request #21 from toalina/gist-form
toalina Oct 16, 2015
50caeb7
date appearing correctly, object being pushed into content, pushing c…
chrisdholt Oct 16, 2015
dda3f52
fixed form so it updates, need Alina's token, fixed delete with excep…
chrisdholt Oct 16, 2015
8bacf76
redoing the shit we messed up
chrisdholt Oct 16, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added build/css/fonts/RobotoSlab-Light.ttf
Binary file not shown.
Binary file added build/css/fonts/RobotoSlab-Regular.ttf
Binary file not shown.
Binary file added build/css/fonts/Ubuntu-B.ttf
Binary file not shown.
Binary file added build/css/fonts/Ubuntu-L.ttf
Binary file not shown.
Binary file added build/css/fonts/Ubuntu-LI.ttf
Binary file not shown.
Binary file added build/css/fonts/Ubuntu-M.ttf
Binary file not shown.
Binary file added build/css/fonts/Ubuntu-R.ttf
Binary file not shown.
Binary file added build/css/fonts/icomoon.eot
Binary file not shown.
15 changes: 15 additions & 0 deletions build/css/fonts/icomoon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/css/fonts/icomoon.ttf
Binary file not shown.
Binary file added build/css/fonts/icomoon.woff
Binary file not shown.
Loading