Merge branch 'master' of https://github.com/japacible/commission-me into wip-commissions
Merge branch 'wip-commissions' of https://github.com/japacible/commission-me into wip-commissions
Edit Template nav bar ghost fixed; asset filenames expanded, relinked
Merging master into wip-commissions, fix file name conflicts
Rename comreq.js to commission-request.js
Review and Revision scaffolding
Moved progress page to commissions directory in prep for updates.
Merge branch 'wip-commissions' of https://github.com/japacible/commission-me into wip-commissions
Merge branch 'master' of https://github.com/japacible/commission-me into wip-commissions
Added the final step to the json object stored in commissions as well as the jquery to get it to display when reviewing individual commissions
Added commission request creation to the commission controller
Added checking for logged out users, also added check on the review page to only display the accept, decline, etc. if the artist is the current user. For issue #194
Added accept and decline direct url checks for current user as well as redirect to the commission list page for the artist instead of the home page. For #194
Added Com. Settings functionality (expand steps, add option, remove cat/step/opt)
Merge branch 'wip-commissions' of https://github.com/japacible/commission-me into wip-commissions
Much addition. Wow.
Merge master into wip-commissions
New buttons for removal.
Artist Prompt and cleanup
add prompt to json