still working on asset pipeline
Merge branch 'master' of github.com:dyep49/alex into development
bxslider and asset stuff
Merge branch 'master' of github.com:dyep49/alex into development
multiple sliders on splash page should work when source pins exist
changing config
removed style test
updated seed file and did some splash page stuff
added in angular ui
added upload cols in db
sliders work
slider styling
file upload progress
changed seed and updated image sizing
s3 progress
need to duoble check bugs, and style but image upload done. still needs to tell or show user not to put in a url if they upload though
merge conflict done