 yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
10 years ago |
 huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
10 years ago |
Your Name
|
e5b93ac7ed
|
modified main method
|
10 years ago |
|
huang
|
5aa79defbe
|
迁移问题
|
10 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
10 years ago |
|
Your Name
|
537f152562
|
0
|
10 years ago |
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
10 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
10 years ago |
|
guange
|
d348981721
|
加入邀请码
|
10 years ago |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
10 years ago |
|
Your Name
|
9e7cde6056
|
stable version for sonar
|
10 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
guange
|
8fd4d518b2
|
添加邀请码
|
10 years ago |
 cxt
|
6100abe0da
|
课程大纲
|
10 years ago |
|
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改， 配置页面域名长度问题
|
10 years ago |
|
huang
|
4ea12a6dc5
|
删除匿名用户数据迁移
|
10 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
10 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
10 years ago |
|
cxt
|
b065184754
|
删除机器人组织的匿名评论
|
10 years ago |
|
huang
|
61eeee702c
|
migrate
|
10 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
10 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
10 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
10 years ago |
|
cxt
|
baaff3f988
|
数据迁移
|
10 years ago |
|
cxt
|
90a9472e30
|
删除空数据
|
10 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
10 years ago |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
10 years ago |
|
huang
|
37ee03374e
|
完成设置名师功能
|
10 years ago |
|
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
9096ad5eac
|
数据迁移的还原
|
10 years ago |
|
cxt
|
2d95885345
|
迁移文件
|
10 years ago |
|
cxt
|
77d713a390
|
合并两个相同的作业
|
10 years ago |
|
cxt
|
6d32e812aa
|
统一课程动态和作业的更新时间
|
10 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
c6c3625029
|
题目申请说明内容较长时，会导致被申请者收不到消息
|
10 years ago |
|
huang
|
3de2b151a3
|
左三”更多“提供链接
|
10 years ago |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 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
|
10 years ago |
|
guange
|
e8adcf8cc7
|
添加sso model
|
10 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
10 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
10 years ago |
|
huang
|
9fbf713709
|
完成组织二级域名
|
10 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
|
10 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
10 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
