 huang
|
edf6f8e1f0
|
消息提示，显示新消息数目
|
2015-09-30 10:31:47 +08:00 |
 sw
|
d1bb76cfcb
|
调整学生匿评界面提交按钮样式
|
2015-09-30 10:24:20 +08:00 |
 lizanle
|
d182f532a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-30 10:21:27 +08:00 |
|
lizanle
|
acdb63974f
|
具体课程发布作业的样式
|
2015-09-30 10:21:11 +08:00 |
|
sw
|
9edfa49bcb
|
项目内上传图片按钮
|
2015-09-29 17:41:12 +08:00 |
|
huang
|
278d26e9a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 17:35:37 +08:00 |
|
huang
|
fe83fe31af
|
项目版本库--》内容对比
|
2015-09-29 17:35:22 +08:00 |
 Tim
|
b6a8a69be8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 17:30:02 +08:00 |
|
Tim
|
4c5b59ebc8
|
作业动态图标替换
|
2015-09-29 17:28:45 +08:00 |
|
sw
|
3cf5e9e2b1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 17:26:31 +08:00 |
|
lizanle
|
4386f3fddf
|
样式问题
|
2015-09-29 17:29:44 +08:00 |
|
sw
|
7cba1e5f76
|
课程内发布作业按钮无反应
|
2015-09-29 17:10:16 +08:00 |
|
lizanle
|
2c9e46fc77
|
靠左 0间距
|
2015-09-29 16:48:56 +08:00 |
|
lizanle
|
b292b1580d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 16:36:58 +08:00 |
|
lizanle
|
38702dde64
|
去掉源码模式
|
2015-09-29 16:36:51 +08:00 |
 cxt
|
06b97e281a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 16:20:50 +08:00 |
|
cxt
|
26624c8009
|
动态回复编辑框的“我要回复”的隐藏
|
2015-09-29 16:20:35 +08:00 |
|
lizanle
|
3c01969db1
|
代码缩进
|
2015-09-29 16:06:04 +08:00 |
|
Tim
|
1613f41e77
|
点赞判断
|
2015-09-29 15:44:04 +08:00 |
|
Tim
|
0fdf10649c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:25:01 +08:00 |
|
Tim
|
a0f4cabcf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:24:30 +08:00 |
|
lizanle
|
81092a7e32
|
行高调整
|
2015-09-29 15:24:50 +08:00 |
|
Tim
|
971ff1e692
|
贴吧点赞位置调整
|
2015-09-29 15:24:15 +08:00 |
|
lizanle
|
c8b5ccdd34
|
行高调整
|
2015-09-29 15:23:09 +08:00 |
|
sw
|
9beaba0aac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 15:21:11 +08:00 |
|
lizanle
|
9e4896fc7b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 15:13:14 +08:00 |
|
lizanle
|
138b24b34c
|
oschina模式的代码插入
|
2015-09-29 15:13:05 +08:00 |
|
sw
|
b22669e36f
|
课程上传图片按钮
|
2015-09-29 14:50:29 +08:00 |
|
Tim
|
21408f3843
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-29 14:35:02 +08:00 |
|
Tim
|
cc99120f25
|
贴吧样式更改
|
2015-09-29 14:34:39 +08:00 |
|
sw
|
515e2be4f8
|
课程内的作业列表匿评设置确定按钮无效
|
2015-09-29 14:23:50 +08:00 |
|
lizanle
|
de62798d4d
|
点赞按钮位置调整
|
2015-09-29 13:54:54 +08:00 |
|
lizanle
|
4f63f3fd2a
|
导航
|
2015-09-29 12:06:56 +08:00 |
|
huang
|
da4b00e56c
|
Merge branch 'szzh' into dev_hjq
|
2015-09-29 10:46:19 +08:00 |
|
huang
|
61061573a7
|
去掉版本库git操作指南
|
2015-09-29 10:42:17 +08:00 |
|
sw
|
22b9c6a866
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/courses.css
|
2015-09-29 10:40:11 +08:00 |
|
lizanle
|
5002daad52
|
帖子内容显示不对
|
2015-09-29 10:34:05 +08:00 |
|
sw
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
2015-09-28 17:09:07 +08:00 |
|
cxt
|
12c394c36e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 16:11:18 +08:00 |
|
cxt
|
955d87a98c
|
新增测试集的编辑框自适应高度
|
2015-09-28 16:09:59 +08:00 |
 ouyangxuhua
