init html edit
back to html text edit
i18n activeadmin
merge conflict on admin/projects/*
customise activeadmin
config fastDFS, add init_data
merge with test, fastdfs step
git pull merge local, modify application
refresh application
recover application.css
update image.js url path
update admin/project, add datetime_picker to time input
update admin/project, add datetime_picker to time input
mobile page
merge application layout
publisher brand_logo upload
Merge branch 'master' of github.com:cnepaycd/QYBUser
rm susy require in app conifg
add jquery extension
update publishers form