 cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
9 years ago |
 huang
|
596d4e17e9
|
解决样式冲突
|
9 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
9 years ago |
|
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
|
9 years ago |
|
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
|
9 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
9 years ago |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
9 years ago |
 Tim
|
f51d16c538
|
资源库样式调整
|
9 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
9 years ago |
|
huang
|
8edaa9d2bd
|
资源库
|
9 years ago |
|
Tim
|
11592bdbcc
|
导入题库题目弹框样式更改
|
9 years ago |
|
cxt
|
f6f84b564e
|
在线测验的选项和候选答案的正确显示
|
9 years ago |
|
cxt
|
072300331b
|
编程测试集的输入输出添加序号
|
9 years ago |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
9 years ago |
 ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
9 years ago |
|
ouyangxuhua
|
8784c7cec6
|
超链接不能正常显示的问题
|
9 years ago |
 newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
9 years ago |
|
Tim
|
100b002a1f
|
提交改动显示页面调整
|
9 years ago |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
9 years ago |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
9 years ago |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e499be999f
|
课程英雄榜的样式修改
|
9 years ago |
|
Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
9 years ago |
|
huang
|
ea2033eb30
|
Git文件识别，换行
|
9 years ago |
|
cxt
|
347efa275d
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
87f5f9c380
|
上传头像预览图片排版，课程关联组织取消按钮
|
9 years ago |
|
huang
|
78c70dce81
|
版本库用户名长度引起的错位
|
9 years ago |
|
ouyangxuhua
|
808f9a6b7a
|
组织页面右上角样式还原
|
9 years ago |
|
Tim
|
228857f20c
|
资源历史版本样式
|
9 years ago |
|
huang
|
59d45f2d52
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
55b13e7dde
|
历史版本样式更改
|
9 years ago |
|
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
|
9 years ago |
|
ouyangxuhua
|
5df44ba44f
|
1.ke回复框能自动增加高度；2.组织页面右上角链接修改
|
9 years ago |
|
ouyangxuhua
|
63b644dbb9
|
解决”组织帖子附件超过20个后，编辑时不能增加附件“的问题
|
9 years ago |
guange
|
ac121ce585
|
组织文章无法编辑问题
|
9 years ago |
|
ouyangxuhua
|
02f8007557
|
修改组织配置的样式；修改一个bug
|
9 years ago |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
9 years ago |
|
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
|
9 years ago |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
9 years ago |
|
Tim
|
d092891b2a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
83a3c879d4
|
私信配置按钮显示
|
9 years ago |
|
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
9 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
9 years ago |
|
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项
|
9 years ago |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
9 years ago |
|
ouyangxuhua
|
c857fb734b
|
快捷回复中，设置回复框的高度和宽度
|
9 years ago |
