 cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
2016-07-20 17:00:18 +08:00 |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
2016-07-18 16:40:04 +08:00 |
|
cxt
|
8e3488132b
|
导入作业：公共题库中显示的却是我的题库，我的题库中显示的却是公共题库
|
2016-07-18 14:43:47 +08:00 |
|
cxt
|
9e5e7a75b0
|
编程作业关闭匿评后，老师点击模拟答题，却弹出匿评提示
|
2016-07-18 14:09:41 +08:00 |
|
cxt
|
a9ee1d10cd
|
新增班级成员的消息通知，跳转至该班级的成员配置页面
|
2016-07-18 11:19:56 +08:00 |
|
cxt
|
05fe987a8b
|
新手注册三条留言
|
2016-07-15 15:43:35 +08:00 |
|
cxt
|
11e0101f56
|
导航栏题库中 我的题库放在前面
|
2016-07-15 15:06:33 +08:00 |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
2016-07-15 14:48:39 +08:00 |
|
cxt
|
fd68479d72
|
课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级
|
2016-07-15 11:02:53 +08:00 |
|
cxt
|
7ea5d7d934
|
新建班级页面，提示“如果列表中没有对应的课程，请您先创建课程”始终显示
|
2016-07-15 10:21:59 +08:00 |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
2016-07-14 17:23:48 +08:00 |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
2016-07-14 14:44:47 +08:00 |
|
cxt
|
ded8f48d34
|
博客的二级回复
|
2016-07-13 15:20:39 +08:00 |
|
cxt
|
9bf853d2bb
|
管理员可修改课程名称和英文名称
|
2016-07-13 09:49:24 +08:00 |
|
cxt
|
16cf8a56a1
|
管理员和老师可看到课程下的所有班级
|
2016-07-13 09:34:36 +08:00 |
|
cxt
|
c46fcc48b1
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/users/_join_course_course_message.html.erb
|
2016-07-12 16:26:13 +08:00 |
|
cxt
|
f0e456729e
|
过滤掉消息中的html
|
2016-07-12 16:21:30 +08:00 |
|
cxt
|
955c258856
|
复制班级的弹框中“课程名称”下拉框中只显示当前登录用户的所有课程
|
2016-07-12 10:35:52 +08:00 |
|
cxt
|
89819f5ccd
|
消息列表
|
2016-07-11 17:33:11 +08:00 |
 huang
|
22745edb9b
|
Merge branch 'rep_quality' into develop
|
2016-07-11 17:02:25 +08:00 |
|
huang
|
8b5a2ac1cb
|
message 500
|
2016-07-11 16:59:37 +08:00 |
|
cxt
|
d21eaf9154
|
未配置班级列表的班级重命名
|
2016-07-11 15:32:01 +08:00 |
|
cxt
|
b4e6561e50
|
Merge branch 'cxt_course' into develop
|
2016-07-11 15:16:27 +08:00 |
|
cxt
|
d71e10c8ac
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-11 15:16:04 +08:00 |
|
cxt
|
0b4db97756
|
班级动态
|
2016-07-11 15:15:38 +08:00 |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
|
cxt
|
834e72b0f8
|
未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除
|
2016-07-11 14:43:22 +08:00 |
|
huang
|
1283690250
|
Merge branch 'rep_quality' into develop
|
2016-07-11 11:34:07 +08:00 |
|
huang
|
0a001b4f76
|
message 500 for boliang
|
2016-07-11 11:29:15 +08:00 |
|
huang
|
93e79d9419
|
add hidden to css
|
2016-07-11 11:23:59 +08:00 |
|
huang
|
bac3e433aa
|
sqlate index nil
|
2016-07-11 11:07:04 +08:00 |
|
huang
|
831006f3c6
|
css for sqale_index
|
2016-07-11 10:57:46 +08:00 |
|
huang
|
cb148c3b9c
|
fixed 500
|
2016-07-11 10:48:44 +08:00 |
 guange
|
99a27766be
|
.
|
2016-07-09 10:34:05 +08:00 |
|
guange
|
09a97fc9d8
|
.
|
2016-07-09 10:23:49 +08:00 |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
2016-07-09 10:13:05 +08:00 |
|
guange
|
f5b4bc3e43
|
merge
|
2016-07-09 09:23:19 +08:00 |
|
guange
|
2a2fe9e81d
|
解决android缓存问题
|
2016-07-09 09:22:41 +08:00 |
|
huang
|
817eaf318a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-08 21:30:36 +08:00 |
|
huang
|
f77bad34ad
|
缩短时间
|
2016-07-08 21:29:47 +08:00 |
|
guange
|
8800290db9
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-07-08 20:49:55 +08:00 |
|
huang
|
8785264e07
|
Merge branch 'rep_quality' into develop
|
2016-07-08 20:39:43 +08:00 |
|
huang
|
62cb7d4568
|
add css
|
2016-07-08 20:35:21 +08:00 |
|
guange
|
135b6ca64b
|
assets
|
2016-07-08 20:04:24 +08:00 |
|
cxt
|
320db4ddd9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
.access_token
|
2016-07-08 20:01:55 +08:00 |
|
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |
|
cxt
|
1a15c0f567
|
新建班级发布作业报500
|
2016-07-08 19:25:26 +08:00 |
|
cxt
|
d25f401afa
|
管理员界面修改班级名称
|
2016-07-08 19:16:53 +08:00 |
 yuanke
|
5ccde8e433
|
修改课程列表显示不对的BUG
|
2016-07-08 18:52:21 +08:00 |
|
yuanke
|
189e641d23
|
课程列表改下
|
2016-07-08 18:32:30 +08:00 |