william da82a630e9 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1 ... Conflicts: app/controllers/bids_controller.rb app/helpers/bids_helper.rb config/locales/zh.yml db/schema.rb		2013-09-28 10:36:44 +08:00
..
blocks	first commit	2013-08-01 10:33:49 +08:00
_form.html.erb	"我的头像"国际化；修改资料里的显示布局	2013-08-06 20:09:52 +08:00
_general.html.erb	first commit	2013-08-01 10:33:49 +08:00
_groups.html.erb	first commit	2013-08-01 10:33:49 +08:00
_leave_message.html.erb	first commit	2013-08-01 10:33:49 +08:00
_mail_notifications.html.erb	first commit	2013-08-01 10:33:49 +08:00
_memberships.html.erb	first commit	2013-08-01 10:33:49 +08:00
_my_course.html.erb	课程里面新建会跳到项目里面！	2013-09-23 15:44:32 +08:00
_my_homework.html.erb	修改了项目里面一些bug	2013-09-23 13:35:29 +08:00
_my_notice.html.erb	课程合并	2013-09-23 08:44:48 +08:00
_preferences.html.erb	解决冲突	2013-08-12 17:30:31 +08:00
_user_extensions.html.erb	给tag search结果添加了分页。	2013-08-19 17:28:59 +08:00
destroy_membership.js.erb	first commit	2013-08-01 10:33:49 +08:00
edit.html.erb	first commit	2013-08-01 10:33:49 +08:00
edit_membership.js.erb	first commit	2013-08-01 10:33:49 +08:00
index.api.rsb	first commit	2013-08-01 10:33:49 +08:00
index.html.erb	new version	2013-09-12 10:41:15 +08:00
info.html.erb	new version	2013-09-12 10:41:15 +08:00
leave_message.js.erb	first commit	2013-08-01 10:33:49 +08:00
list.api.rsb	first commit	2013-08-01 10:33:49 +08:00
list.html.erb	first commit	2013-08-01 10:33:49 +08:00
new.html.erb	first commit	2013-08-01 10:33:49 +08:00
search.html.erb	new version	2013-09-12 10:41:15 +08:00
show.api.rsb	first commit	2013-08-01 10:33:49 +08:00
show.html.erb	new version	2013-09-12 10:41:15 +08:00
show_old.html.erb	修改了tag的显示	2013-08-12 20:18:10 +08:00
tag_save.js.erb	增加tag删除。	2013-09-27 14:58:51 +08:00
user_activities.html.erb	主页国际化	2013-08-10 16:09:07 +08:00
user_comments.html.erb	first commit	2013-08-01 10:33:49 +08:00
user_courses.html.erb	课程合并	2013-09-23 08:44:48 +08:00
user_fanslist.html.erb	new version	2013-09-12 10:41:15 +08:00
user_newfeedback.html.erb	new version	2013-09-12 10:41:15 +08:00
user_projects.html.erb	new version	2013-09-12 10:41:15 +08:00
user_watchlist.html.erb	new version	2013-09-12 10:41:15 +08:00
watch_bids.html.erb	modify some bug about course and add db migrate	2013-09-24 12:15:24 +08:00