 sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
2014-11-21 11:41:38 +08:00 |
 alan
|
f90927313d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-20 17:08:34 +08:00 |
|
alan
|
cb7cd581f6
|
修改bug<admin删除用户出错>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-20 17:08:10 +08:00 |
 zhuhao
|
de5aa252e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-20 16:20:07 +08:00 |
|
zhuhao
|
4ae74b5608
|
按钮样式调整
|
2014-11-20 16:19:39 +08:00 |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-20 15:56:45 +08:00 |
|
zhuhao
|
cc32bee0f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-20 11:39:04 +08:00 |
|
zhuhao
|
0b5ee5dc4b
|
按钮样式修改（发布课程通知页，新建缺陷页）
|
2014-11-20 11:38:39 +08:00 |
|
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
2014-11-20 11:16:58 +08:00 |
 z9hang
|
63b91e2cfb
|
资源上传
|
2014-11-19 17:40:24 +08:00 |
|
alan
|
972b788687
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
public/stylesheets/application.css
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:30:53 +08:00 |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:25:10 +08:00 |
|
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
2014-11-19 11:28:54 +08:00 |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
2014-11-19 10:07:49 +08:00 |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
2014-11-18 18:02:01 +08:00 |
|
zhuhao
|
c1361e37b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 17:04:09 +08:00 |
|
zhuhao
|
126c7f558d
|
修改用户信息处控件对齐，新建课程通知提交取消按钮样式统一
|
2014-11-18 17:03:40 +08:00 |
|
sw
|
3aaf2247dc
|
修改作业右侧悬浮框css、js
|
2014-11-18 10:29:00 +08:00 |
moon
|
34d7208deb
|
课程联系界面
|
2014-11-17 15:21:36 +08:00 |
|
zhuhao
|
532e2676a3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-13 16:37:34 +08:00 |
|
zhuhao
|
29343b8ba7
|
修改了显示样式
|
2014-11-13 16:37:08 +08:00 |
|
alan
|
8d3f7bd0bf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-13 15:55:28 +08:00 |
|
z9hang
|
c89f3cf1a3
|
修改回复位置
|
2014-11-13 10:42:29 +08:00 |
|
alan
|
12de248e87
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 10:18:07 +08:00 |
|
z9hang
|
373ba9fb33
|
1、用户名过长的显示问题。2、部分内容过长的回复的与头像不在同一行问题
|
2014-11-06 14:51:25 +08:00 |
|
z9hang
|
1d1d2e8b91
|
调整回复样式
|
2014-11-05 10:49:32 +08:00 |
|
z9hang
|
3b073eec74
|
修正留言样式
|
2014-11-05 10:05:43 +08:00 |
|
sw
|
e7a1e9b325
|
修改弹出框样式，使其位于屏幕中间，且增加边框
|
2014-11-04 14:23:24 +08:00 |
|
sw
|
1ec6b53d76
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-03 18:54:50 +08:00 |
|
sw
|
e2897b3d1a
|
修改匿评弹出框样式
|
2014-11-03 18:45:53 +08:00 |
|
z9hang
|
990c37061b
|
调整按钮样式
|
2014-11-03 18:34:06 +08:00 |
|
sw
|
caec663fe4
|
修改编辑作业界面样式
|
2014-11-03 15:52:41 +08:00 |
|
sw
|
bde5cb9302
|
1.修改作业界面修改
2.作业附件取消加粗显示
3.作业创建、修改建业页面高度为自动
4.删除作业成员增加相关提示
|
2014-11-03 15:35:29 +08:00 |
|
z9hang
|
e0ff4ec949
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-02 17:26:52 +08:00 |
|
sw
|
f3ac5a0a84
|
1.修改学生创建作业界面
2.取消老师修改作业界面启动互评按钮
3.修改css.css文件中样式
|
2014-11-02 17:08:19 +08:00 |
|
z9hang
|
1314b2d07d
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-02 16:15:21 +08:00 |
 gonglexin
|
4f3b1a670d
|
去掉 titlebar 的颜色
|
2014-11-02 15:10:09 +08:00 |
|
z9hang
|
8bfcbcc602
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
config/locales/zh.yml
|
2014-11-02 14:43:00 +08:00 |
|
z9hang
|
ba742cd910
|
评分弹窗的留言部分样式修改
|
2014-11-02 13:18:59 +08:00 |
|
sw
|
27aca11715
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-02 13:18:35 +08:00 |
|
sw
|
78bc458e84
|
1.修改匿评提示弹出提示样式
2.增加新增作业静态页面
|
2014-11-02 12:58:09 +08:00 |
|
z9hang
|
4ce1ac9f94
|
修改留言回复的样式
|
2014-11-02 12:12:41 +08:00 |
|
sw
|
c2e9363d44
|
学生进入作业列表，如果已经被分配匿评作业且该学生未对此作业进行打分的情况下，弹出匿评相关提示
|
2014-11-02 11:35:37 +08:00 |
|
sw
|
ac59bc8623
|
实现点赞功能
|
2014-11-02 10:34:22 +08:00 |
|
sw
|
243803cc5e
|
1.增加点赞样式
2.修改学生进入作业列表，未评列表只能点赞
3.学生修改作品、创建作品报错
4.增加点赞图片
|
2014-11-01 16:19:04 +08:00 |
|
z9hang
|
e53ebbcec2
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-01 15:06:25 +08:00 |
|
z9hang
|
356ed9b116
|
修正留言回复样式
|
2014-11-01 11:05:43 +08:00 |
|
z9hang
|
b59ff98006
|
修改留言界面
|
2014-10-31 20:39:09 +08:00 |
|
sw
|
6a10e19f63
|
增加留言回复的样式显示
|
2014-10-31 17:00:12 +08:00 |
|
sw
|
9b64027ed6
|
1.当用户真实姓名为空时作业列表界面显示为昵称
2.修改分页控件样式
3.作业用户图像增加链接，修改鼠标悬浮样式
4.增加当前选中页显示样式
|
2014-10-31 14:04:19 +08:00 |