 huang
|
8ea626ec40
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 18:05:52 +08:00 |
|
huang
|
ce740170ca
|
Merge branch 'hjq_new_course' into szzh
Conflicts:
public/stylesheets/public.css
处理冲突
|
2015-12-25 18:05:36 +08:00 |
|
huang
|
cd36a6874e
|
修改issue动态错位
|
2015-12-25 18:03:32 +08:00 |
 guange
|
4cd4d7b6dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 17:47:02 +08:00 |
|
guange
|
e3b395960c
|
base64的+号要处理一下
|
2015-12-25 17:46:45 +08:00 |
 Tim
|
445d5dc379
|
组织下拉菜单修改
|
2015-12-25 16:30:09 +08:00 |
|
huang
|
801651cba6
|
解决组织两个footer冲突问题
|
2015-12-25 16:16:06 +08:00 |
|
huang
|
533be61cf7
|
添加底部样式
|
2015-12-25 16:13:17 +08:00 |
|
huang
|
5d1b63d6fa
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 16:05:07 +08:00 |
|
huang
|
7412c1caf6
|
添加footer
|
2015-12-25 16:04:49 +08:00 |
 cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:59:33 +08:00 |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
2015-12-25 15:57:30 +08:00 |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:48:41 +08:00 |
|
huang
|
f4fc978b23
|
课程留言bug
|
2015-12-25 15:47:22 +08:00 |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
2015-12-25 14:56:08 +08:00 |
|
cxt
|
aa653d558f
|
作品确认弹框的按钮样式调整
|
2015-12-25 11:26:48 +08:00 |
|
cxt
|
0b42430e2d
|
课程通知动态无法回复
|
2015-12-25 11:10:26 +08:00 |
|
cxt
|
ce5f0eb855
|
关联项目的样式修改
|
2015-12-25 11:00:41 +08:00 |
|
huang
|
e7a109d28f
|
Merge branch 'develop' into hjq_new_course
|
2015-12-25 10:40:40 +08:00 |
|
huang
|
a92d33300b
|
里程碑 添加 “已解决”，区分已解决和已关闭
|
2015-12-24 17:18:52 +08:00 |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
2015-12-24 16:45:45 +08:00 |
|
cxt
|
82fa0f0aaf
|
公开的课程不勾选“学生列表公开”，但非课程成员却可以通过url访问该课程学生列表
|
2015-12-24 15:28:11 +08:00 |
|
cxt
|
20efe4de41
|
去掉测验结果页面中填空题的标准答案
|
2015-12-24 11:30:52 +08:00 |
|
cxt
|
61b5cf41d0
|
取消课程首页的开设单位超链接
|
2015-12-24 11:23:23 +08:00 |
|
cxt
|
24542105f4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2015-12-24 09:57:47 +08:00 |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
2015-12-24 09:57:32 +08:00 |
|
huang
|
055fac5e27
|
修改项目得分
|
2015-12-23 17:29:40 +08:00 |
|
Tim
|
c405950469
|
课程关联项目列表显示调整
|
2015-12-23 17:26:13 +08:00 |
|
huang
|
19f84b111b
|
邮件按天发送去掉token值
|
2015-12-23 17:16:35 +08:00 |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
2015-12-23 16:12:23 +08:00 |
 lizanle
|
e8bf93e4ad
|
文件上传button的路径去掉project参数。
|
2015-12-23 11:13:14 +08:00 |
|
lizanle
|
7688546e7a
|
论坛编辑的时候上传文件后没有显示
|
2015-12-23 11:12:34 +08:00 |
|
lizanle
|
bececd1547
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-23 10:03:12 +08:00 |
|
lizanle
|
2eca28a10d
|
LastName 姓
FirstName 名
|
2015-12-23 10:02:54 +08:00 |
|
guange
|
22d8fc9abd
|
作业附件乱码优化
|
2015-12-22 15:45:17 +08:00 |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
2015-12-22 15:14:03 +08:00 |
|
huang
|
0e68266f49
|
版本库显示调整
|
2015-12-22 10:59:09 +08:00 |
|
cxt
|
1a042fd822
|
组织首页的加载更多动态重复加载
|
2015-12-22 10:54:27 +08:00 |
|
cxt
|
6f12ba883d
|
学生作品列表的tag显示不对
|
2015-12-22 09:49:18 +08:00 |
|
huang
|
4111cb53dc
|
解决fork部分项目404问题
|
2015-12-21 17:13:13 +08:00 |
|
cxt
|
c8760445ab
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-21 17:00:28 +08:00 |
|
cxt
|
a5cc1390f2
|
学生匿评打分时必须填写评语
|
2015-12-21 17:00:01 +08:00 |
 houxiang
|
240a859f2d
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-21 16:45:58 +08:00 |
|
houxiang
|
21461fb583
|
修正了以前的方法调用 by 侯翔
|
2015-12-21 16:45:16 +08:00 |
|
huang
|
471e5f5370
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-21 16:29:58 +08:00 |
|
houxiang
|
3e57237969
|
修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔
|
2015-12-21 16:21:39 +08:00 |
|
guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-21 15:15:48 +08:00 |
|
guange
|
bb94a41435
|
红点中包含at的消息
|
2015-12-21 15:11:41 +08:00 |
|
huang
|
c29ab5dc6d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-21 14:49:17 +08:00 |
|
huang
|
1a549eda46
|
版本库显示问题
|
2015-12-21 14:33:28 +08:00 |