 huang
|
f022950408
|
Merge branch 'develop' into hjq_new_course
|
2016-03-08 16:17:18 +08:00 |
 Tim
|
141c0be24f
|
上传资源弹窗样式调整
|
2016-03-08 15:50:01 +08:00 |
 ouyangxuhua
|
6e21229b4c
|
组织用户链接
|
2016-03-08 15:22:56 +08:00 |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
2016-03-08 15:20:38 +08:00 |
|
huang
|
2fdddc6488
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-03-08 11:27:22 +08:00 |
|
huang
|
ec4a3b321c
|
更新历史版本，下载次数，引用次数不清零
|
2016-03-08 11:26:55 +08:00 |
 cxt
|
ca094a13b5
|
优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接
|
2016-03-08 10:16:55 +08:00 |
|
cxt
|
f0e3fe8ff7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-08 09:13:27 +08:00 |
|
cxt
|
40754bff0e
|
Merge branch 'develop' into cxt_course
|
2016-03-08 09:13:20 +08:00 |
|
cxt
|
2ee93f9f86
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-08 09:12:50 +08:00 |
|
cxt
|
3424be695e
|
题库：发送的弹框中，不要出现已经删除的课程
|
2016-03-08 09:12:37 +08:00 |
|
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源，数量一致
|
2016-03-07 18:12:40 +08:00 |
|
ouyangxuhua
|
d70df6a89d
|
公开组织的资源，非成员不能看到私有资源
|
2016-03-07 17:41:43 +08:00 |
|
ouyangxuhua
|
699e1f41a7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-07 17:18:39 +08:00 |
|
ouyangxuhua
|
ce187b4212
|
组织资源下载权限控制
|
2016-03-07 17:18:01 +08:00 |
|
cxt
|
64b6af6177
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-07 17:02:03 +08:00 |
|
cxt
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
2016-03-07 17:01:10 +08:00 |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
2016-03-07 16:50:30 +08:00 |
|
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-07 16:15:13 +08:00 |
|
ouyangxuhua
|
0df34dd3ee
|
组织资源栏目，过滤条件“其他”内容
|
2016-03-07 16:14:44 +08:00 |
|
Tim
|
bd6a2481b6
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-07 14:44:58 +08:00 |
|
cxt
|
f8ce6d48d3
|
模拟答题的返回按钮应该回到课程作业列表
|
2016-03-07 14:31:58 +08:00 |
|
cxt
|
cdd8deb340
|
Merge branch 'szzh' into develop
|
2016-03-07 13:57:50 +08:00 |
|
cxt
|
0532c68044
|
Merge branch 'cxt_course' into szzh
|
2016-03-07 13:57:11 +08:00 |
|
cxt
|
e30c26aa09
|
课程报500
|
2016-03-07 13:56:28 +08:00 |
|
ouyangxuhua
|
a0363b5511
|
组织资源发送后，发送次数动态增加
|
2016-03-07 12:57:24 +08:00 |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
2016-03-07 12:19:48 +08:00 |
|
cxt
|
fcae91ecc1
|
“课程通知”改为“通知”
|
2016-03-07 11:27:47 +08:00 |
|
cxt
|
cff5e9171f
|
导入作业后页面不应跳转到被导入的作业页面
|
2016-03-07 11:21:58 +08:00 |
|
Tim
|
1deb611ba2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-07 10:58:57 +08:00 |
|
Tim
|
ef05867e6e
|
自动生成文件
|
2016-03-07 10:58:41 +08:00 |
|
cxt
|
0090c89dd1
|
数据迁移
|
2016-03-07 10:53:58 +08:00 |
|
cxt
|
849bc0149f
|
Merge branch 'develop' into cxt_course
|
2016-03-07 10:32:32 +08:00 |
|
ouyangxuhua
|
984cd76b7f
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-07 10:30:09 +08:00 |
|
ouyangxuhua
|
b77b63bbf1
|
解决私有组织栏目通过url能访问的问题
|
2016-03-07 10:29:37 +08:00 |
|
huang
|
d6dedf03cb
|
去掉puts注释
|
2016-03-06 12:18:57 +08:00 |
|
huang
|
d30e73795d
|
积分规则
|
2016-03-06 12:15:57 +08:00 |
|
huang
|
4f2937e1a2
|
英雄榜
|
2016-03-05 10:38:21 +08:00 |
|
huang
|
0a18f365ab
|
新的迁移
|
2016-03-05 08:00:56 +08:00 |
|
huang
|
a079a61c82
|
回复数
|
2016-03-05 04:29:10 +08:00 |
|
huang
|
0d1c9f90ab
|
Merge branch 'hjq_new_course' into develop
|
2016-03-05 04:22:46 +08:00 |
|
huang
|
094af07a2f
|
数据迁移
|
2016-03-05 04:22:01 +08:00 |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
2016-03-05 04:01:10 +08:00 |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
2016-03-05 03:17:47 +08:00 |
|
huang
|
bafa151c0d
|
0
|
2016-03-05 03:16:04 +08:00 |
|
huang
|
3f56fa3405
|
0
|
2016-03-05 03:14:57 +08:00 |
|
huang
|
f381784a3c
|
数据迁移
|
2016-03-05 03:13:58 +08:00 |
|
huang
|
814e766577
|
课程过滤
|
2016-03-04 21:22:47 +08:00 |
|
huang
|
e4d669251f
|
英雄榜得分
|
2016-03-04 21:13:24 +08:00 |
|
huang
|
4cf80fe441
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-04 21:11:07 +08:00 |