cxt
|
a16dc09afa
|
讨论区帖子图片可点击
|
2015-10-16 09:26:13 +08:00 |
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
2015-10-15 16:44:49 +08:00 |
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
2015-10-15 16:17:48 +08:00 |
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
2015-10-14 11:41:30 +08:00 |
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
2015-10-14 11:38:16 +08:00 |
Tim
|
58c8851a99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-14 09:26:20 +08:00 |
Tim
|
64ec465126
|
意见反馈窗口调整
|
2015-10-14 09:25:54 +08:00 |
guange
|
6472367b68
|
firefox粘贴图片只能一张的bug
|
2015-10-13 21:47:55 +08:00 |
guange
|
bdecea83ca
|
js中edit报错
|
2015-10-13 21:37:41 +08:00 |
cxt
|
3ebbcedf1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-13 16:51:57 +08:00 |
lizanle
|
c9b23c5597
|
贴吧 项目符号 应该显示
|
2015-10-13 15:59:02 +08:00 |
cxt
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
2015-10-13 11:03:22 +08:00 |
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 17:20:11 +08:00 |
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
2015-10-12 17:19:55 +08:00 |
Tim
|
752494e35e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 16:08:51 +08:00 |
Tim
|
d33a6b763d
|
引用资源库弹窗外观调整
|
2015-10-12 16:08:33 +08:00 |
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标;
|
2015-10-12 15:08:01 +08:00 |
lizanle
|
485208f3ab
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-10 11:38:04 +08:00 |
lizanle
|
94bffb5458
|
插入头像 , 粘贴图片 ,插入图片,都要加入域名。防止邮件中出现图片不显示的问题
|
2015-10-10 11:37:58 +08:00 |
Tim
|
0d85fb3c5f
|
导航栏链接在变色范围内都可点击
|
2015-10-10 11:07:29 +08:00 |
Tim
|
9e91429b1e
|
鼠标在侧导航左侧文字颜色不变修复
|
2015-10-10 10:32:08 +08:00 |
Tim
|
99e19c51f9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-10 10:24:12 +08:00 |
Tim
|
48bd70b9f6
|
个人动态编辑图片显示
|
2015-10-10 10:23:52 +08:00 |
huang
|
ddac70c9b8
|
项目成员角色Gitlab一致,单选
添加成员按钮样式调整
|
2015-10-10 10:00:11 +08:00 |
lizanle
|
724abee12a
|
缩进问题
|
2015-10-09 15:49:50 +08:00 |
cxt
|
c6cca9f17e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-09 14:40:49 +08:00 |
cxt
|
0f6ea47792
|
课程讨论区的列表显示
|
2015-10-09 14:39:40 +08:00 |
lizanle
|
5f8d21f1cb
|
暂时去掉 工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
2015-10-09 14:26:27 +08:00 |
lizanle
|
b04e20ed7d
|
工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
2015-10-09 14:25:40 +08:00 |
lizanle
|
357a5d4139
|
添加点赞人数
|
2015-10-09 14:08:12 +08:00 |
huang
|
530d101024
|
项目邀请--姓名、长度JS验证
|
2015-10-09 11:25:21 +08:00 |
huang
|
7b18c14aa3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-09 10:34:18 +08:00 |
huang
|
654ebfca46
|
项目邀请添加:姓、名、性别
|
2015-10-09 10:33:10 +08:00 |
Tim
|
fb5eae3ae2
|
搜索框图标漂移效果清除
|
2015-10-09 10:26:47 +08:00 |
Tim
|
0ff58b7631
|
修复了贴吧图片漂移的问题
|
2015-10-09 09:41:36 +08:00 |
Tim
|
2ceba291bf
|
蓝色箭头替换
|
2015-10-08 17:27:08 +08:00 |
Tim
|
f5ff94d888
|
资源库固定宽度、作品描述margin、搜索框文字居中
|
2015-10-08 16:35:08 +08:00 |
lizanle
|
7d04ce80d4
|
tag为可以点击的时候 是 手型
|
2015-10-08 13:56:17 +08:00 |
lizanle
|
c8357a6364
|
批量修改tag
|
2015-10-08 13:51:55 +08:00 |
lizanle
|
d8a4e4d710
|
issue序号丢失的问题
issue缩进以及代码缩进的样式不同 的问题
|
2015-10-08 11:33:52 +08:00 |
lizanle
|
56db8b4232
|
批量修改tag的bug
|
2015-10-08 11:08:26 +08:00 |
lizanle
|
88ddaaaaf5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-08 10:00:23 +08:00 |
lizanle
|
f71ca2391f
|
编辑器换行行间距巨大的bug
|
2015-10-08 10:00:10 +08:00 |
huang
|
326c05d0eb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 11:24:31 +08:00 |
huang
|
fd020b56f7
|
细调红点样式
|
2015-09-30 11:24:17 +08:00 |
Tim
|
c7a9738dc8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:52:44 +08:00 |
Tim
|
ff18381f64
|
引用资源库弹框调整
|
2015-09-30 10:52:27 +08:00 |
sw
|
af892fa7ef
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:44:00 +08:00 |
Tim
|
78d11b57b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:33:31 +08:00 |
Tim
|
42d4a5628d
|
引用资源库的icon修改
|
2015-09-30 10:33:13 +08:00 |
huang
|
548a18d1fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-30 10:32:16 +08:00 |
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 |