Commit Graph

6635 Commits

Author SHA1 Message Date
whimlex 4982c9f7d2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 17:15:38 +08:00
whimlex f3fb0115e4 版本库git操作文档默认展开,样式调整 2015-04-27 17:15:21 +08:00
lizanle 99ae746bff Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-27 17:02:06 +08:00
lizanle 8b6369a84f kindeditor增加更多功能按钮 2015-04-27 17:01:52 +08:00
whimlex 4f48bbbfdb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 16:58:35 +08:00
whimlex 40fdda0ee2 版本库git帮助文档的显示与隐藏 2015-04-27 16:58:16 +08:00
huang e7d85aad27 修改项目配置、关注、加入、类型等不同角色显示 2015-04-27 16:54:46 +08:00
guange 86347cab89 现在可以通过rake redmine📧test[guange] 发送测试邮件 2015-04-27 16:44:53 +08:00
sw 03044d0190 课程--资源库:加粗上传课件分类字样 2015-04-27 15:59:22 +08:00
huang 9cb31d75de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 15:39:54 +08:00
huang be9beff0b4 解决Roles未定义 2015-04-27 15:39:36 +08:00
sw a23231ea7b 修改学生创建作品时的样式 2015-04-27 15:29:09 +08:00
sw 2323c821d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 14:54:19 +08:00
sw f9aaaf38f9 打爆下载增加字符集 2015-04-27 14:54:01 +08:00
whimlex 5670e2755b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 14:42:07 +08:00
whimlex eba638b42e 问题跟踪编辑、更新的权限控制 2015-04-27 14:41:27 +08:00
guange 56f6fa0d86 设置zip支持unicode 2015-04-27 14:36:11 +08:00
huang 020e544b38 修改项目--用户反馈--两层回复样式 2015-04-27 14:34:37 +08:00
guange 24ce5191c3 zip打包可能有乱码 2015-04-27 12:04:08 +08:00
guange 3baba9c95e 清理gemfile 2015-04-27 11:56:10 +08:00
huang 4cdc1d66a2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 11:42:23 +08:00
huang db8b79f3b4 退出项目/项目三种模式切换权限控制 2015-04-27 11:42:01 +08:00
sw 64642a51e0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 17:44:35 +08:00
sw 4b9310c080 Merge branch 'develop' into szzh 2015-04-24 17:44:19 +08:00
sw 7e833a4727 缺陷图片显示小 2015-04-24 17:41:18 +08:00
sw 1a33510da1 我要反馈、我要提问新版Editor没有边框 2015-04-24 17:31:19 +08:00
whimlex 520627f010 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 17:11:55 +08:00
whimlex cde4a892e0 竞赛主页竞赛通知条数对主页样式的调整 2015-04-24 17:11:36 +08:00
lizanle aff7a97c4b Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-24 16:05:40 +08:00
sw 0651bd7c9c Merge branch 'szzh' into develop 2015-04-24 16:05:37 +08:00
lizanle 338a7d3ded 暂时去掉code icon 2015-04-24 16:05:32 +08:00
sw 86076b3271 Merge branch 'szzh' into develop 2015-04-24 15:22:06 +08:00
sw 3c96c2275e Merge branch 'guange_dev' into szzh 2015-04-24 15:21:29 +08:00
guange e3dd68ad24 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-24 15:21:18 +08:00
guange 449bbc553c 修复issue界面js报错 2015-04-24 15:20:47 +08:00
guange 3299f7e726 正式库issue界面图片显示路径错误 2015-04-24 15:20:10 +08:00
sw 1db41ba4bc Merge branch 'szzh' into develop 2015-04-24 15:12:39 +08:00
whimlex 481f7ee4ba 意见反馈按回退键重新计算 2015-04-24 15:08:09 +08:00
whimlex 091c6125d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 15:02:53 +08:00
whimlex 85e1262769 意见反馈 2015-04-24 15:02:32 +08:00
sw 91e37c7ab8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 14:58:51 +08:00
sw 54ef7e3325 修改课程讨论区报错 2015-04-24 14:57:44 +08:00
whimlex 650ffd4397 课程和项目意见反馈 2015-04-24 14:47:50 +08:00
lizanle 138fff1bf5 暂时去掉全屏icon 2015-04-24 12:05:23 +08:00
lizanle c384384b35 改变图标icon位置 2015-04-24 12:02:35 +08:00
lizanle 3810561fb1 改变图标icon 2015-04-24 12:02:09 +08:00
sw f67bdae22a 课程讨论去引用、回帖不换行 2015-04-24 09:10:15 +08:00
lizanle 3e27acf03c Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-24 09:07:36 +08:00
lizanle f4b6b795e3 kindeditor增加代码编辑功能 2015-04-24 09:07:12 +08:00
whimlex 1f83950b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 18:18:50 +08:00