 huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
2016-05-20 22:09:58 +08:00 |
|
huang
|
27d029271b
|
Merge branch 'cxt_course' into develop
|
2016-05-20 22:08:45 +08:00 |
|
huang
|
86ff725b8a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 22:08:32 +08:00 |
 yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
2016-05-20 22:07:33 +08:00 |
|
huang
|
039d11e862
|
资源发送权限问题
|
2016-05-20 21:48:51 +08:00 |
 Tim
|
51cd9c6dd1
|
学号溢出bug
|
2016-05-20 21:47:31 +08:00 |
|
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
2016-05-20 21:10:53 +08:00 |
|
huang
|
c749fe381b
|
Merge branch 'weixin_guange' into develop
|
2016-05-20 21:02:01 +08:00 |
|
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
2016-05-20 21:01:30 +08:00 |
|
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 21:01:18 +08:00 |
|
huang
|
e512154ea9
|
古剑删除描述一致
|
2016-05-20 21:00:36 +08:00 |
|
huang
|
d9241d5dca
|
组织栏目帖子设为首页后显示在栏目中
|
2016-05-20 20:55:43 +08:00 |
|
Tim
|
dd4786d639
|
作品列表查看详情定位
|
2016-05-20 20:44:13 +08:00 |
|
huang
|
166a97dc0c
|
注释
|
2016-05-20 20:37:11 +08:00 |
|
huang
|
acb6d5892d
|
Merge branch 'yuanke' into develop
|
2016-05-20 20:31:39 +08:00 |
|
huang
|
90bb940290
|
资源下载链接问题
|
2016-05-20 20:27:32 +08:00 |
|
txz
|
d329b60a8a
|
微信加载中去白底，内容去除固定行高
|
2016-05-20 20:26:04 +08:00 |
|
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
2016-05-20 20:08:46 +08:00 |
|
Tim
|
5f4a9304fe
|
提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整
|
2016-05-20 20:05:39 +08:00 |
|
huang
|
3ffe131a73
|
删除的提示
|
2016-05-20 20:02:17 +08:00 |
|
huang
|
f308b24f5a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 19:52:57 +08:00 |
|
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
2016-05-20 19:52:42 +08:00 |
|
Tim
|
1c7efa247e
|
老师提交分数后格式混乱修改
|
2016-05-20 19:13:55 +08:00 |
 cxt
|
40f45ea697
|
发布通知的微信模板消息内容有重复
|
2016-05-20 19:13:19 +08:00 |
|
cxt
|
f517fc5a11
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 19:11:16 +08:00 |
|
cxt
|
56a151a7b4
|
学生打开的作品列表中不应通过下拉列表访问到挂起的作业
|
2016-05-20 19:11:09 +08:00 |
|
huang
|
e10bc46361
|
Merge branch 'yuanke' into develop
|
2016-05-20 18:59:54 +08:00 |
|
huang
|
8ebe8b0d0c
|
删除提示顺序
消息样式
|
2016-05-20 18:55:17 +08:00 |
|
huang
|
e901becfe6
|
发送权限问题
|
2016-05-20 18:46:19 +08:00 |
|
yuanke
|
c9c3aa5f31
|
Merge branch 'develop' into yuanke
|
2016-05-20 18:43:20 +08:00 |
|
yuanke
|
bc8171501d
|
解决组织文章设为首页报500
|
2016-05-20 18:40:39 +08:00 |
|
huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
2016-05-20 17:40:18 +08:00 |
|
yuanke
|
0e827abd35
|
将代码测试编译器信息的冒号改为中文的
|
2016-05-20 17:25:56 +08:00 |
|
huang
|
82f4c685da
|
消息拒绝问题
|
2016-05-20 17:11:44 +08:00 |
|
huang
|
18054dd96d
|
私有资源不能下载
|
2016-05-20 17:04:20 +08:00 |
|
yuanke
|
6d7eca487f
|
将KE的newlineTag：'br' 改为'p',方便识别网址
|
2016-05-20 17:02:43 +08:00 |
|
huang
|
f9e445500e
|
已经引用通过的勾选问题
|
2016-05-20 16:38:58 +08:00 |
|
cxt
|
2724d6d938
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 16:20:32 +08:00 |
|
cxt
|
6479ace5e1
|
作业积分的弹出框增加序号、导出的学生列表中去掉未发布的作业、弹框高度控制
|
2016-05-20 16:19:10 +08:00 |
|
huang
|
fc8cbc2b38
|
Merge branch 'hjq_beidou' into develop
|
2016-05-20 16:18:47 +08:00 |
|
huang
|
ef1a5d32f2
|
顶端背景色
|
2016-05-20 16:18:23 +08:00 |
|
cxt
|
8f9ead0a12
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:37 +08:00 |
|
cxt
|
7b0fd246ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:16 +08:00 |
|
cxt
|
da375dcb4e
|
挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示
|
2016-05-20 15:39:07 +08:00 |
|
huang
|
d108f0a684
|
Merge branch 'yuanke' into develop
|
2016-05-20 15:37:44 +08:00 |
|
huang
|
4c984882e4
|
Merge branch 'cxt_course' into develop
|
2016-05-20 15:37:15 +08:00 |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 15:37:02 +08:00 |
|
huang
|
1c400669aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:36:00 +08:00 |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
2016-05-20 15:35:08 +08:00 |
|
huang
|
5114c12c17
|
注释掉为完成的代码
|
2016-05-20 15:34:35 +08:00 |