Hw/master - #20

Open

yourFriendWes wants to merge 11 commits into

Ada-C4:masterfrom

yourFriendWes:hw/master

Commits on Mar 28, 2016

finish install
yourFriendWes
committed
e768854
add db and test stuff
yourFriendWes
committed
b656fe6
add category cucumber
yourFriendWes
committed
7c36f20
EOD commit - still working on category bug fix
yourFriendWes
committed
844d0b1

Commits on Mar 29, 2016

show list of categories, fix db files showing
yourFriendWes
committed
79ff561
moved category index page to admin folder, deleted placeholder i made
yourFriendWes
committed
1962490
refactor how I was fixing the index not displaying - added conditional in new_edit categories instead of moving view
yourFriendWes
committed
2d557c7
add better errors for debugging
yourFriendWes
committed
a411370
add tests for adding a category as an admin
yourFriendWes
committed
09f883a
tests passing for adding new categories
yourFriendWes
committed
f24288d
add tests to test edit function, not passing yet
yourFriendWes
committed
e3a8762