guange
|
ff93e9f79b
|
修改返回为json
|
10 years ago |
|
guange
|
1926f0ba53
|
修改openid路由
|
10 years ago |
|
guange
|
a25fe6cef8
|
修改openid路由
|
10 years ago |
|
guange
|
9c93b3f9a6
|
修改openid调用位置
|
10 years ago |
 Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
10 years ago |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
10 years ago |
|
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
10 years ago |
|
guange
|
6ae4cd0767
|
merge
|
10 years ago |
|
guange
|
59923dfb03
|
merge
|
10 years ago |
 cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
10 years ago |
 huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
10 years ago |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
10 years ago |
|
cxt
|
a482b76207
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
e34f2e45db
|
管理员界面的课程列表和项目列表分页
|
10 years ago |
|
cxt
|
24318e3d6b
|
题库的刷新
|
10 years ago |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
10 years ago |
|
cxt
|
119b12349b
|
作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
|
10 years ago |
|
huang
|
4766abab7f
|
下载行为添加ID判断
|
10 years ago |
|
huang
|
b262e1b432
|
完成下载行为记录
|
10 years ago |
|
cxt
|
2466184d8a
|
编辑作业的时候，还要选择作业发布的课程不合理，影响体验
编辑作业时layout根据来源而不同
|
10 years ago |
|
huang
|
79767f4bae
|
用户行为记录
|
10 years ago |
|
cxt
|
c73637a4ca
|
作业列表按作业发布时间排序
|
10 years ago |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
10 years ago |
 ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
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
|
10 years ago |
|
huang
|
84470af2ff
|
删除的课程和项目不在发送中显示
|
10 years ago |
 alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
10 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
10 years ago |
|
huang
|
0a881f14e8
|
导入添加自动搜索
|
10 years ago |
|
alan
|
4d82f0c959
|
在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
|
10 years ago |
|
huang
|
064dc81ed6
|
解决公共资源删除资源后统计数字不减少的问题
（增加删除回调）
|
10 years ago |
|
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
alan
|
050a266985
|
Merge branch 'FX-alan-message-access-slow' into alan_develop
|
10 years ago |
|
ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
10 years ago |
|
huang
|
9aab10c05a
|
代码更新
|
10 years ago |
|
cxt
|
879f9a0ad5
|
对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
|
10 years ago |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
10 years ago |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
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 |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
10 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
10 years ago |
|
ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
