 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 |
 cxt
|
e6d5d17859
|
轻抚展开更多->展开更多
|
2015-09-10 15:08:10 +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 |
 huang
|
0aa8c5b5cc
|
完成系统消息通知功能
|
2015-09-09 17:43:33 +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 |
|
lizanle
|
1dd4700eb2
|
个人中心留言功能 编辑框自适应高度
|
2015-09-09 11:28:28 +08:00 |
|
huang
|
1a6f81f302
|
用户申请，区分已读和未读
|
2015-09-09 10:15:05 +08:00 |
|
huang
|
51d964d371
|
点击消息链接定位到对应页面的某一点
|
2015-09-08 17:26:10 +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 |
 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 |
|
guange
|
9e9f373a76
|
发布作业优化
|
2015-09-07 23:09:19 +08:00 |
|
guange
|
04dffb2f89
|
模拟回答界面调整
|
2015-09-07 18:29:25 +08:00 |
|
cxt
|
a86d2aaadd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-07 17:38:41 +08:00 |
|
cxt
|
32b2d4f874
|
点击动态中的图片即显示大图
|
2015-09-07 17:38:31 +08:00 |
|
huang
|
0a45e08488
|
1、消息为0的时候不显示 消息数和“全部设置已读”。
2、消息不为空，未读消息为空的时候不显示“全部设为已读”
|
2015-09-07 16:14:34 +08:00 |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
2015-09-07 16:08:04 +08:00 |
|
lizanle
|
e8c5627c41
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-07 16:01:33 +08:00 |
|
lizanle
|
6bcaf01fe2
|
课程弹出框样式不对
|
2015-09-07 16:01:19 +08:00 |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
2015-09-07 15:01:08 +08:00 |
|
guange
|
53cea36329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 22:59:40 +08:00 |
|
guange
|
216bc7f70f
|
动态中作业的提交状态修改
|
2015-09-06 22:59:27 +08:00 |
|
cxt
|
0dc47279de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 17:47:50 +08:00 |
|
cxt
|
7a28a65807
|
问卷动态不显示的缺陷修复
|
2015-09-06 17:40:55 +08:00 |
|
huang
|
b771cc0fe1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 17:03:48 +08:00 |
|
sw
|
abf053fc99
|
Merge branch 'develop' into szzh
|
2015-09-06 16:51:33 +08:00 |
|
huang
|
b89218a1b3
|
消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
|
2015-09-06 16:50:03 +08:00 |
|
sw
|
9f8fee8267
|
个人积分报500
|
2015-09-06 15:46:28 +08:00 |
|
cxt
|
8ecf70588d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-06 15:31:37 +08:00 |
|
cxt
|
55758c3c2f
|
筛选掉未发布的问卷动态
|
2015-09-06 15:31:26 +08:00 |
|
lizanle
|
baf3d90836
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 15:19:11 +08:00 |
|
lizanle
|
704337fe56
|
全选所有资源，然后再用关键字过滤，全选checkbox和选择资源的个数应该清空
|
2015-09-06 15:16:32 +08:00 |
|
cxt
|
d274b675db
|
去掉动态中的“缺陷描述”、“通知描述”等文字
|
2015-09-06 10:07:18 +08:00 |
|
lizanle
|
9caa7a421a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-06 09:05:37 +08:00 |
|
lizanle
|
f8c85ccb83
|
个人动态页面 回复框固定高度减少
|
2015-09-06 09:05:24 +08:00 |
|
guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-03 16:59:24 +08:00 |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
2015-09-03 16:58:38 +08:00 |
|
huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
2015-09-03 16:28:49 +08:00 |
|
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
2015-09-03 16:09:40 +08:00 |
|
huang
|
02ace5693f
|
去掉项目多余的横线
|
2015-09-03 16:02:58 +08:00 |
|
guange
|
8ac8edeb71
|
Merge branch 'guange_homework' into szzh
|
2015-09-03 12:38:47 +08:00 |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
2015-09-02 22:09:23 +08:00 |
|
huang
|
719cbee3ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 21:48:27 +08:00 |
|
huang
|
a78b28f1b7
|
0条消息则不显示“全部设为已读”
|
2015-09-02 21:47:42 +08:00 |
|
guange
|
f6edbb238e
|
隐去编程作业的得分
|
2015-09-02 21:47:07 +08:00 |
|
guange
|
bacb5f859b
|
merge
|
2015-09-02 21:41:13 +08:00 |
|
guange
|
a69cee4b26
|
老师测试功能
|
2015-09-02 21:38:13 +08:00 |
|
huang
|
a47c9176b7
|
注释掉消息迁移文件
修改消息html样式
|
2015-09-02 21:33:03 +08:00 |
|
sw
|
359e34471b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 21:30:59 +08:00 |
|
sw
|
7424c82eae
|
留言框高度
|
2015-09-02 21:30:31 +08:00 |
|
huang
|
c7f15d3a3e
|
修改留言html样式
|
2015-09-02 20:06:47 +08:00 |
|
huang
|
1ba0c86828
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 19:38:31 +08:00 |
|
huang
|
70f80bb36f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 19:36:29 +08:00 |
|
huang
|
7d6d349c4d
|
讨论区鼠标经过显示html代码
|
2015-09-02 19:35:51 +08:00 |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
2015-09-02 18:35:12 +08:00 |
|
cxt
|
69cba79926
|
修改动态的显示时间
|
2015-09-02 18:18:08 +08:00 |
|
huang
|
86405b8a3c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:02:16 +08:00 |
 suntao
