 huang
|
1cf774d6a5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-04 17:39:39 +08:00 |
 ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
2015-12-04 17:34:48 +08:00 |
|
huang
|
6fad26cabf
|
去死奥placebold
|
2015-12-04 17:32:56 +08:00 |
 cxt
|
8b160b1c38
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 17:29:55 +08:00 |
|
cxt
|
19c34de643
|
编辑作品时弹出的作品确认框不提供重试的按钮
|
2015-12-04 17:29:39 +08:00 |
|
huang
|
120a7274d3
|
fork样式显示
|
2015-12-04 17:22:22 +08:00 |
|
huang
|
bde27ba195
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 16:52:06 +08:00 |
 Tim
|
7e86d8fdf1
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 16:49:37 +08:00 |
|
Tim
|
d115a97f78
|
追加附件效果调整
|
2015-12-04 16:49:14 +08:00 |
|
huang
|
465b0e4ce3
|
Merge branch 'szzh' into develop
|
2015-12-04 16:44:25 +08:00 |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
2015-12-04 16:43:48 +08:00 |
|
huang
|
61d76e6744
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 16:42:55 +08:00 |
 lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
|
huang
|
a5c7cecc2e
|
Merge branch 'gitlab_guange' into szzh
|
2015-12-04 16:36:13 +08:00 |
|
lizanle
|
0a5a33c2de
|
schema
|
2015-12-04 16:36:03 +08:00 |
|
huang
|
9716e99533
|
课程成员提交“修改角色”
|
2015-12-04 16:33:56 +08:00 |
|
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-12-04 16:22:02 +08:00 |
|
huang
|
b6edabed9c
|
修改角色
|
2015-12-04 16:21:48 +08:00 |
|
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
|
Tim
|
dfa9b4cf74
|
学生列表调整
|
2015-12-04 16:13:55 +08:00 |
|
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
2015-12-04 15:58:56 +08:00 |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 15:54:56 +08:00 |
|
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
2015-12-04 15:54:18 +08:00 |
|
huang
|
c1747ab217
|
fork重名，提交
|
2015-12-04 15:49:05 +08:00 |
|
lizanle
|
dbfc4969e0
|
测验消息bug
|
2015-12-04 15:36:19 +08:00 |
|
lizanle
|
e2f5dcc3f9
|
当天截止的测验需要发布截止消息
|
2015-12-04 13:39:17 +08:00 |
|
lizanle
|
06122dab1d
|
当天截止的测验需要发布截止消息
|
2015-12-04 11:24:24 +08:00 |
|
lizanle
|
03588ca88d
|
发布测验的时候发布消息
|
2015-12-04 11:21:41 +08:00 |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
|
ouyangxuhua
|
2855c0e409
|
修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等
|
2015-12-04 10:59:09 +08:00 |
|
lizanle
|
6553559929
|
发送消息
|
2015-12-04 10:56:16 +08:00 |
|
huang
|
1c08c79e8e
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 09:12:40 +08:00 |
|
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
2015-12-04 09:12:24 +08:00 |
|
huang
|
7fe3a02d81
|
Merge branch 'gitlab_guange' into develop
|
2015-12-04 09:11:22 +08:00 |
|
huang
|
89b8f7783d
|
添加forked_form的id
|
2015-12-04 08:57:29 +08:00 |
|
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
2015-12-04 00:16:21 +08:00 |
|
huang
|
057d9a3337
|
0
|
2015-12-04 00:15:47 +08:00 |
|
huang
|
8d891a9faa
|
fork权限
|
2015-12-03 20:57:09 +08:00 |
|
huang
|
b91c65798d
|
课程成员添加设置
|
2015-12-03 20:44:29 +08:00 |
|
cxt
|
4e9e7543ba
|
chrome浏览器点击保存测验头部信息无反应
|
2015-12-03 19:21:35 +08:00 |
|
cxt
|
838140ada8
|
在线测验的自动发布和截止
|
2015-12-03 19:08:15 +08:00 |
|
cxt
|
fd51b02e16
|
添加修订附件
|
2015-12-03 18:33:08 +08:00 |
|
cxt
|
8d505b85bf
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-03 10:41:39 +08:00 |
|
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
2015-12-03 09:55:18 +08:00 |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
|
ouyangxuhua
|
cf41b13f3a
|
增加组织表和组织课程表的关联删除
|
2015-12-02 17:38:41 +08:00 |
|
ouyangxuhua
|
9baeb850a3
|
在管理员界面中，添加组织的编辑和删除功能。
|
2015-12-02 17:34:21 +08:00 |
|
ouyangxuhua
|
95b071a8f7
|
修复组织模块的bug
|
2015-12-02 16:48:49 +08:00 |
|
lizanle
|
adb246f9ad
|
注释标记 错误
<!-- -->
|
2015-12-02 15:30:07 +08:00 |