Commit Graph

12 Commits

Author SHA1 Message Date
alan 66aa72d210 Signed-off-by: alan <547533434@qq.com> 2014-10-23 18:49:14 +08:00
sw 0d0a16fdcd 编辑冲突 2014-10-23 14:36:14 +08:00
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
alan e044f5b615 修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
2014-10-23 11:30:34 +08:00
sw 69dc22e218 #1247修复项目--配置--版本:新建版本,输入“wiki页面”为非汉字类型且字数较多时,显示异常的BUG 2014-10-22 16:08:47 +08:00
sw 56ac9222ef #1384修复wiki注释超出边框的问题 2014-10-22 10:16:08 +08:00
sw 5592aadbbf 修复Micros版新建贴吧和wiki页面无法编辑样式的BUG 2014-10-21 10:18:49 +08:00
sw 7a710a4a8f 去除掉部分无用预览按钮 2014-10-13 09:40:49 +08:00
sw 0e35967433 修改wiki编辑页面初始化高度 2014-08-13 15:19:05 +08:00
sw 835ef97510 wiki编辑页面插件更新 2014-08-12 11:22:37 +08:00
sw dac4042ee9 ttt 2014-08-07 11:31:24 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00