alan
|
8e41b19563
|
消息列表取消tip
|
2016-03-17 15:09:08 +08:00 |
linchun
|
52af5e4303
|
修复了管理员界面多个列表的题目问题
|
2016-03-17 15:05:14 +08:00 |
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
alan
|
a4e2fd741e
|
删除issue,返回页面不变
|
2016-03-17 14:13:29 +08:00 |
huang
|
ee40255d7e
|
资源库bytes改成b
|
2016-03-17 14:09:13 +08:00 |
huang
|
0d1fc409d1
|
版本库提示同一高度
|
2016-03-17 13:58:55 +08:00 |
huang
|
ab3fc0fb2c
|
成员提供真实姓名
|
2016-03-17 13:02:32 +08:00 |
huang
|
c8eb2d9c95
|
项目、组织添加资源历史版本下载
|
2016-03-17 12:49:00 +08:00 |
huang
|
b3faef601b
|
修复资源库样式问题
|
2016-03-17 12:43:35 +08:00 |
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
2016-03-17 12:37:05 +08:00 |
ouyangxuhua
|
805784a858
|
组织内的链接加上Setting.protocol
|
2016-03-17 10:52:19 +08:00 |
huang
|
0a881f14e8
|
导入添加自动搜索
|
2016-03-16 17:06:11 +08:00 |
alan
|
4d82f0c959
|
在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
|
2016-03-16 16:03:53 +08:00 |
linchun
|
34c9f54510
|
完成了管理员界面学校列表
|
2016-03-16 15:24:41 +08:00 |
alan
|
3b63071dee
|
修复《issue的展开和收起在属性表格的上面》
|
2016-03-16 15:12:50 +08:00 |
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
2016-03-16 12:36:15 +08:00 |
alan
|
5343759f2f
|
Merge branch 'FX-alan-search-404' into alan_develop
|
2016-03-16 11:16:41 +08:00 |
ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
2016-03-16 10:00:21 +08:00 |
cxt
|
879f9a0ad5
|
对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
|
2016-03-15 17:21:12 +08:00 |
cxt
|
e97690e2f2
|
“导入作业”改为“从题库选用”
|
2016-03-15 16:47:57 +08:00 |
cxt
|
90d664bbca
|
学生提交作品时描述框可以直接插入图片,作品列表也直接显示图片。
|
2016-03-15 16:36:10 +08:00 |
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
2016-03-15 16:28:35 +08:00 |
linchun
|
7d5a5f1de2
|
完成项目资源列表中的排序(资源大小,上传时间,下载次数)
|
2016-03-15 16:14:53 +08:00 |
linchun
|
3fcf192430
|
完成了课程资源列表的排序(上传时间,资源大小,下载次数)
|
2016-03-15 15:59:49 +08:00 |
huang
|
22ce591c36
|
资源库添加搜索过滤
|
2016-03-15 15:42:20 +08:00 |
linchun
|
d3ed89d87e
|
sort
|
2016-03-15 15:23:43 +08:00 |
ouyangxuhua
|
70f4bb1c14
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-15 14:22:38 +08:00 |
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接;组织资源文件名过长时省略显示
|
2016-03-15 14:17:06 +08:00 |
ouyangxuhua
|
b716e593b5
|
组织下的链接问题
|
2016-03-15 13:49:44 +08:00 |
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-15 13:40:33 +08:00 |
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
2016-03-15 11:19:03 +08:00 |
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-15 11:12:24 +08:00 |
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
2016-03-15 11:09:11 +08:00 |
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
2016-03-15 09:47:58 +08:00 |
linchun
|
4da8a3828f
|
用户最新列表单位完成,修改了点击最后两页报错的问题
|
2016-03-15 09:47:27 +08:00 |
linchun
|
df4ad9f597
|
完成管理员界面最近登录列表单位信息
|
2016-03-15 09:31:35 +08:00 |
huang
|
2b21213b7f
|
公共资源库,排序
|
2016-03-15 09:26:26 +08:00 |
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 18:31:09 +08:00 |
ouyangxuhua
|
15dfaf67b2
|
测试版环境,登陆注册改成https://test.forge.
|
2016-03-14 18:29:50 +08:00 |
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
2016-03-14 18:25:26 +08:00 |
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
2016-03-14 18:20:19 +08:00 |
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
2016-03-14 18:19:23 +08:00 |
huang
|
a1cae3f592
|
admin教师单位获取
|
2016-03-14 17:50:07 +08:00 |
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:46:47 +08:00 |
linchun
|
a1bef60bb5
|
Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun
|
2016-03-14 17:41:14 +08:00 |
linchun
|
96f65f338c
|
用户列表添加单位
|
2016-03-14 17:40:49 +08:00 |
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
2016-03-14 17:31:53 +08:00 |
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
2016-03-14 17:16:11 +08:00 |
cxt
|
d2a8acf87b
|
个人主页--首页显示不全,右下角也应该显示展开按钮
|
2016-03-14 17:11:23 +08:00 |
cxt
|
c770fd157c
|
题库:题目描述变窄,缺省文字:【尹刚提供】
|
2016-03-14 16:33:16 +08:00 |
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源,过滤条件中的“其他”应该显示
|
2016-03-14 15:39:45 +08:00 |
cxt
|
3d1f7cc0a8
|
提交作品:作品标题设缺省值:作业名称+“的作品提交”。学生不改就使用缺省值
|
2016-03-14 15:02:37 +08:00 |
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
2016-03-14 14:39:58 +08:00 |
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中,避免报错;退出链接不带子域名
|
2016-03-14 11:00:55 +08:00 |
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
2016-03-14 10:25:39 +08:00 |
alan
|
ce6d63ccaf
|
重构user.find
|
2016-03-14 10:24:50 +08:00 |
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
2016-03-11 19:34:33 +08:00 |
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 19:31:22 +08:00 |
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
2016-03-11 19:31:06 +08:00 |
guange
|
45c51ef8db
|
merge
|
2016-03-11 18:51:41 +08:00 |
guange
|
24a278d7d6
|
加上atall
|
2016-03-11 18:50:37 +08:00 |
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 16:18:10 +08:00 |
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
2016-03-11 16:17:51 +08:00 |
huang
|
97a7694778
|
访问统计数--views
|
2016-03-11 15:58:16 +08:00 |
Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 15:51:59 +08:00 |
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 15:49:54 +08:00 |
Tim
|
de3a4718ab
|
个人,课程,项目,组织访问量添加
|
2016-03-11 15:49:24 +08:00 |
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
alan
|
1f5c90185a
|
修复《顶部搜索“分析”报404错误》
|
2016-03-11 13:14:32 +08:00 |
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
2016-03-11 11:34:16 +08:00 |
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
2016-03-11 11:23:16 +08:00 |
cxt
|
2812fcd2fb
|
删除无用代码
|
2016-03-11 10:45:29 +08:00 |
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
2016-03-11 10:21:59 +08:00 |
luoquan
|
7d70e63f8d
|
代码重置
|
2016-03-11 10:18:10 +08:00 |
ouyangxuhua
|
bc5ce1fd22
|
组织下的课程帖子链接参数正确传输
|
2016-03-11 09:31:36 +08:00 |
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
2016-03-10 17:41:53 +08:00 |
ouyangxuhua
|
eb3c0d9334
|
组织设置为公开后,允许游客下载选项变为可选;老师的提交作业消息不显示
|
2016-03-10 17:33:22 +08:00 |
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
2016-03-10 17:04:26 +08:00 |
huang
|
08cb7b642c
|
附件上传样式
|
2016-03-10 16:43:25 +08:00 |
huang
|
1644442d2e
|
修改附件描述样式
|
2016-03-10 16:41:56 +08:00 |
huang
|
627580a9ac
|
标签问题(未完)
|
2016-03-10 16:25:39 +08:00 |
cxt
|
c255325300
|
添加分班
|
2016-03-10 15:47:03 +08:00 |
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
huang
|
281d31980d
|
Merge branch 'develop' into hjq_new_course
|
2016-03-10 15:02:34 +08:00 |
cxt
|
0fb808e2fd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-10 14:53:23 +08:00 |
huang
|
c947121e2b
|
消息不显示问题(未完)
|
2016-03-10 14:52:49 +08:00 |
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-03-10 14:52:23 +08:00 |
cxt
|
cd1409f950
|
还原学生分班
|
2016-03-10 14:51:31 +08:00 |
ouyangxuhua
|
6cf518e2e4
|
1.组织的非成员用户,隐藏上传资源/导入资源;2.申请的子域名,一律改成小写
|
2016-03-10 14:38:33 +08:00 |
ouyangxuhua
|
680bdc3d34
|
组织下的链接改成https://www.
|
2016-03-10 14:12:50 +08:00 |
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
2016-03-10 12:47:10 +08:00 |
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品,代码会跳到上一个作品的详情
|
2016-03-10 11:40:56 +08:00 |
cxt
|
f8f36f9f29
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-10 11:15:43 +08:00 |
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
2016-03-10 11:15:37 +08:00 |
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |
ouyangxuhua
|
16b0bf9c80
|
更新组织栏目优先级,如果输入不合法,则不作改变
|
2016-03-10 09:06:07 +08:00 |
ouyangxuhua
|
a51ca428be
|
组织中,增加调整栏目显示顺序的功能
|
2016-03-09 18:06:28 +08:00 |
huang
|
3d2ba83c36
|
@消息问题修复
|
2016-03-09 17:22:16 +08:00 |
huang
|
5a4f422b1c
|
消息分页问题
|
2016-03-09 16:44:11 +08:00 |
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-09 15:29:06 +08:00 |
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
2016-03-09 15:28:28 +08:00 |
huang
|
b4800585e7
|
解决消息 信息500问题
|
2016-03-09 15:24:02 +08:00 |
huang
|
84d7049add
|
fork弹出新页面,解决间接性500问题
|
2016-03-09 13:17:37 +08:00 |
ouyangxuhua
|
713c28c0b5
|
个人页面快捷操作课程/项目的设置公开/私有属性,确定的提示信息要正确
|
2016-03-09 10:25:57 +08:00 |
Tim
|
d6d8e231e6
|
课程推荐在ie中显示bug
|
2016-03-09 09:46:07 +08:00 |
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖,删除的时候统计数字递减
|
2016-03-08 17:38:38 +08:00 |
ouyangxuhua
|
5d1d56fbb3
|
组织下链接改成https://www.形式
|
2016-03-08 16:44:03 +08:00 |
Tim
|
141c0be24f
|
上传资源弹窗样式调整
|
2016-03-08 15:50:01 +08:00 |
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
2016-03-08 15:20:38 +08:00 |
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-08 11:29:58 +08:00 |
linchun
|
3c66a29767
|
完善课程资源列表,完成项目资源列表
|
2016-03-08 11:01:08 +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 |
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源,数量一致
|
2016-03-07 18:12:40 +08:00 |
ouyangxuhua
|
d70df6a89d
|
公开组织的资源,非成员不能看到私有资源
|
2016-03-07 17:41:43 +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 |
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
2016-03-07 16:46:02 +08:00 |
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-07 16:15:13 +08:00 |
cxt
|
f8ce6d48d3
|
模拟答题的返回按钮应该回到课程作业列表
|
2016-03-07 14:31:58 +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 |
huang
|
d30e73795d
|
积分规则
|
2016-03-06 12:15:57 +08:00 |
huang
|
4f2937e1a2
|
英雄榜
|
2016-03-05 10:38:21 +08:00 |
huang
|
a079a61c82
|
回复数
|
2016-03-05 04:29:10 +08:00 |
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
2016-03-05 04:01:10 +08:00 |
huang
|
bafa151c0d
|
0
|
2016-03-05 03:16:04 +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 |
huang
|
6ce947667d
|
课程英雄榜提示
|
2016-03-04 21:10:45 +08:00 |
cxt
|
782bbc775b
|
公共资源库的统计
|
2016-03-04 21:04:21 +08:00 |
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-04 18:37:46 +08:00 |
huang
|
38fca02193
|
注释搜索
|
2016-03-04 18:36:42 +08:00 |
huang
|
ae40a4ea61
|
公共资源相关功能
|
2016-03-04 18:22:22 +08:00 |
cxt
|
3deaa492b2
|
编辑作业时作业描述被解析了
|
2016-03-04 18:11:23 +08:00 |
cxt
|
4f3055c990
|
讨论区改为问答区,且放开课程的“问答区”,就是课外的用户也能在公开课内发帖或回帖。
|
2016-03-04 17:11:52 +08:00 |
cxt
|
fd8b40a36e
|
对于编程作业,系统评分的前几名能否也显示出来
|
2016-03-04 16:53:36 +08:00 |
huang
|
91b8a81b9d
|
去掉全站搜索
|
2016-03-04 16:10:41 +08:00 |
huang
|
bbbf13084e
|
修改搜索功能,页面跳转
|
2016-03-04 16:05:58 +08:00 |
cxt
|
947e6ea469
|
作业--“禁用匿评”处增加提示语:匿评是同学之间的双盲互评过程:每个同学将评阅系统分配给他/她的若干个作品。
|
2016-03-04 16:00:20 +08:00 |
cxt
|
ffac8164f1
|
管理员的课程和项目列表,按照时间倒排
|
2016-03-04 15:55:45 +08:00 |
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面,目前该页面中的精品课程是固定的
|
2016-03-04 15:31:40 +08:00 |
cxt
|
a5cb3d5e6a
|
新建作品时的输入框改为“请输入作品名称”、“请输入作品描述”
|
2016-03-04 15:14:38 +08:00 |
cxt
|
d2920c64ea
|
题库作业发送到课程后增加提示
|
2016-03-04 15:12:03 +08:00 |
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
2016-03-04 13:18:43 +08:00 |
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
2016-03-04 11:37:14 +08:00 |
huang
|
50011985a9
|
课程资源库添加资源描述
|
2016-03-04 11:19:07 +08:00 |
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
2016-03-04 11:11:25 +08:00 |
cxt
|
e2ff348075
|
题库的作业过滤
|
2016-03-04 11:07:53 +08:00 |
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
2016-03-04 10:34:04 +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 |
huang
|
ba9b22fbe1
|
公共资源,删除、重命名
|
2016-03-03 23:56:06 +08:00 |
huang
|
3dacf900d5
|
修改导入公共、我的资源
|
2016-03-03 23:24:25 +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
|
b3fea3e229
|
资源库代码封装
|
2016-03-02 11:30:19 +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
|
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
|
7d66c06a56
|
复制学期多次点击“完成”会复制多个学期
|
2016-02-26 17:44:46 +08:00 |
ouyangxuhua
|
6e85b38b09
|
1.博客设为首页后转到个人主页;2.组织栏目设为首页正确实现文章
|
2016-02-26 17:11:18 +08:00 |
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +08:00 |
ouyangxuhua
|
1951d50bf7
|
组织文章不显示回复框的问题
|
2016-02-26 16:37:13 +08:00 |
cxt
|
0b6521c921
|
禁用匿评的作业动态仍然显示缺评扣分
|
2016-02-26 16:37:02 +08:00 |
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
2016-02-26 16:26:51 +08:00 |
cxt
|
e3e2c37f12
|
超级管理员的最近登录用户列表添加老师列表
|
2016-02-26 16:26:20 +08:00 |
newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-02-26 14:57:41 +08:00 |
newuser
|
d747ec854d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
2016-02-26 14:55:28 +08:00 |
Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
2016-02-26 10:41:14 +08:00 |
cxt
|
c93b4d109a
|
作业动态添加子菜单:公开作品/取消公开
|
2016-02-25 16:18:24 +08:00 |
Tim
|
100b002a1f
|
提交改动显示页面调整
|
2016-02-25 15:48:49 +08:00 |