 yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
9 years ago |
 ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
 huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
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 |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
 cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
10 years ago |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
10 years ago |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
10 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
10 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
10 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
10 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
e3e2c37f12
|
超级管理员的最近登录用户列表添加老师列表
|
10 years ago |
 newuser
|
d747ec854d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
10 years ago |
|
huang
|
40fb140b6d
|
版本库提交记录diff信息
|
10 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
10 years ago |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
10 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
guange
|
28035dfc47
|
子域名处理
|
10 years ago |
|
ouyangxuhua
|
7b56dc7f8e
|
管理员界面，解决编辑组织报错的问题
|
10 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
10 years ago |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
10 years ago |
|
ouyangxuhua
|
280f679b0c
|
1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项
|
10 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
10 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
10 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
5e72734bee
|
增加3个url定制路由
|
10 years ago |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
10 years ago |
|
huang
|
7de48f143e
|
issue状态修改
|
10 years ago |
|
ouyangxuhua
|
ece9f9dc6f
|
项目新闻使用方块样式
|
10 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
10 years ago |
|
ouyangxuhua
|
909e0e846b
|
路由配置问题
|
10 years ago |
|
ouyangxuhua
|
f796aa1489
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
03df9abfeb
|
增加域名唯一性判断
|
10 years ago |
|
ouyangxuhua
|
c6aaaff8d1
|
对有子域名的组织，栏目的链接应不含有组织及其id
|
10 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
huang
|
18bc8215e3
|
路由冲突
|
10 years ago |
|
guange
|
c8b52db6f9
|
merge
|
10 years ago |
|
guange
|
c298adda7c
|
子域名路由实现
|
10 years ago |
|
ouyangxuhua
|
3697d74d48
|
子域名路由配置
|
10 years ago |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
10 years ago |
|
cxt
|
b73aab1cf6
|
课程讨论区的点赞
|
10 years ago |
