 yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
10 years ago |
 cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
10 years ago |
|
cxt
|
3b4f6f4846
|
添加分班和修改分班名称时刷新学生列表
|
10 years ago |
|
cxt
|
4e4eb7b759
|
学生作业积分默认显示两位小数
|
10 years ago |
|
yuanke
|
36f3d61915
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
25fd655a56
|
修改转不到查重结果页面的BUG
|
10 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
10 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
cxt
|
062af3c57a
|
作业积分出现负分
|
10 years ago |
 huang
|
1bf494f661
|
课程推荐资源统计数
|
10 years ago |
|
huang
|
cca570e75c
|
课程相关优化
|
10 years ago |
|
huang
|
cb4b26762d
|
课程base优化
|
10 years ago |
 alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
70d594659e
|
课程英雄榜代码封装
|
10 years ago |
|
huang
|
e06695b56b
|
课程活跃度代码封装
|
10 years ago |
|
cxt
|
d967a31ec9
|
课程报500
|
10 years ago |
 ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
10 years ago |
|
cxt
|
e167a28d49
|
课程推荐的作业统计
|
10 years ago |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
10 years ago |
|
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
|
10 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
 luoquan
|
1900a824e8
|
0
|
10 years ago |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
10 years ago |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
10 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
10 years ago |
|
cxt
|
c255325300
|
添加分班
|
10 years ago |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
10 years ago |
|
cxt
|
cd1409f950
|
还原学生分班
|
10 years ago |
 Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
10 years ago |
|
ouyangxuhua
|
713c28c0b5
|
个人页面快捷操作课程/项目的设置公开/私有属性，确定的提示信息要正确
|
10 years ago |
|
Tim
|
d6d8e231e6
|
课程推荐在ie中显示bug
|
10 years ago |
|
cxt
|
fcae91ecc1
|
“课程通知”改为“通知”
|
10 years ago |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口，项目成员列表入口
|
10 years ago |
|
cxt
|
7d66c06a56
|
复制学期多次点击“完成”会复制多个学期
|
10 years ago |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
10 years ago |
|
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
10 years ago |
|
ouyangxuhua
|
5c9d8954ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
f785277d42
|
解决回复框工具栏乱码、组织子域名等问题
|
10 years ago |
|
Tim
|
87f5f9c380
|
上传头像预览图片排版，课程关联组织取消按钮
|
10 years ago |
|
ouyangxuhua
|
39c913f941
|
解决某些页面二级回复工具栏乱码问题
|
10 years ago |
|
cxt
|
278139104b
|
允许老师修改开始学期
|
10 years ago |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
10 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
|
10 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
d820977d5d
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/blog_comments/show.html.erb
app/views/courses/syllabus.html.erb
app/views/messages/_org_subfield_show.html.erb
|
10 years ago |
|
Tim
|
105393548b
|
点击详情页面文本格式调整
|
10 years ago |
|
ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
10 years ago |
|
cxt
|
4d048ec596
|
课程推荐的课程列表中，为0的不显示
|
10 years ago |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
10 years ago |
guange
|
71778ba948
|
拷贝课程图标
|
10 years ago |
|
cxt
|
82fb50ccd2
|
课程学生列表的作业积分不一致
|
10 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
10 years ago |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
10 years ago |
|
huang
|
154417378e
|
精品课程默认推荐
|
10 years ago |
|
cxt
|
4530e7896a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
fc0b589760
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
huang
|
b3caa01540
|
修改课程作业链接
|
10 years ago |
|
cxt
|
6ae7da99be
|
帖子、博客、通知、文章详情页面的单词折行
|
10 years ago |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
faf1fcaf22
|
issue回复局部刷新
附件浏览问题
昵称改成登录名
|
10 years ago |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
10 years ago |
|
huang
|
c7522067e6
|
修改base界面
|
10 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
10 years ago |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
10 years ago |
|
huang
|
18c3c23d2c
|
课程推荐
|
10 years ago |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
10 years ago |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
10 years ago |
|
huang
|
b6ae14a1ce
|
课程更多字体12
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
|
ouyangxuhua
|
582880e54d
|
设置课程/项目的公开私有属性，使用局部刷新
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
|
cxt
|
eab8cc7231
|
复制学期的默认图片
|
10 years ago |
|
cxt
|
cc135503c2
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
|
cxt
|
75e2eecc37
|
课程配置中点击开课学期或结束学期弹框中，“复制学期”入口要开通
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
f1e9718f56
|
隐藏复制学期的上传图片按钮
|
10 years ago |
|
cxt
|
c5a10c504e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
7d663ce66f
|
动态内容统一高度
|
10 years ago |
|
Tim
|
125479f671
|
课程复制样式调整
|
10 years ago |
|
ouyangxuhua
|
e763a7a8ca
|
课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等
|
10 years ago |
|
cxt
|
151c08ac5c
|
复制学期
|
10 years ago |
|
cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
10 years ago |
|
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
10 years ago |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
10 years ago |
|
cxt
|
605ec52f8a
|
测验答题失败时提示网络异常
|
10 years ago |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
10 years ago |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
10 years ago |
|
guange
|
b4016faeb6
|
编辑框消失
|
10 years ago |
|
guange
|
eb97f7dfb2
|
merge
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
acb604883d
|
项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。
|
10 years ago |
