guange
|
e8adcf8cc7
|
添加sso model
|
9 years ago |
|
guange
|
0635c1e98b
|
添加单点登录controller
|
9 years ago |
|
guange
|
483f99f401
|
注释掉profile的GEM
|
9 years ago |
 cxt
|
2ca77d26b6
|
作业列表报500
|
9 years ago |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
9 years ago |
|
cxt
|
8f3b9ae9fe
|
动态的？
|
9 years ago |
|
cxt
|
d7789b7739
|
迁移文件
|
9 years ago |
|
cxt
|
f62b6c4c31
|
提交
|
9 years ago |
|
cxt
|
c2d60b8958
|
教师优先的迟交扣分和缺评扣分
|
9 years ago |
|
cxt
|
7445c64e46
|
课程和项目的帖子详情页面添加点赞
|
9 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
26c6c1d915
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1dc0f9dd95
|
主页的项目和课程排序
|
9 years ago |
 yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
f8abd46ae9
|
列表修改
|
9 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
9 years ago |
|
yuanke
|
789f3906a5
|
课程列表，列表描述内容去掉空格
|
9 years ago |
|
yuanke
|
196501bc39
|
项目列表问题
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
9 years ago |
|
cxt
|
4a5a602a6e
|
迁移
|
9 years ago |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
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 |
|
yuanke
|
a893f88ede
|
微信模版本地丢了
|
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 |
|
yuanke
|
22fc31eb82
|
先把隐藏课程信息的功能去掉
|
9 years ago |
|
yuanke
|
bcca1366e9
|
Merge branch 'yuanke_1' into yuanke
|
9 years ago |
|
yuanke
|
dd00533084
|
帖子显示三行好点
|
9 years ago |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
9 years ago |
|
cxt
|
451b53f3cc
|
qianyi
|
9 years ago |
|
cxt
|
d244e22066
|
rake
|
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
|
698dfdab4a
|
组织点赞不能用
|
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 |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
9 years ago |
 huang
|
811c3a065e
|
完成左中一模块定制
|
9 years ago |
|
huang
|
ddf1e6f2db
|
组织模式3完成
|
9 years ago |
|
huang
|
70fa3fddfd
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
cded1802cc
|
右上模块定制完成
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
df0a7bbf34
|
冲突
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
yuanke
|
aabb969588
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
