 ouyangxuhua
|
a3146c66ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-24 12:51:12 +08:00 |
|
ouyangxuhua
|
ccfbc1e0bd
|
1.组织翻页增加type参数；
2.删除组织表中冗余的项目动态和课程动态。
|
2015-11-24 12:50:43 +08:00 |
 cxt
|
b46561dac1
|
提交作业时若作品名称和作品描述为空，则不弹出作品校验弹框
|
2015-11-24 10:34:23 +08:00 |
|
ouyangxuhua
|
68bb142278
|
解决组织bug:动态过滤，点击“展开更多”，有通知等其他动态
|
2015-11-23 17:29:55 +08:00 |
|
ouyangxuhua
|
71e98c873d
|
组织回复框中，默认图片颜色为灰色，当焦点放在输入框时，图片颜色变亮。
|
2015-11-23 16:40:21 +08:00 |
|
ouyangxuhua
|
1914639bc3
|
成功添加某成员后，在搜索框中输入的该成员关键字就要自动清空
|
2015-11-23 10:17:20 +08:00 |
|
ouyangxuhua
|
65548cd8c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-23 09:32:21 +08:00 |
|
ouyangxuhua
|
d2a87127da
|
我的组织搜索功能显示
|
2015-11-23 09:32:03 +08:00 |
 huang
|
17f85c1b1b
|
Merge branch 'sw_new_course' into szzh
|
2015-11-20 21:51:29 +08:00 |
|
huang
|
83c7e981af
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 21:50:35 +08:00 |
|
cxt
|
dbe236032b
|
新建题目时必须先保存标题
|
2015-11-20 21:50:27 +08:00 |
|
huang
|
95e8173e0b
|
Merge branch 'szzh' into sw_new_course
|
2015-11-20 21:50:25 +08:00 |
|
huang
|
6c87908886
|
Merge branch 'develop' into szzh
|
2015-11-20 21:49:55 +08:00 |
|
huang
|
1df8c94b98
|
解决字符过长不能保存成功的问题
|
2015-11-20 21:49:36 +08:00 |
|
huang
|
3083f683b9
|
修改删除的时候顺序乱的问题
添加相应的参数
|
2015-11-20 21:14:09 +08:00 |
|
huang
|
550d056630
|
删除某个题目后顺序排列
|
2015-11-20 20:55:37 +08:00 |
|
cxt
|
89f8f5f383
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:44:40 +08:00 |
|
cxt
|
b10fbcde8c
|
取消发布和发布测验
|
2015-11-20 20:44:27 +08:00 |
|
huang
|
fc041d5e99
|
Merge branch 'szzh' into develop
|
2015-11-20 20:27:25 +08:00 |
|
huang
|
7478b8a449
|
Merge branch 'sw_new_course' into szzh
|
2015-11-20 20:26:47 +08:00 |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
|
cxt
|
b9460efa08
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:23:21 +08:00 |
|
cxt
|
cc19c345e1
|
提交
|
2015-11-20 20:23:02 +08:00 |
|
huang
|
2435f06f44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:03:11 +08:00 |
|
huang
|
8b29002a0f
|
修改得分规则
|
2015-11-20 20:02:57 +08:00 |
|
cxt
|
c36ec99ff6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 19:59:17 +08:00 |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
2015-11-20 19:59:05 +08:00 |
|
ouyangxuhua
|
5ac65d86b1
|
将org_document_comment中的title改成text类型
|
2015-11-20 19:58:25 +08:00 |
|
huang
|
c0dfc17b19
|
修改状态更新
|
2015-11-20 19:35:32 +08:00 |
|
huang
|
da55b00da7
|
删除插入问题
|
2015-11-20 19:05:39 +08:00 |
|
huang
|
a3122a9a2c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:39:44 +08:00 |
|
huang
|
aa36c927d3
|
0
|
2015-11-20 18:39:35 +08:00 |
|
cxt
|
c07e2fe2d2
|
发布试卷
|
2015-11-20 18:38:50 +08:00 |
|
cxt
|
98297da226
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:29:36 +08:00 |
|
cxt
|
c9ba57f64b
|
去掉关闭、导入等功能
|
2015-11-20 18:29:26 +08:00 |
|
huang
|
bb726e3475
|
提交答案验证
|
2015-11-20 18:21:31 +08:00 |
|
huang
|
d1e0e0fd30
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:02:04 +08:00 |
|
huang
|
97485ca221
|
修改show逻辑
提交问卷后学生页面显示
|
2015-11-20 18:01:50 +08:00 |
|
cxt
|
da34083a2a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:00:22 +08:00 |
|
cxt
|
332ace0f34
|
列表
|
2015-11-20 18:00:11 +08:00 |
|
ouyangxuhua
|
6068867670
|
项目动态和组织动态删除后，删除相应的组织动态
|
2015-11-20 17:42:43 +08:00 |
|
huang
|
431d1d886c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 17:29:33 +08:00 |
|
huang
|
8728557813
|
老师和学生统计数目区分
|
2015-11-20 17:29:15 +08:00 |
|
cxt
|
d4d2adddb2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
2015-11-20 17:26:49 +08:00 |
|
cxt
|
eee63b2495
|
提交前验证数据不为空
|
2015-11-20 17:25:03 +08:00 |
|
huang
|
ed86e3ee5a
|
三种类型题目计算总分
|
2015-11-20 17:18:57 +08:00 |
|
ouyangxuhua
|
a57260aae6
|
修改当“Message”回复对应的组织动态
|
2015-11-20 16:41:15 +08:00 |
|
ouyangxuhua
|
5cfc8c2f8d
|
编辑文章后，或者回复文章后，更新组织动态的更新时间
|
2015-11-20 16:16:46 +08:00 |
|
huang
|
74f6cb2e64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 15:14:07 +08:00 |
|
huang
|
db46e5e4af
|
问卷得分统计
|
2015-11-20 15:13:53 +08:00 |