 cxt
|
bd22364f0a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-05 09:13:36 +08:00 |
|
cxt
|
2efe80c520
|
commit
|
2016-05-05 09:13:31 +08:00 |
|
cxt
|
5e8c749715
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-05 09:09:56 +08:00 |
|
cxt
|
121aca7505
|
缺陷模板消息
|
2016-05-05 09:09:45 +08:00 |
 huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
2016-05-03 18:17:54 +08:00 |
|
huang
|
4489bc13d7
|
课程列表按创建时间排序
|
2016-05-03 18:17:03 +08:00 |
|
cxt
|
d3e3e9d22b
|
补交作品的样式
|
2016-05-03 18:15:40 +08:00 |
|
cxt
|
407af62654
|
作业动态的分数显示
|
2016-05-03 18:06:53 +08:00 |
|
cxt
|
bcb02e49d3
|
课程问答区的名片显示
|
2016-05-03 17:23:56 +08:00 |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
2016-05-03 17:15:46 +08:00 |
|
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
2016-05-03 17:14:58 +08:00 |
|
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 |
 yuanke
|
96e7c9d134
|
新闻排序时间改为更新时间
|
2016-05-03 16:34:31 +08:00 |
 txz
|
de8b303b93
|
微信数据请求时显示加载中
|
2016-05-03 15:37:35 +08:00 |
|
cxt
|
55297a9daf
|
统一作业动态中项目的更新时间与tip中的更新时间
|
2016-05-03 15:19:22 +08:00 |
|
cxt
|
c49627913b
|
更改评分设置中的教师优先，评分未更新
|
2016-05-03 15:12:56 +08:00 |
|
yuanke
|
5f24fb6496
|
锁的样式修改
|
2016-05-03 14:40:33 +08:00 |
|
yuanke
|
2468010125
|
课程、项目列表修改
|
2016-05-03 14:30:35 +08:00 |
|
cxt
|
8ccedaa622
|
通知详情添加点赞
|
2016-05-03 14:13:01 +08:00 |
|
cxt
|
14a539bd0a
|
样式冲突
|
2016-05-03 11:40:24 +08:00 |
|
yuanke
|
d5805e8103
|
课程、项目列表不显示已删除的
|
2016-05-03 11:24:16 +08:00 |
|
cxt
|
151661830f
|
微信模板消息的样式
|
2016-05-03 11:03:34 +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 |
|
yuanke
|
b199a6b8b2
|
列表人气排序修改
|
2016-04-29 19:24:20 +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 |