 huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
2016-05-03 17:12:38 +08:00 |
 cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
2016-05-03 17:11:30 +08:00 |
|
cxt
|
55297a9daf
|
统一作业动态中项目的更新时间与tip中的更新时间
|
2016-05-03 15:19:22 +08:00 |
|
cxt
|
c49627913b
|
更改评分设置中的教师优先，评分未更新
|
2016-05-03 15:12:56 +08:00 |
|
cxt
|
8ccedaa622
|
通知详情添加点赞
|
2016-05-03 14:13:01 +08:00 |
|
cxt
|
14a539bd0a
|
样式冲突
|
2016-05-03 11:40:24 +08:00 |
|
cxt
|
6b1137980e
|
挂起的作业编辑截止日期后报500
|
2016-05-03 10:58:49 +08:00 |
|
cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
2016-05-03 10:15:09 +08:00 |
|
cxt
|
3f7a391214
|
课程和项目的排序
|
2016-04-29 20:45:14 +08:00 |
|
cxt
|
1cad1626e0
|
解决冲突
|
2016-04-29 20:31:31 +08:00 |
 guange
|
483f99f401
|
注释掉profile的GEM
|
2016-04-29 20:09:42 +08:00 |
|
cxt
|
2ca77d26b6
|
作业列表报500
|
2016-04-29 19:49:09 +08:00 |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-29 19:22:08 +08:00 |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
2016-04-29 19:21:54 +08:00 |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
2016-04-29 17:57:32 +08:00 |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
2016-04-29 17:55:57 +08:00 |
|
cxt
|
8f3b9ae9fe
|
动态的？
|
2016-04-29 16:54:48 +08:00 |
|
cxt
|
d7789b7739
|
迁移文件
|
2016-04-29 16:48:11 +08:00 |
|
cxt
|
f62b6c4c31
|
提交
|
2016-04-29 16:45:15 +08:00 |
|
cxt
|
c2d60b8958
|
教师优先的迟交扣分和缺评扣分
|
2016-04-29 16:38:26 +08:00 |
|
cxt
|
7445c64e46
|
课程和项目的帖子详情页面添加点赞
|
2016-04-29 16:23:36 +08:00 |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-04-29 15:58:05 +08:00 |
|
cxt
|
26c6c1d915
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-29 15:57:42 +08:00 |
|
cxt
|
1dc0f9dd95
|
主页的项目和课程排序
|
2016-04-29 15:55:29 +08:00 |
 yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
2016-04-29 15:54:37 +08:00 |
|
yuanke
|
f8abd46ae9
|
列表修改
|
2016-04-29 15:52:44 +08:00 |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
2016-04-29 15:46:26 +08:00 |
|
yuanke
|
789f3906a5
|
课程列表，列表描述内容去掉空格
|
2016-04-29 15:07:46 +08:00 |
|
yuanke
|
196501bc39
|
项目列表问题
|
2016-04-29 14:08:25 +08:00 |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
|
cxt
|
4a5a602a6e
|
迁移
|
2016-04-28 14:46:27 +08:00 |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
2016-04-28 14:33:30 +08:00 |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
2016-04-28 14:31:40 +08:00 |
|
yuanke
|
b3fdc45a04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 12:38:06 +08:00 |
|
yuanke
|
54a8e6871c
|
问答区列表修改
|
2016-04-28 11:31:31 +08:00 |
|
yuanke
|
a893f88ede
|
微信模版本地丢了
|
2016-04-28 10:52:55 +08:00 |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
2016-04-28 10:49:05 +08:00 |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
|
yuanke
|
22fc31eb82
|
先把隐藏课程信息的功能去掉
|
2016-04-28 10:39:11 +08:00 |
|
yuanke
|
bcca1366e9
|
Merge branch 'yuanke_1' into yuanke
|
2016-04-28 10:32:57 +08:00 |
|
yuanke
|
dd00533084
|
帖子显示三行好点
|
2016-04-28 10:32:32 +08:00 |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
2016-04-28 10:19:59 +08:00 |
|
cxt
|
451b53f3cc
|
qianyi
|
2016-04-28 10:09:45 +08:00 |
|
cxt
|
d244e22066
|
rake
|
2016-04-28 10:08:09 +08:00 |
|
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
|
2016-04-27 16:27:55 +08:00 |
|
cxt
|
698dfdab4a
|
组织点赞不能用
|
2016-04-27 16:25:17 +08:00 |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
2016-04-27 16:21:35 +08:00 |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
2016-04-27 16:02:52 +08:00 |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
2016-04-27 14:30:28 +08:00 |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
2016-04-27 14:12:56 +08:00 |