alan 6e77c5a0b8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/controllers/my_controller.rb app/views/contestnotifications/index.html.erb app/views/courses/_join_private_course.html.erb app/views/wiki/edit.html.erb		2014-10-23 11:41:15 +08:00
..
_form.html.erb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
_issue_counts.html.erb	first commit	2013-08-01 10:33:49 +08:00
_new_modal.html.erb	first commit	2013-08-01 10:33:49 +08:00
_overview.html.erb	初步修改了路线图页面的显示	2013-08-05 21:41:08 +08:00
create.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
index.api.rsb	first commit	2013-08-01 10:33:49 +08:00
index.html.erb	修改了项目里面各个子页面的样式	2013-11-08 20:09:21 +08:00
new.html.erb	first commit	2013-08-01 10:33:49 +08:00
new.js.erb	first commit	2013-08-01 10:33:49 +08:00
show.api.rsb	first commit	2013-08-01 10:33:49 +08:00
show.html.erb	#1247修复项目--配置--版本：新建版本，输入“wiki页面”为非汉字类型且字数较多时，显示异常的BUG	2014-10-22 16:08:47 +08:00
status_by.js.erb	first commit	2013-08-01 10:33:49 +08:00