去掉长租入口
del public assets
Merge branch 'master' of https://github.com/ofoso/ofo into develop
Update controllers.js.coffee

添加发送短信的60s倒计时
Update login.html.haml

添加发送短信的60s倒计时
Merge branch 'development' of https://github.com/ofoso/ofo into development
20140905 修改了angular的controller中 OFOUserOrderController
added CRUD methods to schools_controller.rb
Merge branch 'development' of https://github.com/ofoso/ofo into development
added CRUD methods to SchollsCOntroller and fixed an indentation problem :P
Merge branch 'development' of https://github.com/ofoso/ofo into development
new table place
1、样式表改动
2、新增地点管理页面和学校管理业面 schools.html未完成
fix production model issues in assets pipeline with Angular JS
fix production
fix production model issues in asset pipeline and Angular JS
1、在home.js.erb.coffee增添内容
2、在controllers.js.coffee中新建OFOCityController和OFOSchoolController
和远程分支合并
Merge branch 'development' of https://github.com/ofoso/ofo into development
place.rb rollback