jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/views/bids
History
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
 		2013-09-23 20:18:03 +08:00
..
_bid_homework_show.html.erb 修改了项目里面一些bug 2013-09-23 13:35:29 +08:00
_bid_show.html.erb Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
_form.html.erb 修改新建需求界面 2013-09-16 09:36:38 +08:00
_history.html.erb 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
_homework.html.erb 修改了项目里面一些bug 2013-09-23 13:35:29 +08:00
_homework_list.html.erb 增加了附件删除功能 2013-09-18 22:56:01 +08:00
_new.html.erb 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
_new_bid.html.erb 新建需求修改国际化 2013-08-22 20:38:54 +08:00
_pre_show.html.erb 修改留言的引用功能 2013-08-15 09:54:08 +08:00
_project_homework.html.erb 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
_project_list.html.erb 课程合并 2013-09-23 08:44:48 +08:00
add.js.erb 主页国际化 2013-08-10 16:09:07 +08:00
add_homework.js.erb 添加了提交作业 2013-09-13 21:52:24 +08:00
back.js.erb 添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题 2013-08-06 22:26:52 +08:00
create.js.erb 修改留言的引用功能 2013-08-15 09:54:08 +08:00
destroy.js.erb 添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题 2013-08-06 22:26:52 +08:00
homework_respond.html.erb 添加了提交作业 2013-09-13 21:52:24 +08:00
homework_statistics.html.erb 一些修订 2013-09-22 16:11:39 +08:00
index.html.erb new version 2013-09-12 10:41:15 +08:00
more.js.erb 添加了用户查找反馈的功能，可以查看对用户评论的引用和对用户需求的评论。解决了留言问题 2013-08-06 22:26:52 +08:00
new.js.erb 修改留言的引用功能 2013-08-15 09:54:08 +08:00
new_bid.html.erb 修改新建需求界面 2013-08-20 16:32:45 +08:00
new_bid.js.erb 修改了需求列表的结构，添加了分页，并且修改了新建需求的BUG， 2013-08-04 10:11:38 +08:00
show.html.erb Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
show_document_homework.html.erb solve some little problem 2013-09-13 22:25:40 +08:00
show_project.html.erb 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
show_project_homework.html.erb solve some little problem 2013-09-13 22:25:40 +08:00