 huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
 cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
cxt
|
baaff3f988
|
数据迁移
|
9 years ago |
|
cxt
|
90a9472e30
|
删除空数据
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
9 years ago |
|
huang
|
37ee03374e
|
完成设置名师功能
|
9 years ago |
|
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
9096ad5eac
|
数据迁移的还原
|
9 years ago |
|
cxt
|
2d95885345
|
迁移文件
|
9 years ago |
|
cxt
|
77d713a390
|
合并两个相同的作业
|
9 years ago |
|
cxt
|
6d32e812aa
|
统一课程动态和作业的更新时间
|
9 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
9 years ago |
|
huang
|
3de2b151a3
|
左三”更多“提供链接
|
9 years ago |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
9 years ago |
guange
|
e8adcf8cc7
|
添加sso model
|
9 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
9 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
9 years ago |
|
huang
|
9fbf713709
|
完成组织二级域名
|
9 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
huang
|
5d506458df
|
迁移空数据问题
|
9 years ago |
|
huang
|
cc48fb5a98
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
f5a88ef6f9
|
数据库为空的迁移问题
|
9 years ago |
|
cxt
|
76b37d7670
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
26b1aee90d
|
修改周海芳老师四个作业的截止日期和学生得分
|
9 years ago |
 yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
cxt
|
0fa16251e7
|
删除学生提交的多分作品
|
9 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
9 years ago |
|
yuanke
|
de0ba0fbe5
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
6444d859a7
|
迁移文件修改
|
9 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
9 years ago |
|
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
huang
|
c408185b40
|
Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
Conflicts:
db/schema.rb
|
9 years ago |
