 huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
9 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
 cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
 txz
|
e2f3ba8e7d
|
微信问题修改
|
9 years ago |
|
txz
|
278ee66368
|
系统冲突
|
9 years ago |
|
txz
|
1b3bc38f8e
|
拖代码改动
|
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 |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
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
|
320c3881ef
|
多次点击发送按钮不应新建多个作业
|
9 years ago |
|
txz
|
ec3a077b22
|
微信意见反馈按钮文字错误
|
9 years ago |
|
Tim
|
cf1cf58bab
|
组织门户二级目录添加分栏"|"以及登录未登录位置控制
|
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
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
cxt
|
d7789b7739
|
迁移文件
|
9 years ago |
|
cxt
|
f62b6c4c31
|
提交
|
9 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
9 years ago |
|
Tim
|
5f1b335cfb
|
北斗二级菜单显隐
|
9 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
9 years ago |
|
cxt
|
4a5a602a6e
|
迁移
|
9 years ago |
 yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
54a8e6871c
|
问答区列表修改
|
9 years ago |
|
Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
9 years ago |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
cxt
|
451b53f3cc
|
qianyi
|
9 years ago |
|
cxt
|
d244e22066
|
rake
|
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 |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
9 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
