 huang
|
dfddb30ca3
|
附件引用
|
2016-03-04 14:21:39 +08:00 |
|
huang
|
9beaa62d6d
|
课程活跃度
|
2016-03-04 11:36:34 +08:00 |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
2016-03-04 11:19:07 +08:00 |
|
huang
|
8eb7551ec3
|
Merge branch 'develop' into hjq_new_course
|
2016-03-04 10:08:18 +08:00 |
|
huang
|
596d4e17e9
|
解决样式冲突
|
2016-03-04 09:57:54 +08:00 |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2016-03-04 09:33:38 +08:00 |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
2016-03-04 09:32:49 +08:00 |
|
huang
|
5ab9e3b5b7
|
资源搜索
作业留言
|
2016-03-04 09:29:20 +08:00 |
 cxt
|
2f17645271
|
Merge branch 'szzh' into develop
|
2016-03-04 09:25:43 +08:00 |
|
cxt
|
c0ed149719
|
Merge branch 'cxt_course' into szzh
|
2016-03-04 09:20:50 +08:00 |
|
huang
|
e9c9112b38
|
公共资源封装
|
2016-03-04 00:41:41 +08:00 |
|
huang
|
ba9b22fbe1
|
公共资源，删除、重命名
|
2016-03-03 23:56:06 +08:00 |
|
huang
|
3dacf900d5
|
修改导入公共、我的资源
|
2016-03-03 23:24:25 +08:00 |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
2016-03-03 18:51:28 +08:00 |
|
huang
|
fee7cc4b2c
|
课程推荐中不显示私有课程
|
2016-03-03 18:10:30 +08:00 |
|
huang
|
ef57dc80d4
|
去掉项目名称
|
2016-03-03 18:03:30 +08:00 |
|
huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口，项目成员列表入口
|
2016-03-03 17:59:36 +08:00 |
|
cxt
|
8e5abe997a
|
已禁用匿评的作业还显示匿评截止时间不合适
|
2016-03-03 17:39:08 +08:00 |
|
huang
|
8815e99db5
|
资源上传跳转问题
|
2016-03-03 17:25:52 +08:00 |
|
cxt
|
050257e885
|
作业添加挂起的状态
|
2016-03-03 17:24:07 +08:00 |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
2016-03-03 17:15:47 +08:00 |
|
cxt
|
9b573248d8
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_show_user_homework_form.html.erb
app/views/users/_show_user_homeworks.html.erb
|
2016-03-03 17:07:35 +08:00 |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
2016-03-03 17:04:38 +08:00 |
|
cxt
|
d2cf95a32d
|
最近登录老师列表的超链接指向了其他用户
|
2016-03-03 15:43:36 +08:00 |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
2016-03-03 10:38:37 +08:00 |
|
huang
|
22cbbc2476
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-03-02 18:41:46 +08:00 |
|
huang
|
a0ef85f4da
|
导出样式
|
2016-03-02 18:41:20 +08:00 |
 Tim
|
f51d16c538
|
资源库样式调整
|
2016-03-02 18:20:36 +08:00 |
|
huang
|
21244a5657
|
资源库导入功能
|
2016-03-02 17:46:10 +08:00 |
|
Tim
|
486d791c72
|
资源名称颜色调整
|
2016-03-02 17:34:50 +08:00 |
|
huang
|
c0077b7c9d
|
公共资源/我的资源JS实现
|
2016-03-02 16:54:07 +08:00 |
|
huang
|
6893b3dcab
|
修复分页问题
|
2016-03-02 14:56:25 +08:00 |
|
huang
|
b3fea3e229
|
资源库代码封装
|
2016-03-02 11:30:19 +08:00 |
|
huang
|
79d162ecca
|
Merge branch 'develop' into hjq_new_course
|
2016-03-01 17:34:06 +08:00 |
|
huang
|
8edaa9d2bd
|
资源库
|
2016-03-01 17:33:44 +08:00 |
|
Tim
|
11592bdbcc
|
导入题库题目弹框样式更改
|
2016-03-01 17:28:49 +08:00 |
|
cxt
|
f6f84b564e
|
在线测验的选项和候选答案的正确显示
|
2016-03-01 15:18:38 +08:00 |
|
cxt
|
072300331b
|
编程测试集的输入输出添加序号
|
2016-02-29 17:05:11 +08:00 |
|
cxt
|
ed9841c207
|
Merge branch 'develop' into cxt_course
|
2016-02-29 08:54:00 +08:00 |
|
cxt
|
6ba91cb3fe
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-29 08:53:31 +08:00 |
|
huang
|
81f54e44b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-26 19:25:36 +08:00 |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
2016-02-26 19:25:12 +08:00 |
|
cxt
|
3b1ecedf97
|
Merge branch 'cxt_course' into develop
|
2016-02-26 18:50:12 +08:00 |
|
cxt
|
7d66c06a56
|
复制学期多次点击“完成”会复制多个学期
|
2016-02-26 17:44:46 +08:00 |
|
cxt
|
6d1667b4ae
|
Merge branch 'develop' into cxt_course
|
2016-02-26 17:35:13 +08:00 |
 ouyangxuhua
|
6e85b38b09
|
1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章
|
2016-02-26 17:11:18 +08:00 |
|
cxt
|
1f25dd4174
|
Merge branch 'develop' into cxt_course
|
2016-02-26 17:03:19 +08:00 |
|
cxt
|
61d9dc959c
|
Merge branch 'szzh' into develop
|
2016-02-26 17:01:02 +08:00 |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +08:00 |
|
cxt
|
386990ebef
|
Merge branch 'szzh' into cxt_course
|
2016-02-26 16:58:48 +08:00 |