|
b24909df8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 17:41:32 +08:00 |
|
suntao
|
1fff00bab0
|
回复模块改动
|
2015-09-02 17:41:19 +08:00 |
|
sw
|
45c54dabad
|
课程内创建作业代码还原
|
2015-09-02 17:04:01 +08:00 |
|
sw
|
e360ea0bc7
|
回复框高度为50px
|
2015-09-02 16:34:03 +08:00 |
|
huang
|
fcb9978a05
|
消息鼠标经过时显示html内容
|
2015-09-02 16:21:47 +08:00 |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
2015-09-02 16:12:33 +08:00 |
|
sw
|
9df301b4cc
|
取消无用参数
|
2015-09-02 14:37:58 +08:00 |
|
sw
|
917442c0e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_list.html.erb
|
2015-09-02 14:37:46 +08:00 |
|
sw
|
05739931f3
|
作业列表点击加载更多
|
2015-09-02 14:34:32 +08:00 |
|
cxt
|
9f494bc14a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:35:03 +08:00 |
|
cxt
|
70c2f7de1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_activities.html.erb
|
2015-09-02 14:34:51 +08:00 |
|
huang
|
a05a3074dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:34:10 +08:00 |
|
huang
|
a94d5928d4
|
Merge branch 'szzh' into dev_hjq
|
2015-09-02 14:32:46 +08:00 |
|
cxt
|
63f52ea9bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:31:59 +08:00 |
|
cxt
|
3208574a5e
|
作业和首页的加载更多传递page参数
|
2015-09-02 14:31:46 +08:00 |
|
sw
|
594faabcbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:27:43 +08:00 |
|
suntao
|
c2dbd9449e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/user_homeworks.html.erb
|
2015-09-02 14:24:11 +08:00 |
|
huang
|
fcdf9b3fc1
|
清理数据
|
2015-09-02 14:21:50 +08:00 |
|
sw
|
53c57668aa
|
点击显示更多按钮的显示与隐藏
|
2015-09-02 14:19:47 +08:00 |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
2015-09-02 14:15:38 +08:00 |
|
suntao
|
9b8270aed1
|
Banner padding调整
|
2015-09-02 14:15:26 +08:00 |
|
sw
|
8acc432f91
|
项目讨论区回复刷新
|
2015-09-02 13:46:33 +08:00 |
|
sw
|
c4da4b6c09
|
项目缺陷回复刷新
|
2015-09-02 11:54:52 +08:00 |