|
80fabf0681
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 16:09:55 +08:00 |
|
ouyangxuhua
|
e9d61a928a
|
修复项目issue中，图片显示超出边界的问题
|
2015-09-28 16:08:47 +08:00 |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
2015-09-28 15:52:30 +08:00 |
|
cxt
|
e1348a4845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 15:24:27 +08:00 |
|
cxt
|
038bcdb80e
|
课程动态的作业编辑菜单样式调整
|
2015-09-28 15:24:03 +08:00 |
|
ouyangxuhua
|
eac31cda7f
|
修改个人主页最新动态图片显示超出边界问题
|
2015-09-28 15:13:42 +08:00 |
|
cxt
|
e298f738ed
|
调整课程动态的过滤列表样式
|
2015-09-28 14:10:04 +08:00 |
|
ouyangxuhua
|
29b4e174fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 10:20:27 +08:00 |
|
ouyangxuhua
|
f73865b771
|
1.修改作业消息的样式；
2.解决系统消息时间显示问题。
|
2015-09-28 10:20:14 +08:00 |
|
cxt
|
9190f0515d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-28 08:46:20 +08:00 |
|
sw
|
591324854b
|
项目缺陷点击留言，下面留言框获得焦点
|
2015-09-25 17:22:31 +08:00 |
|
cxt
|
be932e3b1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 16:32:41 +08:00 |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-25 16:32:25 +08:00 |
|
lizanle
|
c3d829a68f
|
名称检查
|
2015-09-25 16:32:02 +08:00 |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
2015-09-25 16:29:47 +08:00 |
|
lizanle
|
e0c338b497
|
限制字符长度
|
2015-09-25 16:20:51 +08:00 |
|
lizanle
|
c8cbab2d50
|
火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同
|
2015-09-25 15:55:29 +08:00 |
|
ouyangxuhua
|
6591ea8e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 15:27:00 +08:00 |
|
ouyangxuhua
|
0b932267c7
|
调整截止日期快到了的宽度
|
2015-09-25 15:26:40 +08:00 |
|
sw
|
6c62b44b59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 15:06:06 +08:00 |
|
ouyangxuhua
|
474779498b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 14:40:22 +08:00 |
|
ouyangxuhua
|
1935a9caaa
|
调整消息页面的宽度
|
2015-09-25 14:38:41 +08:00 |
|
sw
|
5f1b4b1b24
|
导入作业后编辑按钮、弹出框确定按钮不可用
|
2015-09-25 14:16:12 +08:00 |
|
lizanle
|
7ef48f3fa3
|
标签修改的问题
|
2015-09-25 12:31:52 +08:00 |
|
lizanle
|
9184dddb5e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-25 11:50:05 +08:00 |
|
lizanle
|
3fe5adcaf8
|
统一修改tag 会 和边框有边距
|
2015-09-25 11:49:57 +08:00 |
|
huang
|
8886bda790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 11:46:15 +08:00 |
|
huang
|
44c097dbaf
|
1、issue回复添加新的编辑器
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
|
2015-09-25 11:45:57 +08:00 |
|
ouyangxuhua
|
4d1bc90161
|
匿名用户重新评阅作品，在消息显示中，需要正常显示
|
2015-09-25 11:40:57 +08:00 |
|
Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 10:43:42 +08:00 |
|
Tim
|
e8a7448a7c
|
资源库用户资源图标位置调整
|
2015-09-25 10:43:19 +08:00 |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
2015-09-25 10:35:04 +08:00 |
|
lizanle
|
924183b1cc
|
js合并错误
|
2015-09-25 10:04:56 +08:00 |
 guange
