 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 |
|
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
|
402c0b5173
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-07 16:08:51 +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
|
4e1169a021
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-07 15:30:24 +08:00 |
|
cxt
|
61281af497
|
管理员页面的最近登录用户列表的登录时间精确到分秒
|
2015-09-07 15:30:11 +08:00 |
|
ouyangxuhua
|
8c66adec1b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-07 15:24:10 +08:00 |
|
ouyangxuhua
|
ef011ad473
|
项目--邀请--发送邮件邀请用户,对输入的邮箱名进行判断，同时，修改提示样式
|
2015-09-07 15:23:34 +08:00 |
|
ouyangxuhua
|
5569dacc6c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-07 15:20:37 +08:00 |
|
ouyangxuhua
|
a159af8139
|
项目--邀请--发送邮件邀请用户对输入的邮箱进行判断，同时修改提示样式
|
2015-09-07 15:20:18 +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
|
e0376b5176
|
tag的导航栏和底部导航栏修改
|
2015-09-06 16:46: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 |
|
sw
|
5be3a9e03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 19:52:56 +08:00 |
|
sw
|
893ae35039
|
新建作品、编辑作品界面修改
|
2015-09-02 19:52:44 +08:00 |
|
sw
|
6a6fbea446
|
提交作品样式
|
2015-09-02 19:41:45 +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 |
|
lizanle
|
b4ae611718
|
贴吧交流url
|
2015-09-02 19:14:13 +08:00 |
|
sw
|
c2bfbfecee
|
编辑作业按钮隐藏
|
2015-09-02 19:11:34 +08:00 |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
2015-09-02 18:35:12 +08:00 |
|
sw
|
2e51d0e833
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:17:34 +08:00 |
|
cxt
|
69cba79926
|
修改动态的显示时间
|
2015-09-02 18:18:08 +08:00 |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
2015-09-02 18:06:05 +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 |