 lizanle
|
f892beebc1
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-09 17:15:04 +08:00 |
|
lizanle
|
763939f176
|
这个可以不用了
|
2015-09-09 17:12:02 +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
|
401b0bc7e3
|
textarea自动拉伸高度优化，编辑普通作业作品功能完成
|
2015-09-09 16:50:46 +08:00 |
|
sw
|
b1463f0864
|
学生提交匿评作业作品功能实现
|
2015-09-09 16:10:11 +08:00 |
|
lizanle
|
24dce81b31
|
高度参数用一个
|
2015-09-09 14:57:42 +08:00 |
|
lizanle
|
c393a0ea01
|
个人中心 留言界面 编辑框 ie浏览器下报错
|
2015-09-09 14:00:44 +08:00 |
|
lizanle
|
b2afe18ccd
|
个人中心 留言界面 编辑框自适应高度
|
2015-09-09 13:44:23 +08:00 |
|
lizanle
|
4ad139e6fd
|
添加一点注释
|
2015-09-09 11:38:08 +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
|
6adbceec7b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-09 10:55:48 +08:00 |
|
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知，讨论区，留言都可以自动的长高，缩短
|
2015-09-09 10:55:32 +08:00 |
|
cxt
|
8fec99114a
|
"关于我们"的样式调整
|
2015-09-09 10:39:11 +08:00 |
|
cxt
|
a991500e55
|
登录首页的样式修改
|
2015-09-09 10:21:44 +08:00 |
|
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
2015-09-08 16:36:50 +08:00 |
 ouyangxuhua
|
966bd8f94c
|
admin配置界面编辑框样式修改
|
2015-09-08 16:31:19 +08:00 |
|
sw
|
137a0b16a0
|
1、文件的样式图片
2、点击编程弹框时，测试输入获取焦点
|
2015-09-08 15:40:25 +08:00 |
 guange
