 huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
2016-06-12 15:02:33 +08:00 |
 cxt
|
9d36c74d7f
|
作业回复的删除
|
2016-06-12 14:59:00 +08:00 |
|
cxt
|
a1e49d9a81
|
Merge branch 'cxt_course' into develop
|
2016-06-08 15:24:00 +08:00 |
|
cxt
|
c0d167d2e2
|
项目缺陷动态的回复不显示
|
2016-06-08 15:23:19 +08:00 |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +08:00 |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 15:11:59 +08:00 |
|
huang
|
df8df117a8
|
解决匿名用户登录问题（控制器和view）
|
2016-06-06 15:02:11 +08:00 |
 Tim
|
a44cb47a26
|
组织未登录回复框提示
|
2016-06-06 14:41:18 +08:00 |
|
huang
|
c6d36bd738
|
未登录留言判断
|
2016-06-06 14:21:58 +08:00 |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 16:28:23 +08:00 |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
2016-06-03 16:28:11 +08:00 |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 14:58:37 +08:00 |
|
cxt
|
5097abbe1e
|
Merge branch 'develop' into cxt_course
|
2016-06-01 14:22:43 +08:00 |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
|
cxt
|
0cafebb3a2
|
新闻列表的点赞
|
2016-05-27 17:14:37 +08:00 |
|
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
2016-05-27 17:13:01 +08:00 |
|
cxt
|
1535c4cd07
|
编辑分组作业时的基于项目实施总是默认选中
|
2016-05-27 15:54:55 +08:00 |
 yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |
|
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
2016-05-27 15:04:56 +08:00 |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
2016-05-27 14:01:02 +08:00 |
|
huang
|
c7bf29b0c9
|
组织切换问题
|
2016-05-27 12:46:11 +08:00 |
|
huang
|
fb46062640
|
项目、课程、组织资源列表发送无法弹框问题
|
2016-05-27 10:20:15 +08:00 |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
2016-05-27 09:32:24 +08:00 |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
2016-05-25 17:54:53 +08:00 |
|
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +08:00 |
|
huang
|
457cf72263
|
断行样式
发送JS
|
2016-05-25 14:08:05 +08:00 |
|
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
2016-05-25 14:05:09 +08:00 |
|
huang
|
415b624e0b
|
样式问题
|
2016-05-25 11:07:36 +08:00 |
|
huang
|
b6de2dbd2d
|
发布作业导入资源
|
2016-05-25 09:44:30 +08:00 |
|
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
2016-05-25 09:11:55 +08:00 |
|
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
|
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
|
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
|
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
|
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
|
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
2016-05-23 15:58:32 +08:00 |
|
cxt
|
2afce9d563
|
隐藏导入作业的申请题库
|
2016-05-23 14:05:28 +08:00 |
|
huang
|
a60356091b
|
issue中添加类型tag
|
2016-05-23 11:02:21 +08:00 |
|
cxt
|
820e594fec
|
题库的私有作业显示作业详情
|
2016-05-23 10:53:49 +08:00 |
|
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
|
huang
|
039d11e862
|
资源发送权限问题
|
2016-05-20 21:48:51 +08:00 |
|
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
2016-05-20 21:10:53 +08:00 |
|
huang
|
e512154ea9
|
古剑删除描述一致
|
2016-05-20 21:00:36 +08:00 |
|
huang
|
166a97dc0c
|
注释
|
2016-05-20 20:37:11 +08:00 |
|
huang
|
90bb940290
|
资源下载链接问题
|
2016-05-20 20:27:32 +08:00 |
|
huang
|
3ffe131a73
|
删除的提示
|
2016-05-20 20:02:17 +08:00 |
|
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
2016-05-20 19:52:42 +08:00 |