 guange
|
eed6250145
|
secdomain问题
|
2016-02-02 17:36:11 +08:00 |
 cxt
|
b761505669
|
Merge branch 'szzh' into develop
|
2016-02-02 17:18:28 +08:00 |
|
cxt
|
e6d4d7d0cb
|
描述框的自动增高
|
2016-02-02 17:16:50 +08:00 |
|
guange
|
3897f9aea2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2016-02-02 16:33:17 +08:00 |
|
guange
|
609d98f8a3
|
执行task时没有代入环境变量
|
2016-02-02 16:33:08 +08:00 |
|
guange
|
ed2a3c976d
|
执行task时没有代入环境变量
|
2016-02-02 16:25:26 +08:00 |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-02 15:57:23 +08:00 |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
2016-02-02 15:55:07 +08:00 |
|
cxt
|
15c828197f
|
Merge branch 'szzh' into develop
|
2016-02-02 15:53:30 +08:00 |
 ouyangxuhua
|
0b5aa4b81e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-02 15:53:14 +08:00 |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-02-02 15:51:49 +08:00 |
|
cxt
|
d49a4569b1
|
Merge branch 'cxt_course' into szzh
|
2016-02-02 15:51:34 +08:00 |
|
ouyangxuhua
|
d820977d5d
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/blog_comments/show.html.erb
app/views/courses/syllabus.html.erb
app/views/messages/_org_subfield_show.html.erb
|
2016-02-02 15:51:18 +08:00 |
|
cxt
|
d42f144f23
|
作业、组织帖子描述框的自动增高
|
2016-02-02 15:50:28 +08:00 |
|
cxt
|
ea8e73ad54
|
弹框的拖拽
|
2016-02-02 15:47:12 +08:00 |
 Tim
|
f3bcb3ca47
|
导入题库弹框位置调整
|
2016-02-02 15:23:23 +08:00 |
|
ouyangxuhua
|
dab99eb044
|
回复框样式修改
|
2016-02-02 13:38:37 +08:00 |
|
guange
|
28035dfc47
|
子域名处理
|
2016-02-02 12:40:00 +08:00 |
|
guange
|
f3a0e71cee
|
issue中回复at列表不正常
|
2016-02-02 11:38:04 +08:00 |
|
guange
|
d6e248805f
|
changeset_num nil问题
|
2016-02-02 11:37:48 +08:00 |
|
Tim
|
105393548b
|
点击详情页面文本格式调整
|
2016-02-02 11:23:17 +08:00 |
|
Tim
|
619144224e
|
文本框格式问题
|
2016-02-02 10:08:04 +08:00 |
|
ouyangxuhua
|
cdd997e45e
|
kindeditor回复框修改
|
2016-02-01 14:50:45 +08:00 |
|
cxt
|
4d048ec596
|
课程推荐的课程列表中，为0的不显示
|
2016-02-01 11:12:04 +08:00 |
|
Tim
|
d092891b2a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-01 10:41:30 +08:00 |
|
Tim
|
83a3c879d4
|
私信配置按钮显示
|
2016-02-01 10:40:42 +08:00 |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
2016-02-01 10:14:04 +08:00 |
|
cxt
|
8b9bcb4719
|
导入题库的搜索不起作用
|
2016-02-01 10:04:07 +08:00 |
|
cxt
|
b6dc7ac4cb
|
Merge branch 'develop' into cxt_course
|
2016-02-01 09:51:01 +08:00 |
|
guange
|
71778ba948
|
拷贝课程图标
|
2016-01-29 22:10:04 +08:00 |
|
guange
|
724ff31751
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2016-01-29 21:16:27 +08:00 |
|
guange
|
eb9232a087
|
at controller 的json应该登录
|
2016-01-29 21:15:23 +08:00 |
|
guange
|
63596c2ca5
|
留言应该为JournalsForMessage
|
2016-01-29 21:14:44 +08:00 |
|
guange
|
bb0ff4a14c
|
elasticsearch在开发环境下的补丁,默认不开启
|
2016-01-29 20:31:25 +08:00 |
|
ouyangxuhua
|
7bdec9c182
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-29 20:05:24 +08:00 |
|
ouyangxuhua
|
50bac16d7c
|
组织子域名申请信息提示
|
2016-01-29 20:05:04 +08:00 |
|
cxt
|
ee73191a19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-29 19:44:04 +08:00 |
|
cxt
|
49369bf109
|
Merge branch 'szzh' into develop
|
2016-01-29 19:43:56 +08:00 |
|
cxt
|
e17a72bf57
|
Merge branch 'cxt_course' into szzh
|
2016-01-29 19:43:18 +08:00 |
|
cxt
|
1b5cdbe628
|
推荐的私有课程，点击“资源”返回403，点击“作业”也应该返回403
|
2016-01-29 19:41:47 +08:00 |
|
cxt
|
82fb50ccd2
|
课程学生列表的作业积分不一致
|
2016-01-29 19:22:10 +08:00 |
|
ouyangxuhua
|
45bf2ef88a
|
Merge branch 'develop' into dev_hjq
|
2016-01-29 19:00:15 +08:00 |
|
ouyangxuhua
|
7b56dc7f8e
|
管理员界面，解决编辑组织报错的问题
|
2016-01-29 18:43:14 +08:00 |
|
cxt
|
e8bed9c4e1
|
Merge branch 'develop' into cxt_course
|
2016-01-29 18:20:58 +08:00 |
|
cxt
|
265359cd74
|
发布作业时作业类型的切换
|
2016-01-29 18:17:27 +08:00 |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
2016-01-29 18:11:16 +08:00 |
|
ouyangxuhua
|
125f00689b
|
把组织未读消息加入铃铛消息提醒中
|
2016-01-29 17:49:20 +08:00 |
|
ouyangxuhua
|
68bd109831
|
对子域名申请，增加是否批准的提示
|
2016-01-29 17:26:28 +08:00 |
|
cxt
|
8358140c87
|
问题跟踪目标版本字体修改
|
2016-01-29 17:02:25 +08:00 |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |