sw
|
cf2a00d7a8
|
作业列表增加:编程语言提示,匿评阶段提示
|
2015-09-18 14:25:04 +08:00 |
sw
|
9d9ed24d1b
|
111
|
2015-09-18 13:51:37 +08:00 |
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
2015-09-18 13:30:25 +08:00 |
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
2015-09-18 13:08:12 +08:00 |
huang
|
bc422dd25e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 13:04:11 +08:00 |
huang
|
f823046bc3
|
完成课程留言点对点逻辑结构
|
2015-09-18 13:03:35 +08:00 |
sw
|
281e97e468
|
课程内老师可以对作业进行编辑、删除、开启匿评
|
2015-09-18 12:00:04 +08:00 |
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 11:34:29 +08:00 |
sw
|
cdc285797e
|
编程作业评分比例设置第一次加载时教辅评分百分比上限设置
|
2015-09-18 11:33:52 +08:00 |
sw
|
8eb2c75cbc
|
1、编程作业修改评分比例之后成绩计算问题
2、关闭匿评之后样式
|
2015-09-18 11:29:58 +08:00 |
cxt
|
ad610cb0b2
|
测试集输入输出框的自适应高度
|
2015-09-18 11:29:38 +08:00 |
ouyangxuhua
|
989d74bf70
|
修改消息tips样式
|
2015-09-18 11:25:23 +08:00 |
sw
|
859fe01c52
|
1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
|
2015-09-18 11:14:59 +08:00 |
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
2015-09-18 11:05:21 +08:00 |
huang
|
e09cdb2587
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 10:30:04 +08:00 |
huang
|
3b5e7f3012
|
公共贴吧消息样式
|
2015-09-18 10:29:26 +08:00 |
ouyangxuhua
|
3b49547b37
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 10:10:53 +08:00 |
ouyangxuhua
|
7934b59395
|
增加break_word
|
2015-09-18 10:10:24 +08:00 |
huang
|
96f1dfd2e5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 10:06:08 +08:00 |
huang
|
0fead3b801
|
1、课程留言发送对象为老师
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
|
2015-09-18 10:05:26 +08:00 |
ouyangxuhua
|
7694a8fd2c
|
所有消息里的系统消息样式
|
2015-09-18 09:35:26 +08:00 |
sw
|
5bdb1cd461
|
1、启动匿评、关闭匿评时弹出框位置
2、缺评评分设置报错
|
2015-09-17 20:33:36 +08:00 |
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
2015-09-17 20:20:20 +08:00 |
cxt
|
8f317711b8
|
动态回复框高度的自适应
|
2015-09-17 19:06:15 +08:00 |
ouyangxuhua
|
135359b615
|
取消alert
|
2015-09-17 17:36:55 +08:00 |
ouyangxuhua
|
6f9c10651c
|
修改系统消息样式
|
2015-09-17 17:29:39 +08:00 |
sw
|
cc7a752623
|
到处附件、缺评、匿评、成绩列表
|
2015-09-17 17:20:29 +08:00 |
sw
|
b8cb422268
|
排序功能
|
2015-09-17 17:06:08 +08:00 |
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
2015-09-17 16:31:32 +08:00 |
ouyangxuhua
|
43eeb8f457
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 16:25:46 +08:00 |
ouyangxuhua
|
d31b1d99a9
|
修改系统消息样式
|
2015-09-17 16:25:30 +08:00 |
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
2015-09-17 16:23:09 +08:00 |
Tim
|
062a9ff231
|
上传头像确定,取消按钮字号大小统一
|
2015-09-17 16:12:31 +08:00 |
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
2015-09-17 16:07:41 +08:00 |
Tim
|
a99d56b2e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 16:04:52 +08:00 |
Tim
|
3dccf8f77d
|
动态页面菜单栏图标更改;
提交作业界面图标宽度更改。
|
2015-09-17 16:04:27 +08:00 |
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
2015-09-17 16:04:16 +08:00 |
huang
|
7a014e1f79
|
解决bug:自动注册用户时,邮箱名过长超过login限制
解决方法:login长度和邮箱长度同步
|
2015-09-17 15:24:12 +08:00 |
cxt
|
6c99674798
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 14:59:01 +08:00 |
cxt
|
3f7c69e8e1
|
动态的判断
|
2015-09-17 14:58:10 +08:00 |
huang
|
b943a1de63
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 14:41:56 +08:00 |
huang
|
b9fc410802
|
添加系统消息单独新页面
|
2015-09-17 14:41:03 +08:00 |
ouyangxuhua
|
d4e1c62989
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 14:38:17 +08:00 |
ouyangxuhua
|
99d6012718
|
项目邀请
|
2015-09-17 14:37:45 +08:00 |
sw
|
47cdf1231d
|
匿评评分,成绩提示框的显示
|
2015-09-17 14:26:41 +08:00 |
sw
|
53d6c6853d
|
作品列表的显示
|
2015-09-17 14:16:13 +08:00 |
huang
|
e7fc0ca6d3
|
休整消息样式
|
2015-09-17 13:44:52 +08:00 |
huang
|
cfcf1f8103
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-17 13:00:30 +08:00 |
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
2015-09-17 12:59:52 +08:00 |
ouyangxuhua
|
d21dce566f
|
修改新闻显示的word-break 和 word-wrap
|
2015-09-17 11:42:18 +08:00 |
sw
|
efdd717c3c
|
成绩计算算法的实现
|
2015-09-17 11:41:24 +08:00 |
Tim
|
9a735c7157
|
模拟测试提示添加
|
2015-09-17 11:13:36 +08:00 |
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
2015-09-17 10:32:41 +08:00 |
Tim
|
5612bb47dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 10:25:46 +08:00 |
Tim
|
0930815086
|
回复头像模糊效果
|
2015-09-17 10:25:26 +08:00 |
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-17 10:24:58 +08:00 |
cxt
|
036129a622
|
动态回复后的回复框样式不改变
|
2015-09-17 10:02:28 +08:00 |
sw
|
fa9008d396
|
作品在非匿评阶段的显示
|
2015-09-17 10:00:41 +08:00 |
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
2015-09-17 09:20:35 +08:00 |
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
2015-09-17 08:46:43 +08:00 |
huang
|
94f91a85e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:36:10 +08:00 |
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”,因为邀请用户中已经包含该功能
|
2015-09-16 17:35:26 +08:00 |
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
2015-09-16 17:35:08 +08:00 |
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 17:25:43 +08:00 |
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
2015-09-16 17:25:06 +08:00 |
Tim
|
3d5f93b938
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_activities.html.erb
public/stylesheets/new_user.css
|
2015-09-16 16:13:40 +08:00 |
sw
|
939a010adb
|
静态页面添加
|
2015-09-16 15:51:35 +08:00 |
cxt
|
3bdab22aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 15:40:24 +08:00 |
cxt
|
a184ab4b69
|
个人动态首页只显示第一个动态的回复框,其它的需点击才显示
|
2015-09-16 15:40:05 +08:00 |
ouyangxuhua
|
e2024716e9
|
显示问题差别的html样式
|
2015-09-16 15:15:12 +08:00 |
sw
|
c21cea85f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 14:29:17 +08:00 |
ouyangxuhua
|
30e703b9bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-16 12:40:12 +08:00 |
cxt
|
a714b10860
|
阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充
|
2015-09-16 12:39:08 +08:00 |
ouyangxuhua
|
99b300b225
|
问题对比显示
|
2015-09-16 12:38:50 +08:00 |
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
2015-09-16 12:38:01 +08:00 |
ouyangxuhua
|
5155e8794f
|
将课程留言加入消息队列
|
2015-09-16 11:28:35 +08:00 |
huang
|
78ca55f121
|
优化邮件邀请策略
|
2015-09-16 10:49:34 +08:00 |
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时,迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
2015-09-16 10:26:13 +08:00 |
Tim
|
77a8c18a77
|
1.关于我们样式修改;
2.登录界面格式调整;
3.个人动态回复样式调整;
|
2015-09-16 10:16:25 +08:00 |
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-16 09:51:59 +08:00 |
cxt
|
fddf466ce1
|
将发布作业时的引用资源库的“确定”“取消”按钮改成整个按钮可点击
|
2015-09-16 09:45:27 +08:00 |
sw
|
9ee82c57be
|
去掉课程模块的导航栏
|
2015-09-15 17:01:39 +08:00 |
ouyangxuhua
|
3bd62310ad
|
增加word-wrap及word-break
|
2015-09-15 16:45:11 +08:00 |
cxt
|
0a2bfa1bdb
|
个人主页动态的缺陷回复与缺陷页面的回复内容不一致
|
2015-09-15 16:27:53 +08:00 |
sw
|
cd96fd99a8
|
快速创建项目
|
2015-09-15 16:11:55 +08:00 |
cxt
|
5ccace15da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-15 15:45:29 +08:00 |
cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
2015-09-15 15:45:16 +08:00 |
sw
|
f79b2cda94
|
提交作品关联项目功能
|
2015-09-15 15:18:33 +08:00 |
sw
|
fff9c44271
|
学生没有课程和项目时,课程和项目导航有2条线
|
2015-09-15 15:16:49 +08:00 |
lizanle
|
1b9bde2284
|
课程资源的标签库可点击更改
|
2015-09-15 10:33:05 +08:00 |
lizanle
|
71c0bd9b43
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-15 10:32:11 +08:00 |
lizanle
|
1ae302621f
|
课程资源的标签库可点击更改
|
2015-09-15 10:31:59 +08:00 |
cxt
|
e10e5e8412
|
调整课程通知页面的回复头像样式
|
2015-09-15 09:50:57 +08:00 |
cxt
|
a999897efa
|
动态回复头像的调整
|
2015-09-15 09:22:18 +08:00 |
cxt
|
d0c19124b7
|
将课程的“私有”标志改成不可点击
|
2015-09-14 17:29:00 +08:00 |
ouyangxuhua
|
9ba0d3293e
|
修改系统消息提示样式
|
2015-09-14 16:05:29 +08:00 |
huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +08:00 |
sw
|
4a9fd15bfd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 18:12:02 +08:00 |
sw
|
8f3889e2c5
|
编程作品提交框自动增高
|
2015-09-11 18:03:37 +08:00 |
sw
|
1673f4f960
|
1、老师打开编程作品报错
2、隐藏开启匿评按钮
|
2015-09-11 17:52:37 +08:00 |
huang
|
169c7f3a97
|
修改消息判断作业重复
|
2015-09-11 17:48:14 +08:00 |
sw
|
da269ef716
|
发布作业,请先输入作业标题
|
2015-09-11 17:27:07 +08:00 |
huang
|
0233c9b14b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 17:19:40 +08:00 |
huang
|
0d595c5feb
|
修改系统消息提交按钮
|
2015-09-11 17:19:12 +08:00 |
sw
|
4ee4bb6e9d
|
编辑作业
|
2015-09-11 17:07:30 +08:00 |
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
2015-09-11 16:59:10 +08:00 |
sw
|
ecf2ac5e19
|
课程内发布作业增加提示
|
2015-09-11 16:57:49 +08:00 |
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 16:43:59 +08:00 |
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
2015-09-11 16:37:50 +08:00 |
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
2015-09-11 16:36:10 +08:00 |
sw
|
a3d628dc17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 16:29:55 +08:00 |
sw
|
760b70971a
|
取消导入编程作业时对homework_type的赋值
|
2015-09-11 16:27:34 +08:00 |
sw
|
90a52aa01b
|
导入编程作业后、测试集数量不显示的问题
|
2015-09-11 16:26:35 +08:00 |
sw
|
37f235c2ab
|
导入编程作业
|
2015-09-11 16:22:35 +08:00 |
ouyangxuhua
|
b053a1e43c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/models/system_message.rb
app/views/admin/messages.html.erb
处理冲突、发布系统消息JS提醒!
|
2015-09-11 16:11:34 +08:00 |
ouyangxuhua
|
67dcb025aa
|
系统消息-修改
|
2015-09-11 16:05:02 +08:00 |
huang
|
3da6593720
|
查看别人的页面时不显示“全部设为已读”
|
2015-09-11 15:55:51 +08:00 |
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-11 15:50:10 +08:00 |
huang
|
6209250e6d
|
内容长度提醒
|
2015-09-11 15:45:25 +08:00 |
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
2015-09-11 15:39:46 +08:00 |
sw
|
4405a31c9c
|
Merge branch 'guange_homework' into szzh
|
2015-09-11 15:07:59 +08:00 |
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
2015-09-11 14:59:30 +08:00 |
huang
|
64bce0261d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 14:54:18 +08:00 |
huang
|
3bfdff81ba
|
去掉项目组织
|
2015-09-11 14:53:42 +08:00 |
lizanle
|
dc32bba5fd
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-11 14:44:59 +08:00 |
lizanle
|
17b4b31449
|
隐藏个人中心的回复 textarea编辑框
|
2015-09-11 14:44:50 +08:00 |
ouyangxuhua
|
22e2510482
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 14:43:14 +08:00 |
ouyangxuhua
|
3044b07df7
|
系统消息颜色
|
2015-09-11 14:43:04 +08:00 |
huang
|
c0437ae992
|
作业截止时间提醒界面!
|
2015-09-11 14:41:23 +08:00 |
sw
|
487f46bb32
|
上传图片后大小问题
|
2015-09-11 11:46:12 +08:00 |
cxt
|
7d6b9005a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 11:41:45 +08:00 |
cxt
|
2da3454bc5
|
暂时屏蔽课程复制功能
|
2015-09-11 11:41:31 +08:00 |
huang
|
f1e0eed5a8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 11:03:14 +08:00 |
sw
|
f4c19c0fb0
|
1、homework.js on改为live
2、导入作业之后,编程功能按钮消失
|
2015-09-11 10:50:16 +08:00 |
sw
|
527ff41d43
|
1、编程作业开启匿评之后提交作品的提示
2、匿评弹框不可关闭
|
2015-09-11 10:44:10 +08:00 |
sw
|
dfed4885de
|
新建作业,取消之后编程设置按钮消失
|
2015-09-11 10:36:16 +08:00 |
ouyangxuhua
|
36e9c20e59
|
系统消息
|
2015-09-11 10:30:01 +08:00 |
sw
|
30ebe9b2d5
|
1、编程作业可以开启匿评
2、取消扣分标准的显示
|
2015-09-11 09:59:34 +08:00 |
huang
|
08c222266a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 09:54:10 +08:00 |
huang
|
4ea20b707c
|
定义消息标题类型方法
|
2015-09-11 09:53:18 +08:00 |
ouyangxuhua
|
9e61ceefa9
|
系统消息修改
|
2015-09-11 09:48:16 +08:00 |
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
2015-09-11 09:36:44 +08:00 |
sw
|
948a6c9138
|
隐藏教师节相关信息
|
2015-09-11 09:20:43 +08:00 |
sw
|
6730c4da84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 09:17:08 +08:00 |
sw
|
66636efda9
|
修改普通作业
|
2015-09-11 09:15:54 +08:00 |
lizanle
|
2beb85561a
|
上传资源后,全选按钮和已选择资源数清空
|
2015-09-11 09:08:05 +08:00 |
sw
|
f0bd113a5e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-10 17:11:38 +08:00 |
sw
|
93b179c958
|
修改普通作业
|
2015-09-10 17:11:16 +08:00 |
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
2015-09-10 16:38:45 +08:00 |
ouyangxuhua
|
06fea1bf1d
|
系统消息显示
|
2015-09-10 15:47:51 +08:00 |
lizanle
|
cc6fe754d4
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-10 15:45:46 +08:00 |
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
2015-09-10 15:45:08 +08:00 |
cxt
|
e6d5d17859
|
轻抚展开更多->展开更多
|
2015-09-10 15:08:10 +08:00 |
cxt
|
5f0aac9265
|
点击打开编辑资料,显示保存的性别
|
2015-09-10 15:01:59 +08:00 |
sw
|
fce5405c41
|
发布作业界面样式调整
|
2015-09-10 14:44:25 +08:00 |
ouyangxuhua
|
fb155c8458
|
系统消息注释
|
2015-09-10 11:42:53 +08:00 |
ouyangxuhua
|
596c512d0a
|
系统消息
|
2015-09-10 11:39:53 +08:00 |
sw
|
1d9fda7eeb
|
Merge branch 'guange_homework' into develop
|
2015-09-10 11:32:15 +08:00 |
sw
|
8d415b0856
|
取消作业列表的编辑按钮
|
2015-09-10 10:51:53 +08:00 |
sw
|
97a944ff27
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-10 10:28:55 +08:00 |
sw
|
97f9d4fa60
|
增加教师节祝福语
|
2015-09-10 10:26:16 +08:00 |
cxt
|
50aa22c5e5
|
个人动态的“点击展开更多”改为“轻抚展开更多”,鼠标移到方框上即自动加载更多动态
|
2015-09-10 10:01:43 +08:00 |
sw
|
a841c20896
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 17:51:13 +08:00 |
sw
|
e30abd2a81
|
提交、修改作品界面宽度
|
2015-09-09 17:50:49 +08:00 |
cxt
|
5b14dbba45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 17:47:09 +08:00 |
cxt
|
6ed0a151dc
|
头像下拉框的样式修改
|
2015-09-09 17:45:39 +08:00 |
ouyangxuhua
|
3db692dc39
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-09 17:42:55 +08:00 |
huang
|
0aa8c5b5cc
|
完成系统消息通知功能
|
2015-09-09 17:43:33 +08:00 |
ouyangxuhua
|
1feb7022c7
|
修改系统消息为kindeditor
|
2015-09-09 17:42:38 +08:00 |
huang
|
66251c8d30
|
添加功能:管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
sw
|
1bf90739be
|
调整从资源库选择资源到作业、作品中弹框的初始位置
|
2015-09-09 17:00:11 +08:00 |
sw
|
519f079bcc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 16:54:21 +08:00 |
sw
|
adcd3b1ad5
|
去掉无用加载的js
|
2015-09-09 16:54:08 +08:00 |
sw
|
401b0bc7e3
|
textarea自动拉伸高度优化,编辑普通作业作品功能完成
|
2015-09-09 16:50:46 +08:00 |
sw
|
b1463f0864
|
学生提交匿评作业作品功能实现
|
2015-09-09 16:10:11 +08:00 |
lizanle
|
4b1153d0a5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-09 11:28:40 +08:00 |
lizanle
|
1dd4700eb2
|
个人中心留言功能 编辑框自适应高度
|
2015-09-09 11:28:28 +08:00 |
cxt
|
7474d19120
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 11:23:37 +08:00 |
cxt
|
040f3f588d
|
鼠标移到头像上方,才显示账户下拉菜单
|
2015-09-09 11:23:23 +08:00 |
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知,讨论区,留言都可以自动的长高,缩短
|
2015-09-09 10:55:32 +08:00 |
huang
|
1a6f81f302
|
用户申请,区分已读和未读
|
2015-09-09 10:15:05 +08:00 |
sw
|
e040c20f08
|
admin界面,最后登录的用户列表报错
|
2015-09-09 09:36:44 +08:00 |
lizanle
|
169c56a58d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-09 09:22:08 +08:00 |
lizanle
|
3b9d1d6200
|
讨论区编辑框可以自动长高缩短
|
2015-09-09 09:22:01 +08:00 |
huang
|
51d964d371
|
点击消息链接定位到对应页面的某一点
|
2015-09-08 17:26:10 +08:00 |
huang
|
06753497bb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 16:56:36 +08:00 |
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能(管理员收到消息提醒)
|
2015-09-08 16:55:36 +08:00 |
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
2015-09-08 16:36:50 +08:00 |
sw
|
137a0b16a0
|
1、文件的样式图片
2、点击编程弹框时,测试输入获取焦点
|
2015-09-08 15:40:25 +08:00 |
ouyangxuhua
|
bff50aa769
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-08 15:28:15 +08:00 |
ouyangxuhua
|
d01a529040
|
项目消息标题判断
|
2015-09-08 15:27:58 +08:00 |
guange
|
52c2719a46
|
去掉老式的编程作业提交
|
2015-09-08 14:48:02 +08:00 |
cxt
|
6f64152ec7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-08 11:56:04 +08:00 |
cxt
|
cdca8dea4d
|
去掉缺陷描述的图片点击显示大图后的蓝色边框
|
2015-09-08 11:55:52 +08:00 |
lizanle
|
23e60bf007
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-08 11:18:10 +08:00 |
lizanle
|
de822daf44
|
个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
|
2015-09-08 11:18:02 +08:00 |
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
2015-09-08 10:28:21 +08:00 |
huang
|
8d72a9a539
|
去掉项目base冗余代码
|
2015-09-08 09:22:15 +08:00 |
guange
|
9e9f373a76
|
发布作业优化
|
2015-09-07 23:09:19 +08:00 |
guange
|
04dffb2f89
|
模拟回答界面调整
|
2015-09-07 18:29:25 +08:00 |