|
52c2719a46
|
去掉老式的编程作业提交
|
2015-09-08 14:48:02 +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 |
|
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 |
|
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
|
a159af8139
|
项目--邀请--发送邮件邀请用户对输入的邮箱进行判断，同时修改提示样式
|
2015-09-07 15:20:18 +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 |
|
sw
|
fe91ec1a85
|
1、历史数据导致项目动态中部分数据连接到课程相关页面
2、项目缺陷列表显示为整个系统的缺陷
3、用户得分的还原
4、样式调整
|
2015-09-06 11:22:27 +08:00 |
|
guange
|
a0c611378b
|
提交作业跳转报错
|
2015-09-02 22:09:23 +08:00 |
|
guange
|
bacb5f859b
|
merge
|
2015-09-02 21:41:13 +08:00 |
|
guange
|
a69cee4b26
|
老师测试功能
|
2015-09-02 21:38:13 +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
|
ee60905eda
|
回复之后回复框消失
|
2015-09-02 21:00:08 +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 |
|
lizanle
|
b4a7cb24b9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-02 18:32:36 +08:00 |
|
lizanle
|
0e68bbc5bd
|
调整回复框高度
|
2015-09-02 18:32:29 +08:00 |
|
sw
|
2e51d0e833
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 18:17:34 +08:00 |
|
lizanle
|
5135f749a4
|
调整回复框高度
|
2015-09-02 18:10:20 +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 |
|
lizanle
|
f05270a519
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-02 18:01:59 +08:00 |
|
lizanle
|
6fdd3a8e86
|
调整回复框高度
|
2015-09-02 18:01:51 +08:00 |
|
huang
|
4c76292e5e
|
message--viewed
|
2015-09-02 18:00:36 +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 |
|
huang
|
273e1ea6b1
|
修改项目讨论区引用样式
|
2015-09-02 17:08:20 +08:00 |
|
sw
|
8fc7760c02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 17:06:12 +08:00 |
|
suntao
|
4259540f53
|
作业列表宽度调整
|
2015-09-02 17:03:01 +08:00 |
|
sw
|
c8eb7804df
|
增加发布时间和发送课程的js验证
|
2015-09-02 16:12:33 +08:00 |
|
suntao
|
b2b2537df8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:31:16 +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 |
|
suntao
|
ea4a005048
|
作业界面排版微调
|
2015-09-02 14:31:03 +08:00 |
|
sw
|
594faabcbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 14:27:43 +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
|
0bb0a97fd5
|
个人主页新增留言回复按钮无作用
|
2015-09-02 14:10:41 +08:00 |
|
sw
|
e55b61cb81
|
课程留言回复
|
2015-09-02 14:07:19 +08:00 |
|
suntao
|
023bb3d95f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-02 11:15:53 +08:00 |
|
suntao
|
c9d46f17f3
|
回复blockquote调整
|
2015-09-02 11:15:38 +08:00 |
|
ouyangxuhua
|
16e018a444
|
更改未读消息样式的字体大小
|
2015-09-02 10:55:40 +08:00 |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
2015-09-02 10:51:46 +08:00 |
|
guange
|
d5be41eebc
|
merge
|
2015-09-02 10:41:59 +08:00 |
|
guange
|
ccc4d94212
|
修复合并出错问题
|
2015-09-02 10:27:10 +08:00 |
|
ouyangxuhua
|
2fc337cb07
|
修改已读和未读消息样式
|
2015-09-02 09:25:34 +08:00 |
|
suntao
|
f036b322b9
|
忘记密码页面提示位置调整
|
2015-09-02 09:05:52 +08:00 |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
2015-09-01 17:21:17 +08:00 |
|
suntao
|
313ee0f9d8
|
footer对齐调整
|
2015-09-01 16:30:10 +08:00 |
|
suntao
|
59bbfeb0b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-01 16:25:22 +08:00 |
|
suntao
|
56644ca173
|
点击展开更多样式
|
2015-09-01 16:25:05 +08:00 |
|
guange
|
8ad521d4ab
|
merge
|
2015-09-01 16:19:48 +08:00 |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
2015-09-01 16:18:03 +08:00 |
|
suntao
|
ded497a5f2
|
个人主页左侧导航配置按钮
|
2015-09-01 15:43:59 +08:00 |
|
lizanle
|
4a1b2fbbd6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 15:34:31 +08:00 |
|
lizanle
|
b2eb846a23
|
关于我们
隐藏招聘信息
联系我们改为服务协议
|
2015-09-01 15:34:22 +08:00 |
|
sw
|
5f42ce4c80
|
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
|
2015-09-01 15:28:03 +08:00 |
|
huang
|
8b9ee2260a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-01 15:24:51 +08:00 |
|
huang
|
fede611fea
|
鼠标经过显示内容效果
公共贴吧数据迁移
|
2015-09-01 15:23:30 +08:00 |
|
suntao
|
00de825050
|
作业界面颜色更改，删掉冗余头部导航css
|
2015-09-01 15:10:56 +08:00 |
|
suntao
|
acb46d520c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_user_homework_form.html.erb
|
2015-09-01 14:40:24 +08:00 |
|
suntao
|
ae3f56c758
|
提交作业界面对齐
|
2015-09-01 14:37:34 +08:00 |
|
sw
|
b1de662338
|
讨论区回复功能，修改引用样式
|
2015-09-01 14:18:44 +08:00 |
|
lizanle
|
798326d6ef
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-01 11:29:53 +08:00 |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
2015-09-01 11:29:43 +08:00 |
|
sw
|
62360175d1
|
课程通知回复时，所有回复框都会提交
|
2015-09-01 11:25:52 +08:00 |
|
sw
|
84ff3450d2
|
在动态中回复通知动态
|
2015-09-01 10:43:30 +08:00 |
|
ouyangxuhua
|
fd0e4a7afd
|
项目wiki：输入wiki为非汉字类型且长度够长，显示超出边框问题解决
|
2015-09-01 09:56:59 +08:00 |