 cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
9 years ago |
|
cxt
|
a1f393c117
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
9 years ago |
|
cxt
|
2eefdcd0ee
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
9 years ago |
 huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
9 years ago |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
9 years ago |
 ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
9 years ago |
|
cxt
|
879f9a0ad5
|
对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
|
9 years ago |
|
cxt
|
e97690e2f2
|
“导入作业”改为“从题库选用”
|
9 years ago |
|
cxt
|
90d664bbca
|
学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。
|
9 years ago |
|
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示
|
9 years ago |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
9 years ago |
|
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
9 years ago |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
9 years ago |
 yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
9 years ago |
|
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
9 years ago |
|
cxt
|
d2a8acf87b
|
个人主页--首页显示不全，右下角也应该显示展开按钮
|
9 years ago |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
9 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
9 years ago |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
9 years ago |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
9 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
9 years ago |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
9 years ago |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
9 years ago |
|
huang
|
97a7694778
|
访问统计数--views
|
9 years ago |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
9 years ago |
 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
9 years ago |
|
luoquan
|
1900a824e8
|
0
|
9 years ago |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
9 years ago |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
9 years ago |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
9 years ago |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
9 years ago |
|
luoquan
|
7d70e63f8d
|
代码重置
|
9 years ago |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
9 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
9 years ago |
|
huang
|
08cb7b642c
|
附件上传样式
|
9 years ago |
|
cxt
|
c255325300
|
添加分班
|
9 years ago |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
9 years ago |
|
cxt
|
0fb808e2fd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
