 lizanle
|
0ed7d84914
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 15:22:35 +08:00 |
|
lizanle
|
084844941f
|
个人单位修改。
聚焦就搜索所有的学校
|
2015-12-18 15:22:29 +08:00 |
 cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
2015-12-18 15:08:38 +08:00 |
|
cxt
|
ba4c93e4c4
|
Merge branch 'cxt_course' into szzh
|
2015-12-18 15:03:24 +08:00 |
|
cxt
|
a7c006c59f
|
课程讨论区的展开更多不可用
|
2015-12-18 15:02:36 +08:00 |
|
lizanle
|
eb02a3d34a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 14:38:10 +08:00 |
|
lizanle
|
70f93741d6
|
issue图标问题
|
2015-12-18 14:38:04 +08:00 |
 ouyangxuhua
|
b3b5bc7ffd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 14:30:43 +08:00 |
|
ouyangxuhua
|
85bc9ce43d
|
解决组织模块的一些bug
|
2015-12-18 14:30:25 +08:00 |
|
cxt
|
c230ff5bed
|
普通作业提交报500
|
2015-12-18 13:16:01 +08:00 |
|
cxt
|
ca77af9221
|
作业动态添加扣分规则
|
2015-12-18 13:13:23 +08:00 |
|
cxt
|
b65e84d166
|
未答测验的学生在测验截止时间到了后算作零分
|
2015-12-18 12:47:34 +08:00 |
|
lizanle
|
e867358bc1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 11:20:07 +08:00 |
|
lizanle
|
06734d86ca
|
attachment_acts页面变量错误
|
2015-12-18 11:19:55 +08:00 |
 guange
|
8c967e6559
|
格式改进
|
2015-12-18 11:13:27 +08:00 |
|
guange
|
74be964eaf
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 10:53:51 +08:00 |
|
guange
|
e8cf5d1042
|
at消息html代码问题
|
2015-12-18 10:53:35 +08:00 |
|
lizanle
|
79032df551
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 10:48:26 +08:00 |
|
lizanle
|
bba40de36d
|
journal不应该算入ForgeActivity，历史数据应该删除
|
2015-12-18 10:48:13 +08:00 |
|
guange
|
39ad191dd0
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 10:41:06 +08:00 |
|
guange
|
b4016faeb6
|
编辑框消失
|
2015-12-18 10:40:12 +08:00 |
|
lizanle
|
47b20d3639
|
journal不应该算入ForgeActivity
|
2015-12-18 10:19:18 +08:00 |
|
cxt
|
2faddd7d75
|
分组设置中的基于项目实施默认勾选
|
2015-12-18 10:00:26 +08:00 |
|
lizanle
|
f3f64b8655
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 09:46:35 +08:00 |
|
lizanle
|
5d47afdc43
|
issue 删除回复的权限问题
|
2015-12-18 09:46:28 +08:00 |
 huang
|
b34b1181b7
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 09:39:55 +08:00 |
|
huang
|
4ca177970b
|
fork点击提示
|
2015-12-18 09:39:36 +08:00 |
|
lizanle
|
38c3422b83
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 09:28:41 +08:00 |
|
lizanle
|
0659015ada
|
issue 多了一个提交按钮和时间显示
|
2015-12-18 09:26:35 +08:00 |
|
guange
|
d703f75c98
|
merge
|
2015-12-18 09:23:52 +08:00 |
|
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
|
huang
|
2d2ae1e6a6
|
Merge branch 'hjq_new_course' into szzh
|
2015-12-18 09:18:34 +08:00 |
|
huang
|
5259831224
|
Merge branch 'szzh' into hjq_new_course
|
2015-12-18 09:17:49 +08:00 |
|
huang
|
b87943ff1d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
处理冲突
|
2015-12-18 09:17:18 +08:00 |
|
huang
|
3752cc62cd
|
Merge branch 'develop' into szzh
|
2015-12-18 09:15:59 +08:00 |
|
guange
|
b69f5f0da3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 22:36:33 +08:00 |
|
guange
|
c98e9fc639
|
查看作业代码着色
|
2015-12-17 22:36:18 +08:00 |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
|
cxt
|
798b1805cc
|
Merge branch 'cxt_course' into szzh
|
2015-12-17 19:06:53 +08:00 |
|
cxt
|
3b25616f0c
|
编辑作品时可编辑分组成员
|
2015-12-17 19:06:10 +08:00 |
|
cxt
|
c7f321475a
|
多选题错判
|
2015-12-17 19:05:22 +08:00 |
|
huang
|
1dae37f613
|
添加commit总数 api
|
2015-12-17 18:28:12 +08:00 |
|
lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
2015-12-17 18:12:38 +08:00 |
|
guange
|
716604903b
|
修复讨论区at错误
|
2015-12-17 18:07:19 +08:00 |
|
ouyangxuhua
|
ef46191c80
|
Merge branch 'szzh' into dev_hjq
|
2015-12-17 17:42:48 +08:00 |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
2015-12-17 17:15:03 +08:00 |
|
guange
|
ed649e0724
|
@颜色修改
|
2015-12-17 15:54:29 +08:00 |
|
guange
|
923cb3c84f
|
中文报错
|
2015-12-17 15:44:17 +08:00 |
|
lizanle
|
1809a93770
|
editor修改
|
2015-12-17 15:41:36 +08:00 |