 Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
2016-03-11 15:49:24 +08:00 |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |
 cxt
|
1cccf79bd8
|
课程资源库菜单中的删除资源无法点击
|
2016-03-09 09:20:53 +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
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
2016-03-07 17:01:10 +08:00 |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
2016-03-07 16:50:30 +08:00 |
 huang
|
d30e73795d
|
积分规则
|
2016-03-06 12:15:57 +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 |
|
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 |
|
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 |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
2016-03-03 10:38:37 +08:00 |
|
Tim
|
f51d16c538
|
资源库样式调整
|
2016-03-02 18:20:36 +08:00 |
|
huang
|
21244a5657
|
资源库导入功能
|
2016-03-02 17:46:10 +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
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +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 |
 ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
2016-02-26 16:18:17 +08:00 |
|
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
2016-02-26 16:13:14 +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 |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
|
Tim
|
100b002a1f
|
提交改动显示页面调整
|
2016-02-25 15:48:49 +08:00 |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
2016-02-25 11:06:10 +08:00 |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
2016-02-25 10:23:38 +08:00 |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-24 16:08:38 +08:00 |
|
cxt
|
e499be999f
|
课程英雄榜的样式修改
|
2016-02-24 16:05:48 +08:00 |
|
Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
2016-02-24 15:47:30 +08:00 |
|
huang
|
ea2033eb30
|
Git文件识别，换行
|
2016-02-24 11:24:05 +08:00 |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
2016-02-24 09:50:53 +08:00 |
|
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-23 16:20:07 +08:00 |
|
Tim
|
87f5f9c380
|
上传头像预览图片排版，课程关联组织取消按钮
|
2016-02-23 15:26:34 +08:00 |
|
huang
|
78c70dce81
|
版本库用户名长度引起的错位
|
2016-02-22 15:52:16 +08:00 |
|
ouyangxuhua
|
808f9a6b7a
|
组织页面右上角样式还原
|
2016-02-20 17:40:00 +08:00 |
|
Tim
|
228857f20c
|
资源历史版本样式
|
2016-02-20 17:23:24 +08:00 |
|
huang
|
59d45f2d52
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-20 17:18:49 +08:00 |
|
Tim
|
55b13e7dde
|
历史版本样式更改
|
2016-02-20 17:00:21 +08:00 |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
Conflicts:
app/views/org_document_comments/edit.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-02-20 16:49:19 +08:00 |
|
ouyangxuhua
|
5df44ba44f
|
1.ke回复框能自动增加高度；2.组织页面右上角链接修改
|
2016-02-20 15:18:24 +08:00 |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
2016-02-20 11:06:21 +08:00 |
 guange
|
ac121ce585
|
组织文章无法编辑问题
|
2016-02-18 15:26:07 +08:00 |
|
ouyangxuhua
|
02f8007557
|
修改组织配置的样式；修改一个bug
|
2016-02-03 12:42:42 +08:00 |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
2016-02-02 17:16:50 +08:00 |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
2016-02-02 15:55:07 +08:00 |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
2016-02-02 15:50:28 +08:00 |