|
08eecbd5ec
|
merge
|
2015-09-25 09:30:32 +08:00 |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
2015-09-24 16:46:08 +08:00 |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
2015-09-24 16:30:14 +08:00 |
|
guange
|
a42152553b
|
添加语言提示
|
2015-09-24 15:26:54 +08:00 |
|
guange
|
0b4c8b05f1
|
JAVA语言支持
|
2015-09-24 15:09:15 +08:00 |
|
lizanle
|
531b264a8f
|
Merge branch 'dev_zanle' into szzh
|
2015-09-24 13:44:37 +08:00 |
|
lizanle
|
38a24e8fe4
|
论坛消息回复改版
|
2015-09-24 12:17:14 +08:00 |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
2015-09-24 11:46:33 +08:00 |
|
sw
|
f9f51557dd
|
增加关闭反馈功能
|
2015-09-24 11:31:07 +08:00 |
|
huang
|
6449b2563b
|
1、去掉项目隐藏代码库的功能
2、同步圈子的描述
3、圈子JS实现
|
2015-09-24 11:19:07 +08:00 |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
2015-09-24 10:15:23 +08:00 |
|
lizanle
|
b9ff46f8d0
|
帖子的编辑与删除
|
2015-09-24 09:40:53 +08:00 |
|
sw
|
ad6fbf6c9b
|
点击作品名称、姓名、学号、时间列都可以展开作品
|
2015-09-24 09:25:56 +08:00 |
|
huang
|
54065e49a7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-23 17:37:31 +08:00 |
|
huang
|
b94c57691a
|
项目新建重构
项目先建添加项目类型
|
2015-09-23 17:36:36 +08:00 |
|
lizanle
|
c8d07dedf6
|
帖子添加编辑 删除 链接
|
2015-09-23 17:09:21 +08:00 |
|
lizanle
|
6ac5b738e3
|
论坛编辑功能
|
2015-09-23 16:27:13 +08:00 |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
2015-09-23 15:44:48 +08:00 |
|
lizanle
|
eed530db2b
|
添加 上传附件的 文字
|
2015-09-23 15:14:37 +08:00 |
|
ouyangxuhua
|
1fe8c60a32
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-23 14:55:13 +08:00 |
|
ouyangxuhua
|
841c680bb1
|
1.作业消息增加显示老师、课程、课程季度等信息
2.作业内容为空时，tips中不显示内容
|
2015-09-23 14:53:50 +08:00 |
|
huang
|
5b671c5109
|
issue 引用模式修改
issue相关代码优化
|
2015-09-23 14:27:47 +08:00 |
|
sw
|
9d474d6528
|
设置匿评属性静态页面
|
2015-09-23 13:54:36 +08:00 |
|
sw
|
193eb0cb6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-23 10:03:45 +08:00 |
|
cxt
|
afb1a8f53f
|
回复框发送按钮的样式调整
|
2015-09-23 09:59:23 +08:00 |
|
sw
|
b5af66ffc2
|
取消匿评时间的js判断
|
2015-09-23 09:58:31 +08:00 |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
2015-09-23 09:23:31 +08:00 |
|
cxt
|
576adfac34
|
回复框中出现html代码的修复
|
2015-09-23 08:56:48 +08:00 |
|
lizanle
|
361b391d3c
|
修改分页的样式
|
2015-09-22 17:18:10 +08:00 |
|
sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-22 16:21:54 +08:00 |
|
lizanle
|
b4561fa68d
|
资源库标签 上方的tag重命名的话，所有的含有该tag的资源的那个标签页要重命名
|
2015-09-22 16:19:39 +08:00 |
|
sw
|
9d2b58738e
|
分班过滤功能
|
2015-09-22 16:16:55 +08:00 |
|
Tim
|
93804bcfa6
|
关于我们图片对齐
|
2015-09-22 16:11:22 +08:00 |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
2015-09-22 15:54:50 +08:00 |
|
cxt
|
660e604045
|
kindeditor编辑框的列表符号样式修改
|
2015-09-22 15:54:19 +08:00 |
|
sw
|
90536efa1e
|
课程内姓名学号邮箱过滤，各种排序 改为js刷新页面
|
2015-09-22 15:52:08 +08:00 |
|
sw
|
2d48161928
|
新版作品列表界面
|
2015-09-22 15:03:03 +08:00 |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
2015-09-21 17:11:45 +08:00 |
|
cxt
|
8883093b96
|
"关于我们"的图片居中
|
2015-09-21 17:05:51 +08:00 |
|
cxt
|
facd12640a
|
个人动态的回复为0时不显示“回复(0)”
|
2015-09-21 16:54:23 +08:00 |
|
cxt
|
9be7e633ae
|
动态回复框的样式调整
|
2015-09-21 16:20:29 +08:00 |
|
guange
|
8ab08ea30f
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
2015-09-19 18:18:02 +08:00 |
|
guange
|
b6240127a9
|
对编程框进行代码着色
|
2015-09-19 18:17:12 +08:00 |
|
sw
|
2a8cf2885a
|
布置作业时选择语言显示不正确
|
2015-09-19 16:23:47 +08:00 |
|
sw
|
ccd19021ae
|
课程动态回复之后，编辑器变宽
|
2015-09-19 13:45:32 +08:00 |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
2015-09-19 11:21:45 +08:00 |
|
cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-19 11:18:55 +08:00 |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
2015-09-19 11:18:41 +08:00 |
|
guange
|
bebc602efc
|
merge
|
2015-09-18 17:51:51 +08:00 |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-18 17:51:11 +08:00 |
|
lizanle
|
9443c139f0
|
update forum
|
2015-09-18 17:44:16 +08:00 |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
2015-09-18 17:39:37 +08:00 |
|
huang
|
c8f7655d1e
|
系统消息样式
|
2015-09-18 17:01:30 +08:00 |
|
cxt
|
cacb3e043a
|
动态回复框的焦点前焦点后样式调整
|
2015-09-18 16:34:37 +08:00 |
|
sw
|
607c31c8c5
|
编辑图片按钮图片不正确
|
2015-09-18 16:08:59 +08:00 |
|
ouyangxuhua
|
2db6b8311d
|
1.修改tips宽度；
2.修改图片的max-width
|
2015-09-18 15:56:26 +08:00 |
|
sw
|
cf2a00d7a8
|
作业列表增加：编程语言提示，匿评阶段提示
|
2015-09-18 14:25:04 +08:00 |
|
ouyangxuhua
|
d807180bf2
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-18 13:52:36 +08:00 |
|
ouyangxuhua
|
c024bb5e58
|
1.修改系统消息样式，放在application.css中；
2.修改消息提示样式
|
2015-09-18 13:52:16 +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 |
|
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 |
|
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 |
|
ouyangxuhua
|
7694a8fd2c
|
所有消息里的系统消息样式
|
2015-09-18 09:35:26 +08:00 |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
2015-09-17 20:20:20 +08:00 |
|
sw
|
cc7a752623
|
到处附件、缺评、匿评、成绩列表
|
2015-09-17 17:20:29 +08:00 |
|
Tim
|
210425277e
|
导航栏下拉菜单样式调整
|
2015-09-17 17:17:36 +08:00 |
|
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
2015-09-17 16:31:32 +08:00 |
|
ouyangxuhua
|
47d734e0d9
|
修改系统消息图片大小
|
2015-09-17 16:23:03 +08:00 |
|
Tim
|
3dccf8f77d
|
动态页面菜单栏图标更改；
提交作业界面图标宽度更改。
|
2015-09-17 16:04:27 +08:00 |
|
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
2015-09-17 16:04:16 +08:00 |
|
sw
|
47cdf1231d
|
匿评评分，成绩提示框的显示
|
2015-09-17 14:26:41 +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 |
|
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
2015-09-17 10:32:41 +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 |
|
ouyangxuhua
|
d5432a8464
|
修改发送项目请求列表样式
|
2015-09-17 10:22:33 +08:00 |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
2015-09-17 09:20:35 +08:00 |
|
Tim
|
1085c9c53f
|
添加，取消关注图标恢复
|
2015-09-17 09:06:01 +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 |
|
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
2015-09-16 17:35:08 +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
|
fa00285529
|
css文件更新
|
2015-09-16 15:30:08 +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 |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
|
sw
|
cd96fd99a8
|
快速创建项目
|
2015-09-15 16:11:55 +08:00 |
|
cxt
|
069c1ddf3c
|
课程通知页面的评论提示
|
2015-09-15 15:45:16 +08:00 |
|
sw
|
f79b2cda94
|
提交作品关联项目功能
|
2015-09-15 15:18:33 +08:00 |
|
sw
|
6127e0cee0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-15 09:36:38 +08:00 |
|
cxt
|
a999897efa
|
动态回复头像的调整
|
2015-09-15 09:22:18 +08:00 |
|
ouyangxuhua
|
9ba89b3fe7
|
系统消息样式
|
2015-09-14 16:48:39 +08:00 |
|
ouyangxuhua
|
9ba0d3293e
|
修改系统消息提示样式
|
2015-09-14 16:05:29 +08:00 |
|
sw
|
2ce29b7dcc
|
删除应该忽略的文件
|
2015-09-11 18:36:56 +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 |
|
cxt
|
b3c73811fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 17:57:47 +08:00 |
|
cxt
|
f1a6e3d7e3
|
“关于我们”的样式调整
|
2015-09-11 17:57:25 +08:00 |
|
huang
|
0d595c5feb
|
修改系统消息提交按钮
|
2015-09-11 17:19:12 +08:00 |
|
sw
|
b6452bb652
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 16:58:05 +08:00 |
|
sw
|
ecf2ac5e19
|
课程内发布作业增加提示
|
2015-09-11 16:57:49 +08:00 |
|
lizanle
|
c701eefb42
|
暂时不添加 我要回复
|
2015-09-11 16:45:57 +08:00 |
|
lizanle
|
b99663a773
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-11 16:44:28 +08:00 |
|
lizanle
|
9f871ababb
|
添加 我要回复
|
2015-09-11 16:44:19 +08:00 |
|
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
2015-09-11 16:37:50 +08:00 |
|
sw
|
37f235c2ab
|
导入编程作业
|
2015-09-11 16:22:35 +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
|
96405d7c0c
|
取消之后编程按钮无效
|
2015-09-11 15:38:58 +08:00 |
|
guange
|
ca8f943a97
|
js函数重构
|
2015-09-11 15:03:20 +08:00 |
|
guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
2015-09-11 14:59:30 +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
|
6004fe1b4d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 11:36:59 +08:00 |
|
lizanle
|
8848b3975e
|
防止生成的kindeditor太高
|
2015-09-11 10:52:13 +08:00 |
|
sw
|
f4c19c0fb0
|
1、homework.js on改为live
2、导入作业之后，编程功能按钮消失
|
2015-09-11 10:50:16 +08:00 |
|
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
2015-09-11 09:36:44 +08:00 |
|
lizanle
|
795ce09d5e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-10 17:30:11 +08:00 |
|
lizanle
|
e5e3eeca2c
|
kindeditor icon顺序调整
|
2015-09-10 17:30:01 +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 |
|
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 |
|
sw
|
fce5405c41
|
发布作业界面样式调整
|
2015-09-10 14:44:25 +08:00 |
|
sw
|
97f9d4fa60
|
增加教师节祝福语
|
2015-09-10 10:26:16 +08:00 |
|
sw
|
a841c20896
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-09 17:51:13 +08:00 |
|
cxt
|
28d4bae9e7
|
修改课程/项目的导航栏区域的文字样式
|
2015-09-09 17:53:34 +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 |
|
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 |
|
suntao
|
fe664b5e5c
|
回复模块调整
|
2015-09-01 09:42:03 +08:00 |
|
suntao
|
e917a68bd3
|
消息页面li间距调整，回复块调整
|
2015-09-01 09:13:34 +08:00 |
|
ouyangxuhua
|
316f660ca4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-01 08:47:57 +08:00 |
|
suntao
|
1d1d2f738d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 17:51:08 +08:00 |
|
suntao
|
acf5db7067
|
placeholder显示等
|
2015-08-31 17:50:50 +08:00 |
|
ouyangxuhua
|
8403d5365c
|
修改项目新闻提示
|
2015-08-31 17:49:48 +08:00 |
|
huang
|
311634abf1
|
修改消息列表样式
|
2015-08-31 16:53:54 +08:00 |
|
cxt
|
1113a7938c
|
修复点击空白处返回新建课程/项目的页面
|
2015-08-31 16:53:41 +08:00 |
|
suntao
|
2804d7d730
|
resource图片替换
|
2015-08-31 15:42:56 +08:00 |
|
cxt
|
4ab91984f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 15:33:39 +08:00 |
|
cxt
|
fa57a6c889
|
主页动态的样式修改
|
2015-08-31 15:33:20 +08:00 |
|
suntao
|
ac353841b0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-31 15:21:28 +08:00 |
|
suntao
|
d3869b03cd
|
资源库版面样式调整
|
2015-08-31 15:21:09 +08:00 |
|
lizanle
|
9a1fa316bb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-31 15:06:38 +08:00 |
|
lizanle
|
19dfd77cad
|
将资源发送至 会换行，调宽
|
2015-08-31 15:06:07 +08:00 |
|
suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2015-08-31 14:55:15 +08:00 |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
2015-08-31 14:52:56 +08:00 |
|
cxt
|
23c1ac5a4a
|
项目问题的动态内容显示超出边框
|
2015-08-31 14:28:43 +08:00 |
|
guange
|
a142103091
|
Merge remote-tracking branch 'origin/develop' into guange_homework
|
2015-08-31 09:33:20 +08:00 |
|
guange
|
8f426ca040
|
merge
|
2015-08-29 18:22:33 +08:00 |
|
guange
|
85ee2b86cd
|
.
|
2015-08-29 18:21:01 +08:00 |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
2015-08-29 17:50:15 +08:00 |
|
sw
|
655054a8ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 17:10:56 +08:00 |
|
sw
|
cc50d0d85e
|
布置作业界面调整删除按钮和文件的距离
|
2015-08-29 17:08:55 +08:00 |
|
suntao
|
3776689661
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 16:52:44 +08:00 |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
2015-08-29 16:52:10 +08:00 |
|
sw
|
17e9b2d293
|
编辑个人简介文本框
|
2015-08-29 14:48:47 +08:00 |
|
suntao
|
0d8624a642
|
颜色更新
|
2015-08-29 14:43:28 +08:00 |
|
suntao
|
886a00e18d
|
footer间距调整
|
2015-08-29 14:22:29 +08:00 |
|
suntao
|
a22727efb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 14:08:58 +08:00 |
|
suntao
|
5e25b64004
|
提交按钮对齐
|
2015-08-29 14:08:38 +08:00 |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 12:04:57 +08:00 |
|
sw
|
e455f93ee1
|
上传图片；浏览图片按钮
|
2015-08-29 12:04:35 +08:00 |
|
guange
|
18bfe1fc73
|
jquery升到1.11
|
2015-08-29 11:59:52 +08:00 |
|
suntao
|
977f81e031
|
关注和取消关注，导航圆角
|
2015-08-29 11:41:12 +08:00 |
|
suntao
|
5f3532ac14
|
头像部分修改
|
2015-08-29 11:25:49 +08:00 |
|
sw
|
189405f0a9
|
课程搜索有部分文本重叠
|
2015-08-29 10:58:45 +08:00 |
|
sw
|
4d1fc0dc45
|
调整底部导航栏宽度
|
2015-08-29 10:54:45 +08:00 |
|
suntao
|
9d638b705a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 10:27:40 +08:00 |
|
lizanle
|
60b429b13d
|
发送成功不给提示
课程资源过少的时候不给滚动条
|
2015-08-29 10:33:04 +08:00 |
|
suntao
|
2342d1c23a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-29 10:27:22 +08:00 |
|
suntao
|
ada04e5e63
|
个人主页头像模块改动
|
2015-08-29 10:13:32 +08:00 |
|
lizanle
|
afd7beebac
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 10:00:10 +08:00 |
|
lizanle
|
f2a909f0e5
|
资源移动弹出框搜索处鼠标悬浮要手型光标
|
2015-08-29 10:00:04 +08:00 |
|
huang
|
6287f9b39e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-29 09:56:39 +08:00 |
|
lizanle
|
bc186776d8
|
资源移动弹出框减少留白
|
2015-08-29 09:56:34 +08:00 |
|
lizanle
|
553e35281a
|
资源弹出框的边框色
|
2015-08-29 09:44:36 +08:00 |
|
lizanle
|
53b150486d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-08-29 09:33:33 +08:00 |
|
lizanle
|
789b62940b
|
资源名称过长会覆盖的问题
搜索按钮 手在上边的时候呈手型
筛选资源后 自选资源清零的问题
|
2015-08-29 09:33:22 +08:00 |
|
huang
|
938d0e2bbd
|
解决消息换行显示问题
|
2015-08-29 09:23:32 +08:00 |
|
suntao
|
5c960c798e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 17:29:47 +08:00 |
|
suntao
|
46ac491b5b
|
上传图片
|
2015-08-28 17:29:22 +08:00 |
|
sw
|
3f61a908d1
|
部分界面样式调整
|
2015-08-28 17:27:51 +08:00 |
|
guange
|
e8fe397158
|
added
|
2015-08-28 17:20:39 +08:00 |
|
suntao
|
d536c81a8a
|
提交作业样式修改
|
2015-08-28 17:11:33 +08:00 |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
2015-08-28 17:07:48 +08:00 |
|
huang
|
e193cb0f2d
|
消息列表界面新样式
|
2015-08-28 17:05:27 +08:00 |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-28 17:02:49 +08:00 |
|
sw
|
48419573ac
|
底部导航栏有2条线
|
2015-08-28 16:02:00 +08:00 |
|
suntao
|
4392ecdcd7
|
消息格式更改
|
2015-08-28 15:41:50 +08:00 |
|
guange
|
1d8fdbf8f1
|
可以提交答案
|
2015-08-28 15:08:07 +08:00 |
|
suntao
|
e12bef1126
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 14:51:16 +08:00 |
|
suntao
|
a19692a0c6
|
个人主页左侧修改
|
2015-08-28 14:50:48 +08:00 |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
2015-08-28 14:49:55 +08:00 |
|
huang
|
d9df8aae28
|
1。缺陷状态更新后，不同状态变更在消息列表中显示方式
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
|
2015-08-28 14:38:46 +08:00 |
|
suntao
|
fb91958a3f
|
导航栏修改
|
2015-08-28 14:30:02 +08:00 |
|
guange
|
1462ea09f3
|
测试代码功能完成
|
2015-08-28 12:04:49 +08:00 |
|
suntao
|
c0477fda99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
2015-08-28 11:58:33 +08:00 |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-28 11:56:52 +08:00 |
|
suntao
|
b6d58b1b58
|
样式调整
|
2015-08-28 11:55:34 +08:00 |
|
sw
|
711b21070f
|
上传附件样式调整
|
2015-08-28 11:53:05 +08:00 |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
2015-08-28 11:32:57 +08:00 |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
2015-08-28 10:47:50 +08:00 |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
2015-08-28 10:00:48 +08:00 |
|
lizanle
|
d3f441d4da
|
可拖动的资源弹出框
|
2015-08-28 09:34:02 +08:00 |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-27 17:35:04 +08:00 |
|
lizanle
|
149ac07cf9
|
去掉重复的css，
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
|
2015-08-27 16:20:47 +08:00 |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
2015-08-27 16:03:41 +08:00 |
|
sw
|
1f87c4adf5
|
重复CSS删除
|
2015-08-27 09:46:17 +08:00 |
|
lizanle
|
41a8f9d6a2
|
底部去掉marginBottom:10px
登录界面加底部
|
2015-08-27 09:28:13 +08:00 |
|
lizanle
|
82b86ea14f
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-26 17:52:32 +08:00 |
|
lizanle
|
733876743e
|
服务协议 忘记密码
|
2015-08-26 17:52:23 +08:00 |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
2015-08-26 17:31:37 +08:00 |
|
sw
|
049e27f15f
|
发布作业功能
|
2015-08-26 17:29:47 +08:00 |
|
huang
|
a54de0c8fb
|
Merge branch 'dev_hjq' into sw_new_course
|
2015-08-26 16:33:21 +08:00 |
|
lizanle
|
ccfd69602c
|
服务协议
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
b824c3fa46
|
1、去掉多余的代码
2、消息样式列表过宽显示跨行问题
|
2015-08-26 16:31:28 +08:00 |
|
huang
|
6a986b98d9
|
Merge branch 'sw_new_course' into dev_hjq
Conflicts:
app/controllers/users_controller.rb
|
2015-08-26 16:14:50 +08:00 |
|
lizanle
|
5ec24913bb
|
留言背景色 留言头
|
2015-08-26 16:06:15 +08:00 |
|
sw
|
e2869faa08
|
日历选择器的样式调整
|
2015-08-26 15:17:56 +08:00 |
|
huang
|
334e6dbd55
|
消息未读样式
|
2015-08-26 15:14:25 +08:00 |
|
sw
|
686af68026
|
关注、粉丝、编辑资料页面样式问题
|
2015-08-26 14:11:28 +08:00 |
|
sw
|
f0a4d364b0
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-26 13:56:53 +08:00 |
|
sw
|
ccfa93be66
|
老师布置作业界面
|
2015-08-26 13:56:37 +08:00 |
|
lizanle
|
d735eee4a3
|
关注和取消关注
|
2015-08-26 11:41:32 +08:00 |
|
sw
|
757da1ec0a
|
调整编辑资料样式
|
2015-08-26 09:36:05 +08:00 |
|
cxt
|
cccc0577c7
|
个人动态
|
2015-08-26 08:51:39 +08:00 |
|
sw
|
767fc67686
|
已过期课程显示为darkgrey
|
2015-08-25 18:22:46 +08:00 |
|
sw
|
59fe95bf33
|
去掉部分重复的CSS
|
2015-08-25 17:26:40 +08:00 |
|
sw
|
994a4188ce
|
未登录情况下，导航栏样式问题
|
2015-08-25 17:13:09 +08:00 |
|
sw
|
4ca3d8be03
|
搜索栏样式
|
2015-08-25 16:35:22 +08:00 |
|
sw
|
0d9a397453
|
登录、未登录搜索条件选择js
用户主页 show方法改造
|
2015-08-25 16:01:31 +08:00 |
|
sw
|
c8b1bb5d64
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-25 15:09:21 +08:00 |
|
sw
|
87ee2e744f
|
公共贴吧、课程、项目相关界面导航栏和底部导航栏修改
|
2015-08-25 15:09:02 +08:00 |
|
lizanle
|
8917a67c7c
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-25 14:24:29 +08:00 |
|
lizanle
|
d25971f546
|
登陆界面
|
2015-08-25 14:24:20 +08:00 |
|
sw
|
bcd12e7e48
|
课程、项目相关页面 顶部导航栏和底部导航栏修改
|
2015-08-25 14:09:37 +08:00 |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
2015-08-25 13:50:42 +08:00 |
|
sw
|
5b99effbc8
|
更新css，编辑个人简介功能BUG
|
2015-08-25 10:30:31 +08:00 |
|
sw
|
d132c08a11
|
增加footer
|
2015-08-25 09:29:19 +08:00 |
|
sw
|
38f8aa5ba4
|
更新css文件
|
2015-08-24 18:25:33 +08:00 |
|
sw
|
4bf92d0737
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-08-24 18:17:45 +08:00 |
|
sw
|
3ea198dc3d
|
标题栏作业界面静态页面的添加
|
2015-08-24 18:15:46 +08:00 |
|
cxt
|
2e5916cf5e
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/admin_controller.rb
|
2015-08-24 18:01:51 +08:00 |
|
lizanle
|
5bf7aeb430
|
资源库css小改动
|
2015-08-24 16:35:10 +08:00 |
|
lizanle
|
39b022f696
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
2015-08-24 16:25:09 +08:00 |
|
lizanle
|
86d2f5342c
|
登陆界面
|
2015-08-24 16:22:22 +08:00 |
|
lizanle
|
614743d8d4
|
登陆界面
|
2015-08-24 16:22:06 +08:00 |
|
sw
|
a9c7c252e5
|
搜索功能js以及类型的选择
|
2015-08-24 16:16:07 +08:00 |
|
sw
|
e746a7764f
|
处理被还原的css
|
2015-08-24 15:36:32 +08:00 |
|
sw
|
5fcb97b990
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/new_public.css
|
2015-08-24 15:32:51 +08:00 |
|
sw
|
dabef542fe
|
更新css文件，并实现未登陆用户时静态页面显示
|
2015-08-24 15:30:11 +08:00 |
|
sw
|
7f2f2c5d40
|
个人主页，项目更多功能
|
2015-08-24 14:53:35 +08:00 |
|
lizanle
|
12b89e2c81
|
可拖动的框暂时做不了。
|
2015-08-24 14:53:30 +08:00 |
|
sw
|
2d75fea96b
|
课程点击更多按钮显示
|
2015-08-24 14:44:22 +08:00 |
|
lizanle
|
9a2e9a4ad2
|
Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
|
2015-08-24 13:54:22 +08:00 |
|
lizanle
|
5628a43578
|
资源库和新版个人中心整合
|
2015-08-24 13:54:15 +08:00 |
|
sw
|
0287a0f3b4
|
个人积分弹出框
|
2015-08-24 11:40:09 +08:00 |
|
sw
|
f6d122e37f
|
Merge branch 'guange_dev' into sw_new_course
|
2015-08-24 11:04:19 +08:00 |
|
sw
|
86b151979b
|
js相关
|
2015-08-24 11:03:09 +08:00 |
|
sw
|
111478ec72
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/users_controller.rb
config/routes.rb
|
2015-08-24 10:39:52 +08:00 |
|
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
2015-08-22 15:48:20 +08:00 |
|
huang
|
17aae7c79d
|
解决CSS冲突
|
2015-08-21 17:40:28 +08:00 |
|
sw
|
2a522f144e
|
编辑个人简介
|
2015-08-21 16:29:25 +08:00 |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
|
cxt
|
e1fb2a6bab
|
个人主页动态
|
2015-08-21 16:07:18 +08:00 |
|
sw
|
d942cc3123
|
性别的判断
|
2015-08-21 15:40:38 +08:00 |